From 5fcfc4850f23160aced01fb1e3b301e890fc64ef Mon Sep 17 00:00:00 2001 From: benrub Date: Fri, 6 Jan 2023 12:43:53 +0200 Subject: [PATCH] Go back to controller gen v0.9.0 to remove new CRD field being generated ("x-kubernetes-map-type: atomic") in order to support k8s 1.16 --- Makefile | 2 +- ...ers.carbonblack.io_cbcontainersagents.yaml | 57 +------------------ 2 files changed, 2 insertions(+), 57 deletions(-) diff --git a/Makefile b/Makefile index dd5f3e28..fdedcf3f 100644 --- a/Makefile +++ b/Makefile @@ -224,7 +224,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions KUSTOMIZE_VERSION ?= v4.5.5 -CONTROLLER_TOOLS_VERSION ?= v0.9.2 +CONTROLLER_TOOLS_VERSION ?= v0.9.0 CONTROLLER_TOOLS_OLD_VERSION ?= v0.6.2 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" diff --git a/config/crd/bases/operator.containers.carbonblack.io_cbcontainersagents.yaml b/config/crd/bases/operator.containers.carbonblack.io_cbcontainersagents.yaml index a6a5cddc..829c09ce 100644 --- a/config/crd/bases/operator.containers.carbonblack.io_cbcontainersagents.yaml +++ b/config/crd/bases/operator.containers.carbonblack.io_cbcontainersagents.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.9.0 creationTimestamp: null name: cbcontainersagents.operator.containers.carbonblack.io spec: @@ -167,7 +167,6 @@ spec: type: object type: array type: object - x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in @@ -281,12 +280,10 @@ spec: type: object type: array type: object - x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object - x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules @@ -377,7 +374,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies @@ -445,7 +441,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that @@ -561,7 +556,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -623,7 +617,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term @@ -740,7 +733,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies @@ -808,7 +800,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that @@ -924,7 +915,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -986,7 +976,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term @@ -1274,7 +1263,6 @@ spec: type: object type: array type: object - x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in @@ -1388,12 +1376,10 @@ spec: type: object type: array type: object - x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object - x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules @@ -1484,7 +1470,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies @@ -1552,7 +1537,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that @@ -1668,7 +1652,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -1730,7 +1713,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term @@ -1847,7 +1829,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies @@ -1915,7 +1896,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that @@ -2031,7 +2011,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -2093,7 +2072,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term @@ -2354,7 +2332,6 @@ spec: type: object type: array type: object - x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in @@ -2468,12 +2445,10 @@ spec: type: object type: array type: object - x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object - x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules @@ -2564,7 +2539,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies @@ -2632,7 +2606,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that @@ -2748,7 +2721,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -2810,7 +2782,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term @@ -2927,7 +2898,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies @@ -2995,7 +2965,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that @@ -3111,7 +3080,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -3173,7 +3141,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term @@ -3567,7 +3534,6 @@ spec: type: object type: array type: object - x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in @@ -3681,12 +3647,10 @@ spec: type: object type: array type: object - x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object - x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules @@ -3777,7 +3741,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies @@ -3845,7 +3808,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that @@ -3961,7 +3923,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -4023,7 +3984,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term @@ -4140,7 +4100,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies @@ -4208,7 +4167,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that @@ -4324,7 +4282,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -4386,7 +4343,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term @@ -4774,7 +4730,6 @@ spec: type: object type: array type: object - x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in @@ -4888,12 +4843,10 @@ spec: type: object type: array type: object - x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object - x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules @@ -4984,7 +4937,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies @@ -5052,7 +5004,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that @@ -5168,7 +5119,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -5230,7 +5180,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term @@ -5347,7 +5296,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies @@ -5415,7 +5363,6 @@ spec: are ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that @@ -5531,7 +5478,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -5593,7 +5539,6 @@ spec: ANDed. type: object type: object - x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term