Skip to content

Commit 0d76248

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#1669 from shiftstack/kustomize
🌱Fix various issues with CRD generation
2 parents 08bfcfc + 74e96b0 commit 0d76248

18 files changed

+140
-417
lines changed

‎api/v1alpha5/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.

‎api/v1alpha6/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.

‎api/v1alpha7/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/infrastructure.cluster.x-k8s.io_openstackclusters.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.10.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.13.0
87
name: openstackclusters.infrastructure.cluster.x-k8s.io
98
spec:
109
group: infrastructure.cluster.x-k8s.io

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.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.10.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.13.0
87
name: openstackclustertemplates.infrastructure.cluster.x-k8s.io
98
spec:
109
group: infrastructure.cluster.x-k8s.io

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.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.10.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.13.0
87
name: openstackmachines.infrastructure.cluster.x-k8s.io
98
spec:
109
group: infrastructure.cluster.x-k8s.io

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.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.10.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.13.0
87
name: openstackmachinetemplates.infrastructure.cluster.x-k8s.io
98
spec:
109
group: infrastructure.cluster.x-k8s.io

‎config/crd/kustomization.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ resources:
1111
- bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml
1212
# +kubebuilder:scaffold:crdkustomizeresource
1313

14-
patchesStrategicMerge:
14+
patches:
1515
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
1616
# patches here are for enabling the conversion webhook for each CRD
17-
- patches/webhook_in_openstackclusters.yaml
18-
- patches/webhook_in_openstackmachines.yaml
19-
- patches/webhook_in_openstackmachinetemplates.yaml
20-
- patches/webhook_in_openstackclustertemplates.yaml
17+
- path: patches/webhook_in_openstackclusters.yaml
18+
- path: patches/webhook_in_openstackmachines.yaml
19+
- path: patches/webhook_in_openstackmachinetemplates.yaml
20+
- path: patches/webhook_in_openstackclustertemplates.yaml
2121
# +kubebuilder:scaffold:crdkustomizewebhookpatch
2222

2323
# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
2424
# patches here are for enabling the CA injection for each CRD
25-
- patches/cainjection_in_openstackclusters.yaml
26-
- patches/cainjection_in_openstackmachines.yaml
27-
- patches/cainjection_in_openstackmachinetemplates.yaml
28-
- patches/cainjection_in_openstackclustertemplates.yaml
25+
- path: patches/cainjection_in_openstackclusters.yaml
26+
- path: patches/cainjection_in_openstackmachines.yaml
27+
- path: patches/cainjection_in_openstackmachinetemplates.yaml
28+
- path: patches/cainjection_in_openstackclustertemplates.yaml
2929
# +kubebuilder:scaffold:crdkustomizecainjectionpatch
3030

3131
# the following config is for teaching kustomize how to do kustomization for CRDs.

‎config/default/cainjection_patch.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- op: add
2+
path: "/metadata/annotations/cert-manager.io~1inject-ca-from"
3+
value: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)

‎config/default/kustomization.yaml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,31 @@ commonLabels:
77

88
resources:
99
- namespace.yaml
10-
11-
bases:
1210
- ../crd
1311
- ../rbac
1412
- ../manager
1513
- ../webhook
1614
- ../certmanager
1715

18-
patchesStrategicMerge:
16+
patches:
1917
# Provide customizable hook for make targets.
20-
- manager_image_patch.yaml
21-
- manager_pull_policy.yaml
18+
- path: manager_image_patch.yaml
19+
- path: manager_pull_policy.yaml
2220
# Enable webhook.
23-
- manager_webhook_patch.yaml
21+
- path: manager_webhook_patch.yaml
2422
# Inject certificate in the webhook definition.
25-
- webhookcainjection_patch.yaml
23+
- target:
24+
group: admissionregistration.k8s.io
25+
version: v1
26+
kind: MutatingWebhookConfiguration
27+
name: mutating-webhook-configuration
28+
path: cainjection_patch.yaml
29+
- target:
30+
group: admissionregistration.k8s.io
31+
version: v1
32+
kind: ValidatingWebhookConfiguration
33+
name: validating-webhook-configuration
34+
path: cainjection_patch.yaml
2635

2736
vars:
2837
- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR

‎config/default/webhookcainjection_patch.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: admissionregistration.k8s.io/v1
33
kind: MutatingWebhookConfiguration
44
metadata:
5-
creationTimestamp: null
65
name: mutating-webhook-configuration
76
webhooks:
87
- admissionReviewVersions:
@@ -72,7 +71,6 @@ webhooks:
7271
apiVersion: admissionregistration.k8s.io/v1
7372
kind: ValidatingWebhookConfiguration
7473
metadata:
75-
creationTimestamp: null
7674
name: validating-webhook-configuration
7775
webhooks:
7876
- admissionReviewVersions:

‎hack/boilerplate/boilerplate.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ def file_passes(filename, refs, regexs):
107107

108108
data = data.splitlines()
109109

110+
# trim leading blank lines
111+
while len(data) > 0 and data[0] == "":
112+
data = data[1:]
113+
110114
# if our test file is smaller than the reference it surely fails!
111115
if len(ref) > len(data):
112116
print('File %s smaller than reference (%d < %d)' %

‎hack/tools/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ $(GOLANGCI_LINT): Makefile ensure-golangci-lint.sh | $(BIN_DIR)
105105

106106
KUSTOMIZE := $(BIN_DIR)/kustomize
107107
$(KUSTOMIZE): go.mod go.sum | $(BIN_DIR) # Build kustomize from tools folder.
108-
CGO_ENABLED=0 go build -tags=tools -o $@ sigs.k8s.io/kustomize/kustomize/v4
108+
CGO_ENABLED=0 go build -tags=tools -o $@ sigs.k8s.io/kustomize/kustomize/v5
109109

110110
MDBOOK_SHARE := $(SHARE_DIR)/mdbook$(MDBOOK_ARCHIVE_EXT)
111111
$(MDBOOK_SHARE): ../../versions.mk $(SHARE_DIR)

‎hack/tools/go.mod

Lines changed: 32 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,82 +6,73 @@ require (
66
github.com/a8m/envsubst v1.2.0
77
github.com/golang/mock v1.6.0
88
github.com/itchyny/gojq v0.12.2
9-
github.com/onsi/ginkgo/v2 v2.9.2
10-
k8s.io/code-generator v0.25.0
9+
github.com/onsi/ginkgo/v2 v2.9.4
10+
k8s.io/code-generator v0.28.0
1111
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6
12-
sigs.k8s.io/controller-tools v0.10.0
13-
sigs.k8s.io/kind v0.14.0
14-
sigs.k8s.io/kustomize/kustomize/v4 v4.4.0
12+
sigs.k8s.io/controller-tools v0.13.0
13+
sigs.k8s.io/kustomize/kustomize/v5 v5.1.1
1514
)
1615

1716
require (
18-
github.com/BurntSushi/toml v1.2.1 // indirect
19-
github.com/alessio/shellescape v1.4.1 // indirect
20-
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
2117
github.com/blang/semver v3.5.1+incompatible // indirect
2218
github.com/davecgh/go-spew v1.1.1 // indirect
2319
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2420
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
25-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
26-
github.com/fatih/color v1.14.1 // indirect
27-
github.com/go-errors/errors v1.0.1 // indirect
21+
github.com/fatih/color v1.15.0 // indirect
22+
github.com/go-errors/errors v1.4.2 // indirect
2823
github.com/go-logr/logr v1.2.4 // indirect
29-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
30-
github.com/go-openapi/jsonreference v0.20.0 // indirect
24+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
25+
github.com/go-openapi/jsonreference v0.20.2 // indirect
3126
github.com/go-openapi/swag v0.22.3 // indirect
3227
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
33-
github.com/gobuffalo/flect v0.3.0 // indirect
28+
github.com/gobuffalo/flect v1.0.2 // indirect
3429
github.com/gogo/protobuf v1.3.2 // indirect
3530
github.com/golang/protobuf v1.5.3 // indirect
36-
github.com/google/gnostic v0.6.9 // indirect
31+
github.com/google/gnostic-models v0.6.8 // indirect
32+
github.com/google/go-cmp v0.5.9 // indirect
3733
github.com/google/gofuzz v1.2.0 // indirect
3834
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
3935
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
4036
github.com/imdario/mergo v0.3.13 // indirect
41-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
37+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4238
github.com/itchyny/go-flags v1.5.0 // indirect
4339
github.com/itchyny/timefmt-go v0.1.2 // indirect
4440
github.com/josharian/intern v1.0.0 // indirect
4541
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/kr/pretty v0.3.0 // indirect
4742
github.com/mailru/easyjson v0.7.7 // indirect
4843
github.com/mattn/go-colorable v0.1.13 // indirect
4944
github.com/mattn/go-isatty v0.0.17 // indirect
5045
github.com/mattn/go-runewidth v0.0.9 // indirect
51-
github.com/mitchellh/mapstructure v1.5.0 // indirect
5246
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5347
github.com/modern-go/reflect2 v1.0.2 // indirect
5448
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
55-
github.com/olekukonko/tablewriter v0.0.5 // indirect
56-
github.com/pelletier/go-toml v1.9.5 // indirect
5749
github.com/pkg/errors v0.9.1 // indirect
58-
github.com/rogpeppe/go-internal v1.9.0 // indirect
59-
github.com/spf13/cobra v1.6.1 // indirect
50+
github.com/spf13/cobra v1.7.0 // indirect
6051
github.com/spf13/pflag v1.0.5 // indirect
61-
github.com/stretchr/testify v1.8.1 // indirect
62-
github.com/xlab/treeprint v1.1.0 // indirect
52+
github.com/xlab/treeprint v1.2.0 // indirect
6353
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
64-
golang.org/x/mod v0.9.0 // indirect
65-
golang.org/x/net v0.8.0 // indirect
66-
golang.org/x/sys v0.7.0 // indirect
67-
golang.org/x/text v0.8.0 // indirect
68-
golang.org/x/tools v0.7.0 // indirect
69-
google.golang.org/protobuf v1.28.1 // indirect
54+
golang.org/x/mod v0.12.0 // indirect
55+
golang.org/x/net v0.14.0 // indirect
56+
golang.org/x/sys v0.11.0 // indirect
57+
golang.org/x/text v0.12.0 // indirect
58+
golang.org/x/tools v0.12.0 // indirect
59+
golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
60+
google.golang.org/protobuf v1.30.0 // indirect
7061
gopkg.in/inf.v0 v0.9.1 // indirect
7162
gopkg.in/yaml.v2 v2.4.0 // indirect
7263
gopkg.in/yaml.v3 v3.0.1 // indirect
73-
k8s.io/api v0.25.0 // indirect
74-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
75-
k8s.io/apimachinery v0.25.0 // indirect
76-
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
77-
k8s.io/klog/v2 v2.80.1 // indirect
78-
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
79-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
80-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
64+
k8s.io/api v0.28.0 // indirect
65+
k8s.io/apiextensions-apiserver v0.28.0 // indirect
66+
k8s.io/apimachinery v0.28.0 // indirect
67+
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
68+
k8s.io/klog/v2 v2.100.1 // indirect
69+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
70+
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
71+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8172
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect
82-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
83-
sigs.k8s.io/kustomize/cmd/config v0.10.1 // indirect
84-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
73+
sigs.k8s.io/kustomize/api v0.14.0 // indirect
74+
sigs.k8s.io/kustomize/cmd/config v0.11.3 // indirect
75+
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
8576
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
8677
sigs.k8s.io/yaml v1.3.0 // indirect
8778
)

0 commit comments

Comments
 (0)