KusionStack · Eikykun · Jul 31, 2023 · Jul 31, 2023 · Jul 31, 2023 · Jul 31, 2023
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -29,6 +29,10 @@ jobs:
       uses: actions/setup-go@v3
       with:
         go-version: ${{ env.GO_VERSION }}
+    - name: Setup protoc
+      run: |
+        wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.5/protoc-3.19.5-linux-x86_64.zip
+        unzip protoc-3.19.5-linux-x86_64.zip -d protoc3
     - name: Cache Go Dependencies
       uses: actions/cache@v2
       with:
@@ -37,7 +41,11 @@ jobs:
         restore-keys: ${{ runner.os }}-go-
     - name: Run Unit Tests
       run: |
+        export PATH="$PATH:$(pwd)/protoc3/bin"
+        echo $PATH
         make test
+        rm -rf protoc-3.19.5-linux-x86_64.zip
+        rm -rf protoc3
         git status
 # TODO: enable after public
 #    - name: Publish Unit Test Coverage

diff --git a/Makefile b/Makefile
@@ -57,7 +57,7 @@ vet: ## Run go vet against code.
 	go vet ./...
 
 ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
-test: fmt vet ## Run tests.
+test: fmt vet generate manifests ## Run tests.
 	mkdir -p ${ENVTEST_ASSETS_DIR}
 	source ./artifacts/scripts/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./pkg/... -coverprofile cover.out
 
@@ -94,7 +94,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0)
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10.0)
 
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.

diff --git a/artifacts/scripts/generate_protobuf.sh b/artifacts/scripts/generate_protobuf.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-
+protoc --version
 if [[ -z "$(which protoc)" || ( "$(protoc --version)" != "libprotoc 3.15."* && "$(protoc --version)" != "libprotoc 3.19."* ) ]]; then
   echo "Generating protobuf requires protoc 3.15.x or 3.19.x. Please download and"
   echo "install the platform appropriate Protobuf package for your OS: "

diff --git a/config/crd/bases/kridge.kusionstack.io_circuitbreakers.yaml b/config/crd/bases/kridge.kusionstack.io_circuitbreakers.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.10.0
   creationTimestamp: null
   name: circuitbreakers.kridge.kusionstack.io
 spec:
@@ -100,9 +99,9 @@ spec:
                             type: array
                           resources:
                             description: Resources is a list of resources this rule
-                              applies to.  "*" means all in the specified apiGroups.  "*/foo"
-                              represents the subresource 'foo' for all resources in
-                              the specified apiGroups.
+                              applies to.  "*" means all in the specified apiGroups.
+                              "*/foo" represents the subresource 'foo' for all resources
+                              in the specified apiGroups.
                             items:
                               type: string
                             type: array
@@ -205,6 +204,7 @@ spec:
                           "value". The requirements are ANDed.
                         type: object
                     type: object
+                    x-kubernetes-map-type: atomic
                   targets:
                     items:
                       type: string
@@ -313,9 +313,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/kridge.kusionstack.io_managerstates.yaml b/config/crd/bases/kridge.kusionstack.io_managerstates.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.10.0
   creationTimestamp: null
   name: managerstates.kridge.kusionstack.io
 spec:
@@ -72,9 +71,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/kridge.kusionstack.io_shardingconfigs.yaml b/config/crd/bases/kridge.kusionstack.io_shardingconfigs.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.10.0
   creationTimestamp: null
   name: shardingconfigs.kridge.kusionstack.io
 spec:
@@ -110,6 +109,7 @@ spec:
                             only "value". The requirements are ANDed.
                           type: object
                       type: object
+                      x-kubernetes-map-type: atomic
                   type: object
                 type: array
               root:
@@ -211,6 +211,7 @@ spec:
                                 contains only "value". The requirements are ANDed.
                               type: object
                           type: object
+                          x-kubernetes-map-type: atomic
                       type: object
                     type: array
                   size:
@@ -264,6 +265,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               webhook:
                 description: ShardingConfigWebhookConfiguration defines the configuration
                   of webhook in this application.
@@ -295,9 +297,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
@@ -73,7 +72,6 @@ webhooks:
     - persistentvolumeclaims
     - endpoints
   sideEffects: None
-
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration