Skip to content

Commit 4cae159

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#449 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 94200dd + 403b2dd commit 4cae159

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+7406
-6398
lines changed

‎commitchecker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
expectedMergeBase: eebdcea5ba8b91c07719a5342c50f9fabd0ebf83
1+
expectedMergeBase: 35bcd7a822a74e1236f1c3f30699e56b76d6b77c
22
upstreamBranch: main
33
upstreamOrg: operator-framework
44
upstreamRepo: operator-controller

‎go.mod‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ require (
3131
golang.org/x/sync v0.16.0
3232
golang.org/x/tools v0.36.0
3333
gopkg.in/yaml.v2 v2.4.0
34-
helm.sh/helm/v3 v3.18.4
35-
k8s.io/api v0.33.2
36-
k8s.io/apiextensions-apiserver v0.33.2
37-
k8s.io/apimachinery v0.33.2
38-
k8s.io/apiserver v0.33.2
39-
k8s.io/cli-runtime v0.33.2
40-
k8s.io/client-go v0.33.2
41-
k8s.io/component-base v0.33.2
34+
helm.sh/helm/v3 v3.18.5
35+
k8s.io/api v0.33.3
36+
k8s.io/apiextensions-apiserver v0.33.3
37+
k8s.io/apimachinery v0.33.3
38+
k8s.io/apiserver v0.33.3
39+
k8s.io/cli-runtime v0.33.3
40+
k8s.io/client-go v0.33.3
41+
k8s.io/component-base v0.33.3
4242
k8s.io/klog/v2 v2.130.1
4343
k8s.io/kubernetes v1.33.2
4444
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
@@ -182,6 +182,7 @@ require (
182182
github.com/rivo/uniseg v0.4.7 // indirect
183183
github.com/rubenv/sql-migrate v1.8.0 // indirect
184184
github.com/russross/blackfriday/v2 v2.1.0 // indirect
185+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
185186
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
186187
github.com/shopspring/decimal v1.4.0 // indirect
187188
github.com/sigstore/fulcio v1.7.1 // indirect
@@ -190,7 +191,7 @@ require (
190191
github.com/sirupsen/logrus v1.9.3 // indirect
191192
github.com/smallstep/pkcs7 v0.2.1 // indirect
192193
github.com/spf13/cast v1.7.1 // indirect
193-
github.com/spf13/pflag v1.0.6 // indirect
194+
github.com/spf13/pflag v1.0.7 // indirect
194195
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
195196
github.com/stoewer/go-strcase v1.3.1 // indirect
196197
github.com/stretchr/objx v0.5.2 // indirect
@@ -199,9 +200,6 @@ require (
199200
github.com/vbatts/tar-split v0.12.1 // indirect
200201
github.com/vbauerster/mpb/v8 v8.10.2 // indirect
201202
github.com/x448/float16 v0.8.4 // indirect
202-
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
203-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
204-
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
205203
github.com/xlab/treeprint v1.2.0 // indirect
206204
go.etcd.io/bbolt v1.4.2 // indirect
207205
go.opencensus.io v0.24.0 // indirect
@@ -235,7 +233,7 @@ require (
235233
gopkg.in/warnings.v0 v0.1.2 // indirect
236234
gopkg.in/yaml.v3 v3.0.1 // indirect
237235
k8s.io/controller-manager v0.33.2 // indirect
238-
k8s.io/kubectl v0.33.2 // indirect
236+
k8s.io/kubectl v0.33.3 // indirect
239237
oras.land/oras-go/v2 v2.6.0 // indirect
240238
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
241239
sigs.k8s.io/gateway-api v1.1.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ github.com/distribution/distribution/v3 v3.0.0 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN
108108
github.com/distribution/distribution/v3 v3.0.0/go.mod h1:tRNuFoZsUdyRVegq8xGNeds4KLjwLCRin/tTo6i1DhU=
109109
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
110110
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
111+
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
112+
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
111113
github.com/docker/cli v28.3.2+incompatible h1:mOt9fcLE7zaACbxW1GeS65RI67wIJrTnqS3hP2huFsY=
112114
github.com/docker/cli v28.3.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
113115
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
@@ -443,8 +445,9 @@ github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
443445
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
444446
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
445447
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
446-
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
447448
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
449+
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
450+
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
448451
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 h1:pnnLyeX7o/5aX8qUQ69P/mLojDqwda8hFOCBTmP/6hw=
449452
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6/go.mod h1:39R/xuhNgVhi+K0/zst4TLrJrVmbm6LVgl4A0+ZFS5M=
450453
github.com/stoewer/go-strcase v1.3.1 h1:iS0MdW+kVTxgMoE1LAZyMiYJFKlOzLooE4MxjirtkAs=
@@ -473,13 +476,6 @@ github.com/vbauerster/mpb/v8 v8.10.2 h1:2uBykSHAYHekE11YvJhKxYmLATKHAGorZwFlyNw4
473476
github.com/vbauerster/mpb/v8 v8.10.2/go.mod h1:+Ja4P92E3/CorSZgfDtK46D7AVbDqmBQRTmyTqPElo0=
474477
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
475478
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
476-
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
477-
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
478-
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
479-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
480-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
481-
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
482-
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
483479
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
484480
github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
485481
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -729,8 +725,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
729725
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
730726
gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
731727
gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
732-
helm.sh/helm/v3 v3.18.4 h1:pNhnHM3nAmDrxz6/UC+hfjDY4yeDATQCka2/87hkZXQ=
733-
helm.sh/helm/v3 v3.18.4/go.mod h1:WVnwKARAw01iEdjpEkP7Ii1tT1pTPYfM1HsakFKM3LI=
728+
helm.sh/helm/v3 v3.18.5 h1:Cc3Z5vd6kDrZq9wO9KxKLNEickiTho6/H/dBNRVSos4=
729+
helm.sh/helm/v3 v3.18.5/go.mod h1:L/dXDR2r539oPlFP1PJqKAC1CUgqHJDLkxKpDGrWnyg=
734730
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
735731
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
736732
k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=

‎vendor/github.com/santhosh-tekuri/jsonschema/v6/.gitmodules‎

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

‎vendor/github.com/santhosh-tekuri/jsonschema/v6/.golangci.yml‎

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

‎vendor/github.com/santhosh-tekuri/jsonschema/v6/.pre-commit-hooks.yaml‎

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

‎vendor/github.com/santhosh-tekuri/jsonschema/v6/.swp‎

20 KB
Binary file not shown.

‎vendor/github.com/xeipuuv/gojsonpointer/LICENSE-APACHE-2.0.txt‎ renamed to ‎vendor/github.com/santhosh-tekuri/jsonschema/v6/LICENSE‎

Lines changed: 1 addition & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/santhosh-tekuri/jsonschema/v6/README.md‎

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

0 commit comments

Comments
 (0)