Skip to content

Commit 9c82fc3

Browse files
committed
* Update kubebuilder to v3.14.2
* Use operator-lib v0.13.0 instead of commit. * Regenerated testdata.
1 parent b3b6f3e commit 9c82fc3

21 files changed

+62
-121
lines changed

go.mod

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
github.com/kr/text v0.2.0
88
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
99
github.com/onsi/ginkgo/v2 v2.17.1
10-
github.com/onsi/gomega v1.32.0
11-
github.com/operator-framework/operator-lib v0.12.1-0.20240430173419-b394e34ce702
10+
github.com/onsi/gomega v1.33.0
11+
github.com/operator-framework/operator-lib v0.13.0
1212
github.com/operator-framework/operator-registry v1.39.0
1313
github.com/prometheus/client_golang v1.19.0
1414
github.com/prometheus/client_model v0.6.1
@@ -26,7 +26,7 @@ require (
2626
k8s.io/kubectl v0.29.3
2727
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
2828
sigs.k8s.io/controller-runtime v0.17.2
29-
sigs.k8s.io/kubebuilder/v3 v3.14.1
29+
sigs.k8s.io/kubebuilder/v3 v3.14.2
3030
sigs.k8s.io/yaml v1.4.0
3131
)
3232

@@ -84,13 +84,14 @@ require (
8484
go.uber.org/multierr v1.11.0 // indirect
8585
go.uber.org/zap v1.26.0 // indirect
8686
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
87-
golang.org/x/mod v0.16.0 // indirect
88-
golang.org/x/net v0.22.0 // indirect
87+
golang.org/x/mod v0.17.0 // indirect
88+
golang.org/x/net v0.24.0 // indirect
8989
golang.org/x/oauth2 v0.17.0 // indirect
90-
golang.org/x/sys v0.18.0 // indirect
91-
golang.org/x/term v0.18.0 // indirect
90+
golang.org/x/sync v0.7.0 // indirect
91+
golang.org/x/sys v0.19.0 // indirect
92+
golang.org/x/term v0.19.0 // indirect
9293
golang.org/x/time v0.5.0 // indirect
93-
golang.org/x/tools v0.19.0 // indirect
94+
golang.org/x/tools v0.20.0 // indirect
9495
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9596
google.golang.org/appengine v1.6.8 // indirect
9697
google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect

go.sum

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J
192192
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
193193
github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8=
194194
github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
195-
github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk=
196-
github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg=
195+
github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE=
196+
github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY=
197197
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
198198
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
199199
github.com/opencontainers/image-spec v1.1.0-rc6 h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU=
@@ -204,8 +204,8 @@ github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bl
204204
github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
205205
github.com/operator-framework/api v0.23.0 h1:kHymOwcHBpBVujT49SKOCd4EVG7Odwj4wl3NbOR2LLA=
206206
github.com/operator-framework/api v0.23.0/go.mod h1:oKcFOz+Xc1UhMi2Pzcp6qsO7wjS4r+yP7EQprQBXrfM=
207-
github.com/operator-framework/operator-lib v0.12.1-0.20240430173419-b394e34ce702 h1:3aD8l95+Bfp6y0speIxgF+6bLpoAbvF6XxpCHrbUh0o=
208-
github.com/operator-framework/operator-lib v0.12.1-0.20240430173419-b394e34ce702/go.mod h1:RDs1wGdOKWSMCO+BYSbqmmKGnD5jOP7TVP+KvoX8jMg=
207+
github.com/operator-framework/operator-lib v0.13.0 h1:+TWgJhbJqyNix9m1LmHK5gY/lb3CGqZX3Wvl7K0k+6I=
208+
github.com/operator-framework/operator-lib v0.13.0/go.mod h1:RDs1wGdOKWSMCO+BYSbqmmKGnD5jOP7TVP+KvoX8jMg=
209209
github.com/operator-framework/operator-registry v1.39.0 h1:GiAlmA2h16sLpLjVIuURd2ANm7wYoUbssGCJbdGauYw=
210210
github.com/operator-framework/operator-registry v1.39.0/go.mod h1:PxN7myibIBIHeXTNu65tIJkCl1HuFDMU3NN6jrPHJLs=
211211
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
@@ -326,31 +326,31 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
326326
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
327327
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
328328
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
329-
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
330-
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
329+
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
330+
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
331331
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
332332
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
333333
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
334334
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
335335
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
336-
golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
337-
golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
336+
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
337+
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
338338
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
339339
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
340340
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
341341
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
342342
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
343343
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
344-
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
345-
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
344+
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
345+
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
346346
golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ=
347347
golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
348348
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
349349
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
350350
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
351351
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
352-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
353-
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
352+
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
353+
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
354354
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
355355
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
356356
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -359,12 +359,12 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
359359
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
360360
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
361361
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
362-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
363-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
362+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
363+
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
364364
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
365365
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
366-
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
367-
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
366+
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
367+
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
368368
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
369369
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
370370
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -378,8 +378,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
378378
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
379379
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
380380
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
381-
golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
382-
golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
381+
golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
382+
golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
383383
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
384384
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
385385
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -439,8 +439,8 @@ sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeG
439439
sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
440440
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
441441
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
442-
sigs.k8s.io/kubebuilder/v3 v3.14.1 h1:ryXUkU2Hd7eJUWrWd635NGjQSHhBG0QvRAvo6ux7NhM=
443-
sigs.k8s.io/kubebuilder/v3 v3.14.1/go.mod h1:1IbNoW5yuKy/kMXrBpDgKPvvxaj2TgBNDdwFXQlC6bk=
442+
sigs.k8s.io/kubebuilder/v3 v3.14.2 h1:LMZW8Y5eItnP4kh9tpp4Gs2Gd5V3DgLgzbNnXfMAShY=
443+
sigs.k8s.io/kubebuilder/v3 v3.14.2/go.mod h1:gEZM8SUkewOQnpRDiewh4gmbQ1FMkT/CDlMddOg053M=
444444
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
445445
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
446446
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

testdata/memcached-molecule-operator/config/default/manager_auth_proxy_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
capabilities:
1616
drop:
1717
- "ALL"
18-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
18+
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
1919
args:
2020
- "--secure-listen-address=0.0.0.0:8443"
2121
- "--upstream=http://127.0.0.1:8080/"

testdata/memcached-molecule-operator/config/manager/manager.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ kind: Namespace
33
metadata:
44
labels:
55
control-plane: controller-manager
6-
app.kubernetes.io/name: namespace
7-
app.kubernetes.io/instance: system
8-
app.kubernetes.io/component: manager
9-
app.kubernetes.io/created-by: memcached-molecule-operator
10-
app.kubernetes.io/part-of: memcached-molecule-operator
6+
app.kubernetes.io/name: memcached-molecule-operator
117
app.kubernetes.io/managed-by: kustomize
128
name: system
139
---
@@ -18,11 +14,7 @@ metadata:
1814
namespace: system
1915
labels:
2016
control-plane: controller-manager
21-
app.kubernetes.io/name: deployment
22-
app.kubernetes.io/instance: controller-manager
23-
app.kubernetes.io/component: manager
24-
app.kubernetes.io/created-by: memcached-molecule-operator
25-
app.kubernetes.io/part-of: memcached-molecule-operator
17+
app.kubernetes.io/name: memcached-molecule-operator
2618
app.kubernetes.io/managed-by: kustomize
2719
spec:
2820
selector:

testdata/memcached-molecule-operator/config/prometheus/monitor.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ kind: ServiceMonitor
44
metadata:
55
labels:
66
control-plane: controller-manager
7-
app.kubernetes.io/name: servicemonitor
8-
app.kubernetes.io/instance: controller-manager-metrics-monitor
9-
app.kubernetes.io/component: metrics
10-
app.kubernetes.io/created-by: memcached-molecule-operator
11-
app.kubernetes.io/part-of: memcached-molecule-operator
7+
app.kubernetes.io/name: memcached-molecule-operator
128
app.kubernetes.io/managed-by: kustomize
139
name: controller-manager-metrics-monitor
1410
namespace: system

testdata/memcached-molecule-operator/config/rbac/auth_proxy_client_clusterrole.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
44
labels:
5-
app.kubernetes.io/name: clusterrole
6-
app.kubernetes.io/instance: metrics-reader
7-
app.kubernetes.io/component: kube-rbac-proxy
8-
app.kubernetes.io/created-by: memcached-molecule-operator
9-
app.kubernetes.io/part-of: memcached-molecule-operator
5+
app.kubernetes.io/name: memcached-molecule-operator
106
app.kubernetes.io/managed-by: kustomize
117
name: metrics-reader
128
rules:

testdata/memcached-molecule-operator/config/rbac/auth_proxy_role.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
44
labels:
5-
app.kubernetes.io/name: clusterrole
6-
app.kubernetes.io/instance: proxy-role
7-
app.kubernetes.io/component: kube-rbac-proxy
8-
app.kubernetes.io/created-by: memcached-molecule-operator
9-
app.kubernetes.io/part-of: memcached-molecule-operator
5+
app.kubernetes.io/name: memcached-molecule-operator
106
app.kubernetes.io/managed-by: kustomize
117
name: proxy-role
128
rules:

testdata/memcached-molecule-operator/config/rbac/auth_proxy_role_binding.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRoleBinding
33
metadata:
44
labels:
5-
app.kubernetes.io/name: clusterrolebinding
6-
app.kubernetes.io/instance: proxy-rolebinding
7-
app.kubernetes.io/component: kube-rbac-proxy
8-
app.kubernetes.io/created-by: memcached-molecule-operator
9-
app.kubernetes.io/part-of: memcached-molecule-operator
5+
app.kubernetes.io/name: memcached-molecule-operator
106
app.kubernetes.io/managed-by: kustomize
117
name: proxy-rolebinding
128
roleRef:

testdata/memcached-molecule-operator/config/rbac/auth_proxy_service.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ kind: Service
33
metadata:
44
labels:
55
control-plane: controller-manager
6-
app.kubernetes.io/name: service
7-
app.kubernetes.io/instance: controller-manager-metrics-service
8-
app.kubernetes.io/component: kube-rbac-proxy
9-
app.kubernetes.io/created-by: memcached-molecule-operator
10-
app.kubernetes.io/part-of: memcached-molecule-operator
6+
app.kubernetes.io/name: memcached-molecule-operator
117
app.kubernetes.io/managed-by: kustomize
128
name: controller-manager-metrics-service
139
namespace: system

testdata/memcached-molecule-operator/config/rbac/foo_editor_role.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
55
labels:
6-
app.kubernetes.io/name: clusterrole
7-
app.kubernetes.io/instance: foo-editor-role
8-
app.kubernetes.io/component: rbac
9-
app.kubernetes.io/created-by: memcached-molecule-operator
10-
app.kubernetes.io/part-of: memcached-molecule-operator
6+
app.kubernetes.io/name: memcached-molecule-operator
117
app.kubernetes.io/managed-by: kustomize
128
name: foo-editor-role
139
rules:

testdata/memcached-molecule-operator/config/rbac/foo_viewer_role.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
55
labels:
6-
app.kubernetes.io/name: clusterrole
7-
app.kubernetes.io/instance: foo-viewer-role
8-
app.kubernetes.io/component: rbac
9-
app.kubernetes.io/created-by: memcached-molecule-operator
10-
app.kubernetes.io/part-of: memcached-molecule-operator
6+
app.kubernetes.io/name: memcached-molecule-operator
117
app.kubernetes.io/managed-by: kustomize
128
name: foo-viewer-role
139
rules:

testdata/memcached-molecule-operator/config/rbac/ignore_secret_editor_role.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
55
labels:
6-
app.kubernetes.io/name: clusterrole
7-
app.kubernetes.io/instance: secret-editor-role
8-
app.kubernetes.io/component: rbac
9-
app.kubernetes.io/created-by: memcached-molecule-operator
10-
app.kubernetes.io/part-of: memcached-molecule-operator
6+
app.kubernetes.io/name: memcached-molecule-operator
117
app.kubernetes.io/managed-by: kustomize
12-
name: secret-editor-role
8+
name: ignore-secret-editor-role
139
rules:
1410
- apiGroups:
1511
- ignore.example.com

testdata/memcached-molecule-operator/config/rbac/ignore_secret_viewer_role.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
55
labels:
6-
app.kubernetes.io/name: clusterrole
7-
app.kubernetes.io/instance: secret-viewer-role
8-
app.kubernetes.io/component: rbac
9-
app.kubernetes.io/created-by: memcached-molecule-operator
10-
app.kubernetes.io/part-of: memcached-molecule-operator
6+
app.kubernetes.io/name: memcached-molecule-operator
117
app.kubernetes.io/managed-by: kustomize
12-
name: secret-viewer-role
8+
name: ignore-secret-viewer-role
139
rules:
1410
- apiGroups:
1511
- ignore.example.com

testdata/memcached-molecule-operator/config/rbac/kustomization.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,15 @@ resources:
1616
- auth_proxy_role.yaml
1717
- auth_proxy_role_binding.yaml
1818
- auth_proxy_client_clusterrole.yaml
19+
# For each CRD, "Editor" and "Viewer" roles are scaffolded by
20+
# default, aiding admins in cluster management. Those roles are
21+
# not used by the Project itself. You can comment the following lines
22+
# if you do not want those helpers be installed with your Project.
23+
- ignore_secret_editor_role.yaml
24+
- ignore_secret_viewer_role.yaml
25+
- memfin_editor_role.yaml
26+
- memfin_viewer_role.yaml
27+
- foo_editor_role.yaml
28+
- foo_viewer_role.yaml
29+
- memcached_editor_role.yaml
30+
- memcached_viewer_role.yaml

testdata/memcached-molecule-operator/config/rbac/leader_election_role.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:
55
labels:
6-
app.kubernetes.io/name: role
7-
app.kubernetes.io/instance: leader-election-role
8-
app.kubernetes.io/component: rbac
9-
app.kubernetes.io/created-by: memcached-molecule-operator
10-
app.kubernetes.io/part-of: memcached-molecule-operator
6+
app.kubernetes.io/name: memcached-molecule-operator
117
app.kubernetes.io/managed-by: kustomize
128
name: leader-election-role
139
rules:

testdata/memcached-molecule-operator/config/rbac/leader_election_role_binding.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: RoleBinding
33
metadata:
44
labels:
5-
app.kubernetes.io/name: rolebinding
6-
app.kubernetes.io/instance: leader-election-rolebinding
7-
app.kubernetes.io/component: rbac
8-
app.kubernetes.io/created-by: memcached-molecule-operator
9-
app.kubernetes.io/part-of: memcached-molecule-operator
5+
app.kubernetes.io/name: memcached-molecule-operator
106
app.kubernetes.io/managed-by: kustomize
117
name: leader-election-rolebinding
128
roleRef:

testdata/memcached-molecule-operator/config/rbac/memcached_editor_role.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
55
labels:
6-
app.kubernetes.io/name: clusterrole
7-
app.kubernetes.io/instance: memcached-editor-role
8-
app.kubernetes.io/component: rbac
9-
app.kubernetes.io/created-by: memcached-molecule-operator
10-
app.kubernetes.io/part-of: memcached-molecule-operator
6+
app.kubernetes.io/name: memcached-molecule-operator
117
app.kubernetes.io/managed-by: kustomize
128
name: memcached-editor-role
139
rules:

testdata/memcached-molecule-operator/config/rbac/memcached_viewer_role.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
55
labels:
6-
app.kubernetes.io/name: clusterrole
7-
app.kubernetes.io/instance: memcached-viewer-role
8-
app.kubernetes.io/component: rbac
9-
app.kubernetes.io/created-by: memcached-molecule-operator
10-
app.kubernetes.io/part-of: memcached-molecule-operator
6+
app.kubernetes.io/name: memcached-molecule-operator
117
app.kubernetes.io/managed-by: kustomize
128
name: memcached-viewer-role
139
rules:

testdata/memcached-molecule-operator/config/rbac/memfin_editor_role.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
55
labels:
6-
app.kubernetes.io/name: clusterrole
7-
app.kubernetes.io/instance: memfin-editor-role
8-
app.kubernetes.io/component: rbac
9-
app.kubernetes.io/created-by: memcached-molecule-operator
10-
app.kubernetes.io/part-of: memcached-molecule-operator
6+
app.kubernetes.io/name: memcached-molecule-operator
117
app.kubernetes.io/managed-by: kustomize
128
name: memfin-editor-role
139
rules:

0 commit comments

Comments
 (0)