Skip to content

Commit 6811e25

Browse files
update controller-gen and kustomize, update the generated code and manifests
1 parent 425c7fe commit 6811e25

8 files changed

+12
-19
lines changed

Makefile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,18 +124,16 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
124124
ENVTEST ?= $(LOCALBIN)/setup-envtest
125125

126126
## Tool Versions
127-
KUSTOMIZE_VERSION ?= v3.8.7
128-
CONTROLLER_TOOLS_VERSION ?= v0.9.0
127+
KUSTOMIZE_VERSION ?= v5.0.3
128+
CONTROLLER_TOOLS_VERSION ?= v0.13.0
129+
GOARCH := $(shell go env GOARCH)
130+
GOOS := $(shell go env GOOS)
129131

130-
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
131132
.PHONY: kustomize
132133
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
133134
$(KUSTOMIZE): $(LOCALBIN)
134-
ifeq ("$(wildcard $(KUSTOMIZE))","")
135-
curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN)
136-
else
137-
$(info Using preexisting ${KUSTOMIZE})
138-
endif
135+
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
136+
chmod +x $(KUSTOMIZE)
139137

140138
.PHONY: controller-gen
141139
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/databases.digitalocean.com_databaseclusterreferences.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.13.0
87
name: databaseclusterreferences.databases.digitalocean.com
98
spec:
109
group: databases.digitalocean.com

config/crd/bases/databases.digitalocean.com_databaseclusters.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.13.0
87
name: databaseclusters.databases.digitalocean.com
98
spec:
109
group: databases.digitalocean.com

config/crd/bases/databases.digitalocean.com_databaseuserreferences.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.13.0
87
name: databaseuserreferences.databases.digitalocean.com
98
spec:
109
group: databases.digitalocean.com
@@ -69,6 +68,7 @@ spec:
6968
- kind
7069
- name
7170
type: object
71+
x-kubernetes-map-type: atomic
7272
username:
7373
description: Username is the username of the referenced user.
7474
type: string

config/crd/bases/databases.digitalocean.com_databaseusers.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.13.0
87
name: databaseusers.databases.digitalocean.com
98
spec:
109
group: databases.digitalocean.com
@@ -65,6 +64,7 @@ spec:
6564
- kind
6665
- name
6766
type: object
67+
x-kubernetes-map-type: atomic
6868
username:
6969
description: Username is the username for the user.
7070
type: string

config/rbac/role.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
5-
creationTimestamp: null
65
name: manager-role
76
rules:
87
- apiGroups:

config/webhook/manifests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: admissionregistration.k8s.io/v1
33
kind: ValidatingWebhookConfiguration
44
metadata:
5-
creationTimestamp: null
65
name: validating-webhook-configuration
76
webhooks:
87
- admissionReviewVersions:

0 commit comments

Comments
 (0)