Merge pull request #7 from charlie0129/refactor-crds

Refactor: rename CRs

Author: wonderflow

.dockerignore

@@ -60,3 +60,4 @@ bin
 .github
 docs
 examples
+.git

.github/workflows/docs-check.yaml

@@ -15,6 +15,7 @@ on:
 
 jobs:
   checks:
+    name: Check Docs
     runs-on: ubuntu-latest
     steps:
       - name: Install xmllint

.github/workflows/go-checks.yaml

@@ -18,6 +18,7 @@ env:
 
 jobs:
   detect-noop:
+    name: Detect No-op Changes
     runs-on: ubuntu-latest
     outputs:
       noop: ${{ steps.noop.outputs.should_skip }}
@@ -32,6 +33,7 @@ jobs:
           concurrent_skipping: false
 
   checks:
+    name: Check Go Code
     runs-on: ubuntu-latest
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'

.github/workflows/release-binary.yaml

@@ -14,7 +14,7 @@ env:
 
 jobs:
   kube-trigger:
-    name: Release kube-trigger binaries
+    name: Release kube-trigger Binaries
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
@@ -41,7 +41,7 @@ jobs:
       - name: Get Version
         id: get_version
         run: |
-          export VERSION=$(./make-kt version)
+          VERSION=$(./make-kt version)
           echo ::set-output name=VERSION::${VERSION}
 
       - name: Build Binaries for All Platforms

.github/workflows/release-image.yaml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   kube-trigger:
-    name: Release kube-trigger image
+    name: Release kube-trigger Images
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
@@ -49,7 +49,7 @@ jobs:
         run: ./make-kt all-docker-build-push
 
   manager:
-    name: Release manager image
+    name: Release manager Images
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code

.github/workflows/unit-test.yaml

@@ -19,6 +19,7 @@ env:
 
 jobs:
   detect-noop:
+    name: Detect No-op Changes
     runs-on: ubuntu-latest
     outputs:
       noop: ${{ steps.noop.outputs.should_skip }}
@@ -33,6 +34,7 @@ jobs:
           concurrent_skipping: false
 
   unit-test:
+    name: Run Unit Tests and Integration Tests
     runs-on: ubuntu-latest
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'

.github/workflows/upload-test-binary.yaml

@@ -19,6 +19,7 @@ env:
 
 jobs:
   detect-noop:
+    name: Detect No-op Changes
     runs-on: ubuntu-latest
     outputs:
       noop: ${{ steps.noop.outputs.should_skip }}
@@ -33,9 +34,19 @@ jobs:
           concurrent_skipping: false
 
   upload-test-binary:
+    name: Build and Upload Test Binaries
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform:
+          - linux-amd64
+          - darwin-amd64
+          - darwin-arm64
+        binary:
+          - kube-trigger
+          - manager
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
@@ -64,31 +75,19 @@ jobs:
       - name: Get Version
         id: get_version
         run: |
-          export VERSION=$(./make-kt version)
+          VERSION=$(./make-kt version)
           echo ::set-output name=VERSION::${VERSION}
 
-      - name: Build Binaries for linux and darwin
+      - name: Build Binary
         env:
           DIRTY_BUILD: true
         run: |
-          ./make-kt build-linux_amd64
-          ./make-kt build-darwin_amd64
-          ./make-kt build-darwin_arm64
+          PLATFORM=${{ matrix.platform }}
+          BINARY=${{ matrix.binary }}
+          make -f ${BINARY/-/}.mk build-${PLATFORM/-/_}
 
-      - name: Upload Artifacts (linux-amd64)
+      - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: kube-trigger-${{ steps.get_version.outputs.VERSION }}-linux-amd64
-          path: bin/kube-trigger-${{ steps.get_version.outputs.VERSION }}/kube-trigger-*-linux-amd64
-
-      - name: Upload Artifacts (darwin-amd64)
-        uses: actions/upload-artifact@v3
-        with:
-          name: kube-trigger-${{ steps.get_version.outputs.VERSION }}-darwin-amd64
-          path: bin/kube-trigger-${{ steps.get_version.outputs.VERSION }}/kube-trigger-*-darwin-amd64
-
-      - name: Upload Artifacts (darwin-arm64)
-        uses: actions/upload-artifact@v3
-        with:
-          name: kube-trigger-${{ steps.get_version.outputs.VERSION }}-darwin-arm64
-          path: bin/kube-trigger-${{ steps.get_version.outputs.VERSION }}/kube-trigger-*-darwin-arm64
+          name: ${{ matrix.binary }}-${{ steps.get_version.outputs.VERSION }}-${{ matrix.platform }}
+          path: bin/${{ matrix.binary }}-${{ steps.get_version.outputs.VERSION }}/${{ matrix.binary }}-*-${{ matrix.platform }}

.gitignore

@@ -60,3 +60,6 @@ bin
 # etcd
 default.etcd
 
+# Generated Dockerfile
+# This is automatically generated by Make depending on which image you want to build.
+Dockerfile

Dockerfile.in

@@ -13,7 +13,12 @@
 # limitations under the License.
 
 # Note: the ${BIN} needs to be replaced with the actual binary,
-# otherwise it won't work. Refer to Makefile for how it can be done.
+# otherwise it won't work. A valid Dockerfile will be generated
+# using this template. Refer to Makefile for how it can be done.
+
+# syntax = docker/dockerfile:1.2
+# You need to enable Docker BuildKit for this to work.
+# Also refer to Makefile for how it can be done.
 
 ARG BUILD_IMAGE=golang:1.17
 ARG BASE_IMAGE=gcr.io/distroless/static:nonroot
@@ -27,7 +32,8 @@ COPY go.sum go.sum
 
 ARG GOPROXY
 ENV GOPROXY=${GOPROXY}
-RUN go mod download
+RUN --mount=type=cache,target=/root/go/pkg \
+        go mod download
 
 COPY build       build
 COPY hack        hack
@@ -45,12 +51,14 @@ ARG GOFLAGS
 ARG DIRTY_BUILD
 ARG ENTRY
 
-RUN ARCH=${TARGETARCH:-${ARCH:-amd64}} \
-        OS=${TARGETOS:-${OS:-linux}}   \
-        OUTPUT=${BIN}                  \
-        VERSION=${VERSION}             \
-        GOFLAGS=${GOFLAGS}             \
-        /bin/sh build/build.sh         \
+RUN --mount=type=cache,target=/root/.cache/go-build \
+        ARCH=${TARGETARCH:-${ARCH:-amd64}}          \
+        OS=${TARGETOS:-${OS:-linux}}                \
+        OUTPUT=${BIN}                               \
+        VERSION=${VERSION}                          \
+        GOFLAGS=${GOFLAGS}                          \
+        DIRTY_BUILD=${DIRTY_BUILD}                  \
+        /bin/sh build/build.sh                      \
         ${ENTRY}
 
 FROM ${BASE_IMAGE}

PROJECT

@@ -10,7 +10,7 @@ resources:
   controller: true
   domain: oam.dev
   group: standard
-  kind: KubeTrigger
+  kind: TriggerInstance
   path: github.com/kubevela/kube-trigger/api/v1alpha1
   version: v1alpha1
 - api:
@@ -19,7 +19,7 @@ resources:
   controller: true
   domain: oam.dev
   group: standard
-  kind: KubeTriggerConfig
+  kind: TriggerService
   path: github.com/kubevela/kube-trigger/api/v1alpha1
   version: v1alpha1
 version: "3"