diff --git a/Makefile b/Makefile index 3d8206e3..b5bfa577 100644 --- a/Makefile +++ b/Makefile @@ -124,18 +124,16 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions -KUSTOMIZE_VERSION ?= v3.8.7 -CONTROLLER_TOOLS_VERSION ?= v0.9.0 +KUSTOMIZE_VERSION ?= v5.0.3 +CONTROLLER_TOOLS_VERSION ?= v0.13.0 +GOARCH := $(shell go env GOARCH) +GOOS := $(shell go env GOOS) -KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. $(KUSTOMIZE): $(LOCALBIN) -ifeq ("$(wildcard $(KUSTOMIZE))","") - curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN) -else - $(info Using preexisting ${KUSTOMIZE}) -endif + cd $(LOCALBIN) && curl -fsSL --continue-at - https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F$(KUSTOMIZE_VERSION)/kustomize_$(KUSTOMIZE_VERSION)_$(GOOS)_$(GOARCH).tar.gz | tar xvz + chmod +x $(KUSTOMIZE) .PHONY: controller-gen controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 0c478ac6..13ed0782 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022 DigitalOcean. diff --git a/config/crd/bases/databases.digitalocean.com_databaseclusterreferences.yaml b/config/crd/bases/databases.digitalocean.com_databaseclusterreferences.yaml index 112e4554..1165c440 100644 --- a/config/crd/bases/databases.digitalocean.com_databaseclusterreferences.yaml +++ b/config/crd/bases/databases.digitalocean.com_databaseclusterreferences.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: databaseclusterreferences.databases.digitalocean.com spec: group: databases.digitalocean.com diff --git a/config/crd/bases/databases.digitalocean.com_databaseclusters.yaml b/config/crd/bases/databases.digitalocean.com_databaseclusters.yaml index 055cfbc1..8cd4da44 100644 --- a/config/crd/bases/databases.digitalocean.com_databaseclusters.yaml +++ b/config/crd/bases/databases.digitalocean.com_databaseclusters.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: databaseclusters.databases.digitalocean.com spec: group: databases.digitalocean.com diff --git a/config/crd/bases/databases.digitalocean.com_databaseuserreferences.yaml b/config/crd/bases/databases.digitalocean.com_databaseuserreferences.yaml index 6da862ad..152019ab 100644 --- a/config/crd/bases/databases.digitalocean.com_databaseuserreferences.yaml +++ b/config/crd/bases/databases.digitalocean.com_databaseuserreferences.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: databaseuserreferences.databases.digitalocean.com spec: group: databases.digitalocean.com @@ -69,6 +68,7 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic username: description: Username is the username of the referenced user. type: string diff --git a/config/crd/bases/databases.digitalocean.com_databaseusers.yaml b/config/crd/bases/databases.digitalocean.com_databaseusers.yaml index bb82649a..f9ac6c78 100644 --- a/config/crd/bases/databases.digitalocean.com_databaseusers.yaml +++ b/config/crd/bases/databases.digitalocean.com_databaseusers.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: databaseusers.databases.digitalocean.com spec: group: databases.digitalocean.com @@ -65,6 +64,7 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic username: description: Username is the username for the user. type: string diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index d364931d..573e4849 100644 --- 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: diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index fdeaca4c..913f6f83 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -2,7 +2,6 @@ apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: - creationTimestamp: null name: validating-webhook-configuration webhooks: - admissionReviewVersions: