Skip to content

Commit 4dbe25c

Browse files
everettraveneverettraven
authored
bump kubebuilder to v3.13.0 (#284)
Signed-off-by: everettraven <[email protected]>
1 parent 6293737 commit 4dbe25c

File tree

14 files changed

+70
-82
lines changed

14 files changed

+70
-82
lines changed

‎go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/prometheus/client_golang v1.18.0
1616
github.com/sergi/go-diff v1.2.0
1717
github.com/sirupsen/logrus v1.9.3
18-
github.com/spf13/afero v1.9.5
18+
github.com/spf13/afero v1.10.0
1919
github.com/spf13/cobra v1.8.0
2020
github.com/spf13/pflag v1.0.5
2121
github.com/stretchr/testify v1.8.4
@@ -28,7 +28,7 @@ require (
2828
k8s.io/client-go v0.28.5
2929
k8s.io/utils v0.0.0-20230505201702-9f6742963106
3030
sigs.k8s.io/controller-runtime v0.16.3
31-
sigs.k8s.io/kubebuilder/v3 v3.11.1
31+
sigs.k8s.io/kubebuilder/v3 v3.13.0
3232
sigs.k8s.io/yaml v1.4.0
3333
)
3434

@@ -89,7 +89,7 @@ require (
8989
github.com/google/gnostic-models v0.6.8 // indirect
9090
github.com/google/go-cmp v0.6.0 // indirect
9191
github.com/google/gofuzz v1.2.0 // indirect
92-
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
92+
github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb // indirect
9393
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
9494
github.com/google/uuid v1.3.1 // indirect
9595
github.com/gorilla/handlers v1.5.1 // indirect
@@ -156,15 +156,15 @@ require (
156156
go.uber.org/zap v1.25.0 // indirect
157157
golang.org/x/crypto v0.17.0 // indirect
158158
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
159-
golang.org/x/mod v0.12.0 // indirect
159+
golang.org/x/mod v0.13.0 // indirect
160160
golang.org/x/net v0.17.0 // indirect
161161
golang.org/x/oauth2 v0.12.0 // indirect
162-
golang.org/x/sync v0.3.0 // indirect
162+
golang.org/x/sync v0.4.0 // indirect
163163
golang.org/x/sys v0.15.0 // indirect
164164
golang.org/x/term v0.15.0 // indirect
165165
golang.org/x/text v0.14.0 // indirect
166166
golang.org/x/time v0.3.0 // indirect
167-
golang.org/x/tools v0.12.0 // indirect
167+
golang.org/x/tools v0.14.0 // indirect
168168
google.golang.org/appengine v1.6.7 // indirect
169169
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
170170
google.golang.org/grpc v1.58.3 // indirect

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf
259259
github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
260260
github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
261261
github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
262-
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 h1:2XF1Vzq06X+inNqgJ9tRnGuw+ZVCB3FazXODD6JE1R8=
263-
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
262+
github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb h1:LCMfzVg3sflxTs4UvuP4D8CkoZnfHLe2qzqgDn/4OHs=
263+
github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
264264
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
265265
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
266266
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
@@ -447,8 +447,8 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
447447
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
448448
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
449449
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
450-
github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
451-
github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
450+
github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
451+
github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
452452
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
453453
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
454454
github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
@@ -568,8 +568,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
568568
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
569569
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
570570
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
571-
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
572-
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
571+
golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
572+
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
573573
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
574574
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
575575
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -632,8 +632,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
632632
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
633633
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
634634
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
635-
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
636-
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
635+
golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
636+
golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
637637
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
638638
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
639639
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -758,8 +758,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f
758758
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
759759
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
760760
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
761-
golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
762-
golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
761+
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
762+
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
763763
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
764764
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
765765
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -923,8 +923,8 @@ sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigw
923923
sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
924924
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
925925
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
926-
sigs.k8s.io/kubebuilder/v3 v3.11.1 h1:WbzjgZVIOYXJLRqal+j9YL4SjxjSvUuCas2j3NmzMq0=
927-
sigs.k8s.io/kubebuilder/v3 v3.11.1/go.mod h1:4Re8w/tE0RsqR2IN5VnwCUgsbaIPk9DcYcZlRVALA2M=
926+
sigs.k8s.io/kubebuilder/v3 v3.13.0 h1:ft1r2HdI29hEgtbuk3AEjOGX5A0N3jjbSA54oZzXH5I=
927+
sigs.k8s.io/kubebuilder/v3 v3.13.0/go.mod h1:BA3wwWd7P31jNLH9x+l5TzK6Of61SwY469ChO1+G2Cc=
928928
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 h1:XX3Ajgzov2RKUdc5jW3t5jwY7Bo7dcRm+tFxT+NfgY0=
929929
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3/go.mod h1:9n16EZKMhXBNSiUC5kSdFQJkdH3zbxS/JoO619G1VAY=
930930
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 h1:W6cLQc5pnqM7vh3b7HvGNfXrJ/xL6BDMS0v1V/HHg5U=

‎pkg/plugins/util/cleanup.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ func UpdateKustomizationsInit() error {
8989
`
9090
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
9191
# crd/kustomization.yaml
92-
#- manager_webhook_patch.yaml
92+
#- path: manager_webhook_patch.yaml
9393
9494
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
9595
# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
9696
# 'CERTMANAGER' needs to be enabled to use ca injection
97-
#- webhookcainjection_patch.yaml
97+
#- path: webhookcainjection_patch.yaml
9898
9999
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
100100
# Uncomment the following replacements to add the cert-manager CA injection annotations

‎testdata/hybrid/memcached-operator/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
111111
ENVTEST ?= $(LOCALBIN)/setup-envtest
112112

113113
## Tool Versions
114-
KUSTOMIZE_VERSION ?= v5.0.1
115-
CONTROLLER_TOOLS_VERSION ?= v0.12.0
114+
KUSTOMIZE_VERSION ?= v5.2.1
115+
CONTROLLER_TOOLS_VERSION ?= v0.13.0
116116

117117
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
118118
.PHONY: kustomize

‎testdata/hybrid/memcached-operator/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.

‎testdata/hybrid/memcached-operator/config/default/kustomization.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@ namePrefix: memcached-operator-
1515
# someName: someValue
1616

1717
resources:
18-
- ../crd
18+
#- ../crd
1919
- ../rbac
2020
- ../manager
2121
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
2222
#- ../prometheus
2323

24-
patchesStrategicMerge:
24+
patches:
2525
# Protect the /metrics endpoint by putting it behind auth.
2626
# If you want your controller-manager to expose the /metrics
2727
# endpoint w/o any authn/z, please comment the following line.
28-
- manager_auth_proxy_patch.yaml
29-
30-
28+
- path: manager_auth_proxy_patch.yaml

‎testdata/hybrid/memcached-operator/config/default/manager_auth_proxy_patch.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ spec:
1414
allowPrivilegeEscalation: false
1515
capabilities:
1616
drop:
17-
- "ALL"
18-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
17+
- "ALL"
18+
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
1919
args:
2020
- "--secure-listen-address=0.0.0.0:8443"
2121
- "--upstream=http://127.0.0.1:8080/"

‎testdata/hybrid/memcached-operator/config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ spec:
7575
allowPrivilegeEscalation: false
7676
capabilities:
7777
drop:
78-
- "ALL"
78+
- "ALL"
7979
livenessProbe:
8080
httpGet:
8181
path: /healthz

‎testdata/hybrid/memcached-operator/config/prometheus/monitor.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# Prometheus Monitor Service (Metrics)
32
apiVersion: monitoring.coreos.com/v1
43
kind: ServiceMonitor

‎testdata/hybrid/memcached-operator/config/rbac/role.yaml

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,15 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
4+
labels:
5+
app.kubernetes.io/name: clusterrole
6+
app.kubernetes.io/instance: manager-role
7+
app.kubernetes.io/component: rbac
8+
app.kubernetes.io/created-by: memcached-operator
9+
app.kubernetes.io/part-of: memcached-operator
10+
app.kubernetes.io/managed-by: kustomize
411
name: manager-role
512
rules:
6-
##
7-
## Base operator rules
8-
##
9-
# We need to get namespaces so the operator can read namespaces to ensure they exist
10-
- apiGroups:
11-
- ""
12-
resources:
13-
- namespaces
14-
verbs:
15-
- get
16-
# We need to manage Helm release secrets
17-
- apiGroups:
18-
- ""
19-
resources:
20-
- secrets
21-
verbs:
22-
- "*"
23-
# We need to create events on CRs about things happening during reconciliation
24-
- apiGroups:
25-
- ""
26-
resources:
27-
- events
28-
verbs:
29-
- create
30-
31-
#+kubebuilder:scaffold:rules
13+
- apiGroups: [""]
14+
resources: ["pods"]
15+
verbs: ["get", "list", "watch"]

0 commit comments

Comments
 (0)