Merge pull request #390 from CecileRobertMichon/preserve-unknown-fiel…

…ds-false 🏃 [0.3] Add preserveUnknownFields=false marker
kubernetes-sigs · Feb 19, 2020 · 5b40c19 · 5b40c19
2 parents 2c5b485 + d1dbe62
commit 5b40c19
Show file tree

Hide file tree

Showing 6 changed files with 203 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -172,7 +172,7 @@ generate-go: $(CONTROLLER_GEN) $(MOCKGEN) $(CONVERSION_GEN) ## Runs Go related g
 generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
 	$(CONTROLLER_GEN) \
 		paths=./api/... \
-		crd:trivialVersions=true \
+		crd:trivialVersions=true,preserveUnknownFields=false \
 		output:crd:dir=$(CRD_ROOT) \
 		output:webhook:dir=$(WEBHOOK_ROOT) \
 		webhook

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml
@@ -3,6 +3,8 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
   name: azureclusters.infrastructure.cluster.x-k8s.io
 spec:
@@ -14,6 +16,7 @@ spec:
     listKind: AzureClusterList
     plural: azureclusters
     singular: azurecluster
+  preserveUnknownFields: false
   scope: Namespaced
   subresources:
     status: {}

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachines.yaml
@@ -3,6 +3,8 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
   name: azuremachines.infrastructure.cluster.x-k8s.io
 spec:
@@ -14,6 +16,7 @@ spec:
     listKind: AzureMachineList
     plural: azuremachines
     singular: azuremachine
+  preserveUnknownFields: false
   scope: Namespaced
   subresources:
     status: {}

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinetemplates.yaml
@@ -3,6 +3,8 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
   name: azuremachinetemplates.infrastructure.cluster.x-k8s.io
 spec:
@@ -14,6 +16,7 @@ spec:
     listKind: AzureMachineTemplateList
     plural: azuremachinetemplates
     singular: azuremachinetemplate
+  preserveUnknownFields: false
   scope: Namespaced
   validation:
     openAPIV3Schema:

diff --git a/hack/tools/go.mod b/hack/tools/go.mod
@@ -5,9 +5,9 @@ go 1.12
 require (
 	github.com/golang/mock v1.3.1
 	github.com/golangci/golangci-lint v1.19.1
-	k8s.io/code-generator v0.0.0-20190923155300-6206bfaf5c98
+	k8s.io/code-generator v0.17.0
 	sigs.k8s.io/cluster-api/hack/tools v0.0.0-20191002152509-a6b5ba419bad
-	sigs.k8s.io/controller-tools v0.2.1
+	sigs.k8s.io/controller-tools v0.2.5
 	sigs.k8s.io/testing_frameworks v0.1.1
 )