Fix controller-gen version update, re-generate crds

topfreegames · Feb 28, 2024 · 9df61a8 · 9df61a8
1 parent 53a520e
commit 9df61a8
Show file tree

Hide file tree

Showing 8 changed files with 3,212 additions and 2,088 deletions.
diff --git a/Makefile b/Makefile
@@ -4,8 +4,6 @@ RELEASE_TAG ?= $(shell git describe --tags --abbrev=0 2>/dev/null)
 
 # Image URL to use all building/pushing image targets
 IMG ?= tfgco/kubernetes-kops-operator:$(RELEASE_TAG)
-# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= crd
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -41,7 +39,7 @@ help: ## Display this help.
 ##@ Development
 
 manifests: controller-gen kustomize ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) crd:generateEmbeddedObjectMeta=true rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) crd:generateEmbeddedObjectMeta=true rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 	$(KUSTOMIZE) build config/crd -o config/crd/output
 
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -115,7 +113,7 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.13.0
+CONTROLLER_TOOLS_VERSION ?= v0.14.0
 GOLANGCI_LINT_VERSION ?= v1.56.2
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
@@ -125,9 +123,8 @@ $(KUSTOMIZE): $(LOCALBIN)
 	test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
 
 .PHONY: controller-gen
-controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
-$(CONTROLLER_GEN): $(LOCALBIN)
-	test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
+controller-gen: ## Download controller-gen locally if necessary.
+	(test -s $(LOCALBIN)/controller-gen && [ "$(shell ${LOCALBIN}/controller-gen --version)" == "*${CONTROLLER_TOOLS_VERSION}*" ]) || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
 
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.

diff --git a/apis/controlplane/v1alpha1/zz_generated.deepcopy.go b/apis/controlplane/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/infrastructure/v1alpha1/zz_generated.deepcopy.go b/apis/infrastructure/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_kopscontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_kopscontrolplanes.yaml
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_kopsmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_kopsmachinepools.yaml
diff --git a/...s.k8s.io_v1_customresourcedefinition_kopscontrolplanes.controlplane.cluster.x-k8s.io.yaml b/...s.k8s.io_v1_customresourcedefinition_kopscontrolplanes.controlplane.cluster.x-k8s.io.yaml
diff --git a/....k8s.io_v1_customresourcedefinition_kopsmachinepools.infrastructure.cluster.x-k8s.io.yaml b/....k8s.io_v1_customresourcedefinition_kopsmachinepools.infrastructure.cluster.x-k8s.io.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups: