Skip to content

Commit 505383e

Browse files
bshepharbshephar
committed
Merge branch 'controller-runtime' into cr-update
2 parents 6410ccf + 1a2ffd2 commit 505383e

File tree

28 files changed

+296
-312
lines changed

28 files changed

+296
-312
lines changed

‎go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,24 @@ require (
1414
github.com/prometheus/client_golang v1.15.1
1515
github.com/sergi/go-diff v1.2.0
1616
github.com/sirupsen/logrus v1.9.3
17-
github.com/spf13/afero v1.9.5
1817
github.com/spf13/cobra v1.7.0
1918
github.com/spf13/pflag v1.0.5
2019
github.com/stretchr/testify v1.8.2
2120
gomodules.xyz/jsonpatch/v2 v2.3.0
2221
helm.sh/helm/v3 v3.12.1
23-
k8s.io/api v0.27.3
24-
k8s.io/apiextensions-apiserver v0.27.3
25-
k8s.io/apimachinery v0.27.3
26-
k8s.io/cli-runtime v0.27.3
27-
k8s.io/client-go v0.27.3
22+
k8s.io/api v0.27.2
23+
k8s.io/apiextensions-apiserver v0.27.2
24+
k8s.io/apimachinery v0.27.2
25+
k8s.io/cli-runtime v0.27.2
26+
k8s.io/client-go v0.27.2
2827
k8s.io/utils v0.0.0-20230505201702-9f6742963106
2928
sigs.k8s.io/controller-runtime v0.15.0
3029
sigs.k8s.io/kubebuilder/v3 v3.11.0
3130
sigs.k8s.io/yaml v1.3.0
3231
)
3332

3433
require (
35-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
34+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3635
github.com/BurntSushi/toml v1.2.1 // indirect
3736
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3837
github.com/Masterminds/goutils v1.1.1 // indirect
@@ -120,7 +119,7 @@ require (
120119
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
121120
github.com/mitchellh/reflectwalk v1.0.2 // indirect
122121
github.com/moby/spdystream v0.2.0 // indirect
123-
github.com/moby/term v0.5.0 // indirect
122+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
124123
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
125124
github.com/modern-go/reflect2 v1.0.2 // indirect
126125
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -139,6 +138,7 @@ require (
139138
github.com/rubenv/sql-migrate v1.3.1 // indirect
140139
github.com/russross/blackfriday/v2 v2.1.0 // indirect
141140
github.com/shopspring/decimal v1.3.1 // indirect
141+
github.com/spf13/afero v1.9.5 // indirect
142142
github.com/spf13/cast v1.5.0 // indirect
143143
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
144144
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -165,19 +165,19 @@ require (
165165
google.golang.org/appengine v1.6.7 // indirect
166166
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
167167
google.golang.org/grpc v1.53.0 // indirect
168-
google.golang.org/protobuf v1.31.0 // indirect
168+
google.golang.org/protobuf v1.30.0 // indirect
169169
gopkg.in/inf.v0 v0.9.1 // indirect
170170
gopkg.in/yaml.v2 v2.4.0 // indirect
171171
gopkg.in/yaml.v3 v3.0.1 // indirect
172-
k8s.io/apiserver v0.27.3 // indirect
173-
k8s.io/component-base v0.27.3 // indirect
172+
k8s.io/apiserver v0.27.2 // indirect
173+
k8s.io/component-base v0.27.2 // indirect
174174
k8s.io/klog/v2 v2.100.1 // indirect
175-
k8s.io/kube-openapi v0.0.0-20230614213217-ba0abe644833 // indirect
176-
k8s.io/kubectl v0.27.3 // indirect
175+
k8s.io/kube-openapi v0.0.0-20230606174411-725288a7abf1 // indirect
176+
k8s.io/kubectl v0.27.2 // indirect
177177
oras.land/oras-go v1.2.2 // indirect
178178
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
179-
sigs.k8s.io/kustomize/api v0.14.0 // indirect
180-
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
179+
sigs.k8s.io/kustomize/api v0.13.2 // indirect
180+
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
181181
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
182182
)
183183

‎go.sum

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
4343
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
4444
github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
4545
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
46-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
47-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
46+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
47+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
4848
github.com/Azure/go-autorest v13.3.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
4949
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
5050
github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
@@ -575,8 +575,8 @@ github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx
575575
github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
576576
github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
577577
github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
578-
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
579-
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
578+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA=
579+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
580580
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
581581
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
582582
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -1256,8 +1256,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
12561256
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
12571257
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
12581258
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
1259-
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
1260-
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
1259+
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
1260+
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
12611261
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
12621262
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
12631263
gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1300,21 +1300,21 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
13001300
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
13011301
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
13021302
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
1303-
k8s.io/api v0.27.3 h1:yR6oQXXnUEBWEWcvPWS0jQL575KoAboQPfJAuKNrw5Y=
1304-
k8s.io/api v0.27.3/go.mod h1:C4BNvZnQOF7JA/0Xed2S+aUyJSfTGkGFxLXz9MnpIpg=
1305-
k8s.io/apiextensions-apiserver v0.27.3 h1:xAwC1iYabi+TDfpRhxh4Eapl14Hs2OftM2DN5MpgKX4=
1306-
k8s.io/apiextensions-apiserver v0.27.3/go.mod h1:BH3wJ5NsB9XE1w+R6SSVpKmYNyIiyIz9xAmBl8Mb+84=
1307-
k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM=
1308-
k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
1309-
k8s.io/apiserver v0.27.3 h1:AxLvq9JYtveYWK+D/Dz/uoPCfz8JC9asR5z7+I/bbQ4=
1310-
k8s.io/apiserver v0.27.3/go.mod h1:Y61+EaBMVWUBJtxD5//cZ48cHZbQD+yIyV/4iEBhhNA=
1311-
k8s.io/cli-runtime v0.27.3 h1:h592I+2eJfXj/4jVYM+tu9Rv8FEc/dyCoD80UJlMW2Y=
1312-
k8s.io/cli-runtime v0.27.3/go.mod h1:LzXud3vFFuDFXn2LIrWnscPgUiEj7gQQcYZE2UPn9Kw=
1313-
k8s.io/client-go v0.27.3 h1:7dnEGHZEJld3lYwxvLl7WoehK6lAq7GvgjxpA3nv1E8=
1314-
k8s.io/client-go v0.27.3/go.mod h1:2MBEKuTo6V1lbKy3z1euEGnhPfGZLKTS9tiJ2xodM48=
1303+
k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
1304+
k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4=
1305+
k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo=
1306+
k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ=
1307+
k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
1308+
k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
1309+
k8s.io/apiserver v0.27.2 h1:p+tjwrcQEZDrEorCZV2/qE8osGTINPuS5ZNqWAvKm5E=
1310+
k8s.io/apiserver v0.27.2/go.mod h1:EsOf39d75rMivgvvwjJ3OW/u9n1/BmUMK5otEOJrb1Y=
1311+
k8s.io/cli-runtime v0.27.2 h1:9HI8gfReNujKXt16tGOAnb8b4NZ5E+e0mQQHKhFGwYw=
1312+
k8s.io/cli-runtime v0.27.2/go.mod h1:9UecpyPDTkhiYY4d9htzRqN+rKomJgyb4wi0OfrmCjw=
1313+
k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE=
1314+
k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ=
13151315
k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0=
1316-
k8s.io/component-base v0.27.3 h1:g078YmdcdTfrCE4fFobt7qmVXwS8J/3cI1XxRi/2+6k=
1317-
k8s.io/component-base v0.27.3/go.mod h1:JNiKYcGImpQ44iwSYs6dysxzR9SxIIgQalk4HaCNVUY=
1316+
k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo=
1317+
k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo=
13181318
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
13191319
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
13201320
k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
@@ -1324,10 +1324,10 @@ k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
13241324
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
13251325
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
13261326
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
1327-
k8s.io/kube-openapi v0.0.0-20230614213217-ba0abe644833 h1:mhSLxb0zA1QwoyF9cFPTpCYiVGBpFYuYxacJ1A9YGco=
1328-
k8s.io/kube-openapi v0.0.0-20230614213217-ba0abe644833/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
1329-
k8s.io/kubectl v0.27.3 h1:HyC4o+8rCYheGDWrkcOQHGwDmyLKR5bxXFgpvF82BOw=
1330-
k8s.io/kubectl v0.27.3/go.mod h1:g9OQNCC2zxT+LT3FS09ZYqnDhlvsKAfFq76oyarBcq4=
1327+
k8s.io/kube-openapi v0.0.0-20230606174411-725288a7abf1 h1:+cCtos65A2ydaMUSnO+IXcIYvhn1H+VxclLQuXYp63g=
1328+
k8s.io/kube-openapi v0.0.0-20230606174411-725288a7abf1/go.mod h1:l8HTwL5fqnlns4jOveW1L75eo7R9KFHxiE0bsPGy428=
1329+
k8s.io/kubectl v0.27.2 h1:sSBM2j94MHBFRWfHIWtEXWCicViQzZsb177rNsKBhZg=
1330+
k8s.io/kubectl v0.27.2/go.mod h1:GCOODtxPcrjh+EC611MqREkU8RjYBh10ldQCQ6zpFKw=
13311331
k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU=
13321332
k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
13331333
oras.land/oras-go v1.2.2 h1:0E9tOHUfrNH7TCDk5KU0jVBEzCqbfdyuVfGmJ7ZeRPE=
@@ -1341,10 +1341,10 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm
13411341
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
13421342
sigs.k8s.io/kubebuilder/v3 v3.11.0 h1:0AoVKnPEmHj1tQ8ya1wZ3495/H0M9XTNwgC3wVukGeI=
13431343
sigs.k8s.io/kubebuilder/v3 v3.11.0/go.mod h1:4Re8w/tE0RsqR2IN5VnwCUgsbaIPk9DcYcZlRVALA2M=
1344-
sigs.k8s.io/kustomize/api v0.14.0 h1:6+QLmXXA8X4eDM7ejeaNUyruA1DDB3PVIjbpVhDOJRA=
1345-
sigs.k8s.io/kustomize/api v0.14.0/go.mod h1:vmOXlC8BcmcUJQjiceUbcyQ75JBP6eg8sgoyzc+eLpQ=
1346-
sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs=
1347-
sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA=
1344+
sigs.k8s.io/kustomize/api v0.13.2 h1:kejWfLeJhUsTGioDoFNJET5LQe/ajzXhJGYoU+pJsiA=
1345+
sigs.k8s.io/kustomize/api v0.13.2/go.mod h1:DUp325VVMFVcQSq+ZxyDisA8wtldwHxLZbr1g94UHsw=
1346+
sigs.k8s.io/kustomize/kyaml v0.14.1 h1:c8iibius7l24G2wVAGZn/Va2wNys03GXLjYVIcFVxKA=
1347+
sigs.k8s.io/kustomize/kyaml v0.14.1/go.mod h1:AN1/IpawKilWD7V+YvQwRGUvuUOOWpjsHu6uHwonSF4=
13481348
sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
13491349
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
13501350
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=

‎hack/generate/samples/internal/hybrid/memcached.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (mh *Memcached) Run() {
9090
// pkg.CheckError("creating helm api", err)
9191

9292
err = mh.ctx.CreateAPI(
93-
"--plugins", "base.go.kubebuilder.io/v3",
93+
"--plugins", "base.go.kubebuilder.io/v4",
9494
"--group", mh.ctx.Group,
9595
"--version", mh.ctx.Version,
9696
"--kind", mh.ctx.Kind,

‎internal/cmd/helm-operator/run/cmd.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,29 +143,26 @@ func run(cmd *cobra.Command, f *flags.Flags) {
143143
}
144144
log.Info("Setting manager options", "Options", optionsLog)
145145

146-
if options.NewClient == nil {
147-
options.NewClient = helmmgr.NewCachingClientFunc()
148-
}
149146
namespace, found := os.LookupEnv(helmmgr.WatchNamespaceEnvVar)
150147
log = log.WithValues("Namespace", namespace)
151148
if found {
152149
log.V(1).Info(fmt.Sprintf("Setting namespace with value in %s", helmmgr.WatchNamespaceEnvVar))
153150
if namespace == metav1.NamespaceAll {
154151
log.Info("Watching all namespaces.")
155-
options.Namespace = metav1.NamespaceAll
152+
options.Cache.Namespaces = []string{metav1.NamespaceAll}
156153
} else {
157154
if strings.Contains(namespace, ",") {
158155
log.Info("Watching multiple namespaces.")
159-
options.NewCache = cache.MultiNamespacedCacheBuilder(strings.Split(namespace, ","))
156+
options.Cache = cache.Options{Namespaces: strings.Split(namespace, ",")}
160157
} else {
161158
log.Info("Watching single namespace.")
162-
options.Namespace = namespace
159+
options.Cache.Namespaces = []string{namespace}
163160
}
164161
}
165-
} else if options.Namespace == "" {
162+
} else if len(options.Cache.Namespaces) == 0 {
166163
log.Info(fmt.Sprintf("Watch namespaces not configured by environment variable %s or file. "+
167164
"Watching all namespaces.", helmmgr.WatchNamespaceEnvVar))
168-
options.Namespace = metav1.NamespaceAll
165+
options.Cache.Namespaces = []string{metav1.NamespaceAll}
169166
}
170167

171168
mgr, err := manager.New(cfg, options)

‎internal/cmd/hybrid-operator/run/cmd.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ func run(cmd *cobra.Command, f *flags.Flags) {
141141
}
142142
log.Info("Setting manager options", "Options", optionsLog)
143143

144-
if options.NewClient == nil {
145-
options.NewClient = helmmgr.NewCachingClientFunc()
146-
}
147144
helmmgr.ConfigureWatchNamespaces(&options, log)
148145

149146
mgr, err := manager.New(cfg, options)

‎internal/sdk/controllerutil/controllerutil_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package controllerutil_test
1818

1919
import (
2020
"context"
21+
"fmt"
2122

2223
. "github.com/onsi/ginkgo/v2"
2324
. "github.com/onsi/gomega"
@@ -62,7 +63,7 @@ var _ = Describe("Controllerutil", func() {
6263

6364
It("should be cancellable", func() {
6465
cancel()
65-
Expect(WaitForDeletion(ctx, client, pod)).To(MatchError(wait.ErrWaitTimeout))
66+
Expect(WaitForDeletion(ctx, client, pod)).To(MatchError(wait.Interrupted(fmt.Errorf("timed out waiting for the condition"))))
6667
})
6768

6869
It("should succeed after pod is deleted", func() {

‎main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"fmt"
2121
"log"
2222
"runtime"
23+
2324
kustomizev2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2"
2425

2526
"github.com/spf13/cobra"
@@ -31,7 +32,7 @@ import (
3132
"github.com/operator-framework/helm-operator-plugins/internal/cmd/hybrid-operator/run"
3233
"github.com/operator-framework/helm-operator-plugins/internal/version"
3334
pluginv1alpha "github.com/operator-framework/helm-operator-plugins/pkg/plugins/hybrid/v1alpha"
34-
golangv3 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3"
35+
golangv4 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4"
3536
)
3637

3738
func main() {
@@ -43,7 +44,7 @@ func main() {
4344
cli.WithVersion(getVersion()),
4445
cli.WithPlugins(
4546
getHybridPlugin(),
46-
golangv3.Plugin{},
47+
golangv4.Plugin{},
4748
),
4849
cli.WithDefaultProjectVersion(config.Version),
4950
cli.WithDefaultPlugins(config.Version, getHybridPlugin()),

‎pkg/client/actionclient_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import (
4040
apitypes "k8s.io/apimachinery/pkg/types"
4141
"k8s.io/apimachinery/pkg/util/rand"
4242
"k8s.io/cli-runtime/pkg/resource"
43+
"k8s.io/client-go/rest"
4344
"k8s.io/utils/pointer"
4445
"sigs.k8s.io/controller-runtime/pkg/client"
4546
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
@@ -56,7 +57,11 @@ var _ = Describe("ActionClient", func() {
5657
)
5758
BeforeEach(func() {
5859
var err error
59-
rm, err = apiutil.NewDynamicRESTMapper(cfg)
60+
61+
httpClient, err := rest.HTTPClientFor(cfg)
62+
Expect(err).NotTo(HaveOccurred())
63+
64+
rm, err = apiutil.NewDynamicRESTMapper(cfg, httpClient)
6065
Expect(err).To(BeNil())
6166
})
6267
var _ = Describe("NewActionClientGetter", func() {

‎pkg/client/actionconfig_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"k8s.io/apimachinery/pkg/util/rand"
3434
"k8s.io/cli-runtime/pkg/resource"
3535
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
36+
"k8s.io/client-go/rest"
3637
"sigs.k8s.io/controller-runtime/pkg/client"
3738
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
3839

@@ -45,7 +46,11 @@ var _ = Describe("ActionConfig", func() {
4546

4647
BeforeEach(func() {
4748
var err error
48-
rm, err = apiutil.NewDiscoveryRESTMapper(cfg)
49+
50+
httpClient, err := rest.HTTPClientFor(cfg)
51+
Expect(err).NotTo(HaveOccurred())
52+
53+
rm, err = apiutil.NewDiscoveryRESTMapper(cfg, httpClient)
4954
Expect(err).To(BeNil())
5055
})
5156

@@ -171,7 +176,10 @@ metadata:
171176
obj = testutil.BuildTestCR(gvk)
172177
})
173178
It("should return a valid action.Configuration", func() {
174-
rm, err := apiutil.NewDiscoveryRESTMapper(cfg)
179+
httpClient, err := rest.HTTPClientFor(cfg)
180+
Expect(err).NotTo(HaveOccurred())
181+
182+
rm, err := apiutil.NewDiscoveryRESTMapper(cfg, httpClient)
175183
Expect(err).To(BeNil())
176184

177185
acg, err := NewActionConfigGetter(cfg, rm, logr.Discard())

‎pkg/client/postrenderer_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"helm.sh/helm/v3/pkg/kube"
1010
"helm.sh/helm/v3/pkg/postrender"
1111
corev1 "k8s.io/api/core/v1"
12+
"k8s.io/client-go/rest"
1213
"sigs.k8s.io/controller-runtime/pkg/client"
1314
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
1415

@@ -164,7 +165,10 @@ var _ = Describe("ownerPostRenderer", func() {
164165
)
165166

166167
BeforeEach(func() {
167-
rm, err := apiutil.NewDynamicRESTMapper(cfg)
168+
httpClient, err := rest.HTTPClientFor(cfg)
169+
Expect(err).NotTo(HaveOccurred())
170+
171+
rm, err := apiutil.NewDynamicRESTMapper(cfg, httpClient)
168172
Expect(err).To(BeNil())
169173

170174
owner = newTestDeployment([]corev1.Container{{

‎pkg/client/restclientgetter_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ var _ = Describe("restClientGetter", func() {
5050
When("the config is valid", func() {
5151
BeforeEach(func() {
5252
var err error
53-
rm, err = apiutil.NewDynamicRESTMapper(cfg)
53+
54+
httpClient, err := rest.HTTPClientFor(cfg)
55+
Expect(err).NotTo(HaveOccurred())
56+
57+
rm, err = apiutil.NewDynamicRESTMapper(cfg, httpClient)
5458
Expect(err).To(BeNil())
5559

5660
rcg = newRESTClientGetter(cfg, rm, "test-ns")

0 commit comments

Comments
 (0)