openkruise · kruise-bot · Mar 20, 2024 · Mar 20, 2024
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ GOOS ?= $(shell go env GOOS)
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. 
 # Run `setup-envtest list` to list available versions.
-ENVTEST_K8S_VERSION ?= 1.24.2
+ENVTEST_K8S_VERSION ?= 1.26.0
 
 # Setting SHELL to bash allows bash commands to be executed by recipes.
 # This is a requirement for 'setup-envtest.sh' in the test target.
@@ -96,13 +96,13 @@ 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.
-# [email protected] comply with k8s.io/api v0.24.x
-ifeq ("$(shell $(CONTROLLER_GEN) --version 2> /dev/null)", "Version: v0.9.0")
+
+# [email protected] comply with k8s.io/api v0.26.x
+ifeq ("$(shell $(CONTROLLER_GEN) --version 2> /dev/null)", "Version: v0.11.0")
 else
 	rm -rf $(CONTROLLER_GEN)
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.0)
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.0)
 endif
-
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
 	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])

diff --git a/config/crd/bases/apps.kruise.io_advancedcronjobs.yaml b/config/crd/bases/apps.kruise.io_advancedcronjobs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: advancedcronjobs.apps.kruise.io
 spec:
@@ -254,6 +254,7 @@ spec:
                       description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                       type: string
                   type: object
+                  x-kubernetes-map-type: atomic
                 type: array
               lastScheduleTime:
                 description: Information when was the last time the job was successfully

diff --git a/config/crd/bases/apps.kruise.io_broadcastjobs.yaml b/config/crd/bases/apps.kruise.io_broadcastjobs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: broadcastjobs.apps.kruise.io
 spec:

diff --git a/config/crd/bases/apps.kruise.io_clonesets.yaml b/config/crd/bases/apps.kruise.io_clonesets.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: clonesets.apps.kruise.io
 spec:
@@ -239,6 +239,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               template:
                 description: Template describes the pods that will be created.
                 x-kubernetes-preserve-unknown-fields: true
@@ -373,6 +374,7 @@ spec:
                                     requirements are ANDed.
                                   type: object
                               type: object
+                              x-kubernetes-map-type: atomic
                             weight:
                               description: Weight associated with matching the corresponding
                                 matchExpressions, in the range 1-100.

diff --git a/config/crd/bases/apps.kruise.io_containerrecreaterequests.yaml b/config/crd/bases/apps.kruise.io_containerrecreaterequests.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: containerrecreaterequests.apps.kruise.io
 spec:

diff --git a/config/crd/bases/apps.kruise.io_daemonsets.yaml b/config/crd/bases/apps.kruise.io_daemonsets.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: daemonsets.apps.kruise.io
 spec:
@@ -210,6 +210,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               template:
                 description: 'An object that describes the pod that will be created.
                   The DaemonSet will create exactly one copy of this pod on every
@@ -332,6 +333,7 @@ spec:
                               only "value". The requirements are ANDed.
                             type: object
                         type: object
+                        x-kubernetes-map-type: atomic
                     type: object
                   type:
                     description: Type of daemon set update. Can be "RollingUpdate"

diff --git a/config/crd/bases/apps.kruise.io_ephemeraljobs.yaml b/config/crd/bases/apps.kruise.io_ephemeraljobs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: ephemeraljobs.apps.kruise.io
 spec:
@@ -137,6 +137,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               template:
                 description: Template describes the ephemeral container that will
                   be created.

diff --git a/config/crd/bases/apps.kruise.io_imagelistpulljobs.yaml b/config/crd/bases/apps.kruise.io_imagelistpulljobs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: imagelistpulljobs.apps.kruise.io
 spec:
@@ -147,6 +147,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               pullPolicy:
                 description: PullPolicy is an optional field to set parameters of
                   the pulling task. If not specified, the system will use the default
@@ -235,6 +236,7 @@ spec:
                       type: string
                     type: array
                 type: object
+                x-kubernetes-map-type: atomic
             required:
             - completionPolicy
             - images

diff --git a/config/crd/bases/apps.kruise.io_imagepulljobs.yaml b/config/crd/bases/apps.kruise.io_imagepulljobs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: imagepulljobs.apps.kruise.io
 spec:
@@ -153,6 +153,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               pullPolicy:
                 description: PullPolicy is an optional field to set parameters of
                   the pulling task. If not specified, the system will use the default
@@ -241,6 +242,7 @@ spec:
                       type: string
                     type: array
                 type: object
+                x-kubernetes-map-type: atomic
             required:
             - completionPolicy
             - image

diff --git a/config/crd/bases/apps.kruise.io_nodeimages.yaml b/config/crd/bases/apps.kruise.io_nodeimages.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: nodeimages.apps.kruise.io
 spec:
@@ -179,6 +179,7 @@ spec:
                                   description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             type: array
                           pullPolicy:
                             description: PullPolicy is an optional field to set parameters

diff --git a/config/crd/bases/apps.kruise.io_nodepodprobes.yaml b/config/crd/bases/apps.kruise.io_nodepodprobes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: nodepodprobes.apps.kruise.io
 spec:

diff --git a/config/crd/bases/apps.kruise.io_persistentpodstates.yaml b/config/crd/bases/apps.kruise.io_persistentpodstates.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: persistentpodstates.apps.kruise.io
 spec:

diff --git a/config/crd/bases/apps.kruise.io_podprobemarkers.yaml b/config/crd/bases/apps.kruise.io_podprobemarkers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: podprobemarkers.apps.kruise.io
 spec:
@@ -290,6 +290,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
             required:
             - probes
             - selector

diff --git a/config/crd/bases/apps.kruise.io_resourcedistributions.yaml b/config/crd/bases/apps.kruise.io_resourcedistributions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: resourcedistributions.apps.kruise.io
 spec:
@@ -142,6 +142,7 @@ spec:
                           "value". The requirements are ANDed.
                         type: object
                     type: object
+                    x-kubernetes-map-type: atomic
                 type: object
             required:
             - resource

diff --git a/config/crd/bases/apps.kruise.io_sidecarsets.yaml b/config/crd/bases/apps.kruise.io_sidecarsets.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: sidecarsets.apps.kruise.io
 spec:
@@ -106,6 +106,7 @@ spec:
                                 required:
                                 - fieldPath
                                 type: object
+                                x-kubernetes-map-type: atomic
                             type: object
                         type: object
                       type: array
@@ -141,6 +142,7 @@ spec:
                         TODO: Add other useful fields. apiVersion, kind, uid?'
                       type: string
                   type: object
+                  x-kubernetes-map-type: atomic
                 type: array
               initContainers:
                 description: InitContainers is the list of init containers to be injected
@@ -195,6 +197,7 @@ spec:
                                 required:
                                 - fieldPath
                                 type: object
+                                x-kubernetes-map-type: atomic
                             type: object
                         type: object
                       type: array
@@ -299,6 +302,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               patchPodMetadata:
                 description: SidecarSet support to inject & in-place update metadata
                   in pod.
@@ -364,6 +368,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               updateStrategy:
                 description: The sidecarset updateStrategy to use to replace existing
                   pods with new ones.
@@ -472,6 +477,7 @@ spec:
                                     requirements are ANDed.
                                   type: object
                               type: object
+                              x-kubernetes-map-type: atomic
                             weight:
                               description: Weight associated with matching the corresponding
                                 matchExpressions, in the range 1-100.
@@ -548,6 +554,7 @@ spec:
                           "value". The requirements are ANDed.
                         type: object
                     type: object
+                    x-kubernetes-map-type: atomic
                   type:
                     description: Type is NotUpdate, the SidecarSet don't update the
                       injected pods, it will only inject sidecar container into the

diff --git a/config/crd/bases/apps.kruise.io_statefulsets.yaml b/config/crd/bases/apps.kruise.io_statefulsets.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: statefulsets.apps.kruise.io
 spec:
@@ -145,6 +145,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               serviceName:
                 description: 'serviceName is the name of the service that governs
                   this StatefulSet. This service must exist before the StatefulSet,
@@ -310,6 +311,7 @@ spec:
                                             only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
                                     weight:
                                       description: Weight associated with matching
                                         the corresponding matchExpressions, in the
@@ -687,6 +689,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               serviceName:
                 description: 'serviceName is the name of the service that governs
                   this StatefulSet. This service must exist before the StatefulSet,
@@ -852,6 +855,7 @@ spec:
                                             only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
                                     weight:
                                       description: Weight associated with matching
                                         the corresponding matchExpressions, in the