Skip to content

Commit 7731743

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #340 from lunarwhite/backport-1.18
[cert-manager-1.18] CM-758: Bump with latest o/[email protected] to consume enhanced ApplyNetworkPolicy function
2 parents 602565d + ddc4e52 commit 7731743

File tree

1,333 files changed

+71544
-52588
lines changed

Some content is hidden

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

1,333 files changed

+71544
-52588
lines changed

‎bundle/manifests/operator.openshift.io_istiocsrs.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@ spec:
373373
pod labels will be ignored. The default value is empty.
374374
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
375375
Also, matchLabelKeys cannot be set when labelSelector isn't set.
376-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
377376
items:
378377
type: string
379378
type: array
@@ -388,7 +387,6 @@ spec:
388387
pod labels will be ignored. The default value is empty.
389388
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
390389
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
391-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
392390
items:
393391
type: string
394392
type: array
@@ -555,7 +553,6 @@ spec:
555553
pod labels will be ignored. The default value is empty.
556554
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
557555
Also, matchLabelKeys cannot be set when labelSelector isn't set.
558-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
559556
items:
560557
type: string
561558
type: array
@@ -570,7 +567,6 @@ spec:
570567
pod labels will be ignored. The default value is empty.
571568
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
572569
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
573-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
574570
items:
575571
type: string
576572
type: array
@@ -735,7 +731,6 @@ spec:
735731
pod labels will be ignored. The default value is empty.
736732
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
737733
Also, matchLabelKeys cannot be set when labelSelector isn't set.
738-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
739734
items:
740735
type: string
741736
type: array
@@ -750,7 +745,6 @@ spec:
750745
pod labels will be ignored. The default value is empty.
751746
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
752747
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
753-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
754748
items:
755749
type: string
756750
type: array
@@ -917,7 +911,6 @@ spec:
917911
pod labels will be ignored. The default value is empty.
918912
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
919913
Also, matchLabelKeys cannot be set when labelSelector isn't set.
920-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
921914
items:
922915
type: string
923916
type: array
@@ -932,7 +925,6 @@ spec:
932925
pod labels will be ignored. The default value is empty.
933926
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
934927
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
935-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
936928
items:
937929
type: string
938930
type: array

‎config/crd/bases/operator.openshift.io_istiocsrs.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@ spec:
373373
pod labels will be ignored. The default value is empty.
374374
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
375375
Also, matchLabelKeys cannot be set when labelSelector isn't set.
376-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
377376
items:
378377
type: string
379378
type: array
@@ -388,7 +387,6 @@ spec:
388387
pod labels will be ignored. The default value is empty.
389388
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
390389
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
391-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
392390
items:
393391
type: string
394392
type: array
@@ -555,7 +553,6 @@ spec:
555553
pod labels will be ignored. The default value is empty.
556554
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
557555
Also, matchLabelKeys cannot be set when labelSelector isn't set.
558-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
559556
items:
560557
type: string
561558
type: array
@@ -570,7 +567,6 @@ spec:
570567
pod labels will be ignored. The default value is empty.
571568
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
572569
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
573-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
574570
items:
575571
type: string
576572
type: array
@@ -735,7 +731,6 @@ spec:
735731
pod labels will be ignored. The default value is empty.
736732
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
737733
Also, matchLabelKeys cannot be set when labelSelector isn't set.
738-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
739734
items:
740735
type: string
741736
type: array
@@ -750,7 +745,6 @@ spec:
750745
pod labels will be ignored. The default value is empty.
751746
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
752747
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
753-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
754748
items:
755749
type: string
756750
type: array
@@ -917,7 +911,6 @@ spec:
917911
pod labels will be ignored. The default value is empty.
918912
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
919913
Also, matchLabelKeys cannot be set when labelSelector isn't set.
920-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
921914
items:
922915
type: string
923916
type: array
@@ -932,7 +925,6 @@ spec:
932925
pod labels will be ignored. The default value is empty.
933926
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
934927
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
935-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
936928
items:
937929
type: string
938930
type: array

‎go.mod‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,35 @@ require (
77
github.com/go-bindata/go-bindata v3.1.2+incompatible
88
github.com/go-logr/logr v1.4.2
99
github.com/golangci/golangci-lint v1.50.1
10-
github.com/google/go-cmp v0.6.0
10+
github.com/google/go-cmp v0.7.0
1111
github.com/google/go-jsonnet v0.17.0
1212
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
1313
github.com/mogensen/kubernetes-split-yaml v0.3.0
1414
github.com/onsi/ginkgo/v2 v2.21.0
1515
github.com/onsi/gomega v1.35.1
16-
github.com/openshift/api v0.0.0-20250529074221-97812373b6b4
17-
github.com/openshift/build-machinery-go v0.0.0-20250102153059-e85a1a7ecb5c
18-
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7
19-
github.com/openshift/library-go v0.0.0-20250506195648-3c53c5492e7b
16+
github.com/openshift/api v0.0.0-20250710004639-926605d3338b
17+
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
18+
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
19+
github.com/openshift/library-go v0.0.0-20251029113212-a7eec173a623
2020
github.com/operator-framework/operator-lib v0.11.0
2121
github.com/spf13/cobra v1.8.1
2222
github.com/spf13/pflag v1.0.5
2323
github.com/stretchr/testify v1.10.0
2424
golang.org/x/tools v0.36.0
25-
k8s.io/api v0.32.1
26-
k8s.io/apiextensions-apiserver v0.32.1
27-
k8s.io/apimachinery v0.32.1
28-
k8s.io/client-go v0.32.1
29-
k8s.io/code-generator v0.32.1
30-
k8s.io/component-base v0.32.1
25+
k8s.io/api v0.33.2
26+
k8s.io/apiextensions-apiserver v0.33.2
27+
k8s.io/apimachinery v0.33.2
28+
k8s.io/client-go v0.33.2
29+
k8s.io/code-generator v0.33.2
30+
k8s.io/component-base v0.33.2
3131
k8s.io/klog/v2 v2.130.1
32-
k8s.io/kubernetes v1.32.1
32+
k8s.io/kubernetes v1.33.2
3333
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
3434
sigs.k8s.io/controller-runtime v0.19.0
3535
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230912183013-811757733433
3636
sigs.k8s.io/controller-tools v0.15.0
37-
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0
38-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0
37+
sigs.k8s.io/kustomize/kustomize/v5 v5.6.0
38+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0
3939
sigs.k8s.io/yaml v1.4.0
4040
)
4141

@@ -54,7 +54,6 @@ require (
5454
github.com/alexkohler/prealloc v1.0.0 // indirect
5555
github.com/alingse/asasalint v0.0.11 // indirect
5656
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
57-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5857
github.com/ashanbrown/forbidigo v1.3.0 // indirect
5958
github.com/ashanbrown/makezero v1.1.1 // indirect
6059
github.com/beorn7/perks v1.0.1 // indirect
@@ -120,9 +119,8 @@ require (
120119
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
121120
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
122121
github.com/google/btree v1.1.3 // indirect
123-
github.com/google/cel-go v0.22.1 // indirect
122+
github.com/google/cel-go v0.23.2 // indirect
124123
github.com/google/gnostic-models v0.6.9 // indirect
125-
github.com/google/gofuzz v1.2.0 // indirect
126124
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
127125
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
128126
github.com/google/uuid v1.6.0 // indirect
@@ -148,7 +146,6 @@ require (
148146
github.com/kisielk/errcheck v1.6.2 // indirect
149147
github.com/kisielk/gotool v1.0.0 // indirect
150148
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
151-
github.com/klauspost/compress v1.17.11 // indirect
152149
github.com/kulti/thelper v0.6.3 // indirect
153150
github.com/kunwardeep/paralleltest v1.0.6 // indirect
154151
github.com/kylelemons/godebug v1.1.0 // indirect
@@ -187,9 +184,9 @@ require (
187184
github.com/pkg/profile v1.7.0 // indirect
188185
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
189186
github.com/polyfloyd/go-errorlint v1.0.5 // indirect
190-
github.com/prometheus/client_golang v1.20.5 // indirect
187+
github.com/prometheus/client_golang v1.22.0 // indirect
191188
github.com/prometheus/client_model v0.6.1 // indirect
192-
github.com/prometheus/common v0.61.0 // indirect
189+
github.com/prometheus/common v0.62.0 // indirect
193190
github.com/prometheus/procfs v0.15.1 // indirect
194191
github.com/quasilyte/go-ruleguard v0.3.18 // indirect
195192
github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f // indirect
@@ -236,9 +233,9 @@ require (
236233
github.com/yagipy/maintidx v1.0.0 // indirect
237234
github.com/yeya24/promlinter v0.2.0 // indirect
238235
gitlab.com/bosi/decorder v0.2.3 // indirect
239-
go.etcd.io/etcd/api/v3 v3.5.17 // indirect
240-
go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
241-
go.etcd.io/etcd/client/v3 v3.5.17 // indirect
236+
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
237+
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
238+
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
242239
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
243240
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
244241
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
@@ -261,41 +258,41 @@ require (
261258
golang.org/x/sys v0.35.0 // indirect
262259
golang.org/x/term v0.34.0 // indirect
263260
golang.org/x/text v0.28.0 // indirect
264-
golang.org/x/time v0.8.0 // indirect
261+
golang.org/x/time v0.9.0 // indirect
265262
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
266263
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
267264
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
268265
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb // indirect
269266
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect
270267
google.golang.org/grpc v1.69.2 // indirect
271-
google.golang.org/protobuf v1.36.0 // indirect
268+
google.golang.org/protobuf v1.36.5 // indirect
272269
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
273270
gopkg.in/inf.v0 v0.9.1 // indirect
274271
gopkg.in/ini.v1 v1.67.0 // indirect
275272
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
276273
gopkg.in/yaml.v2 v2.4.0 // indirect
277274
gopkg.in/yaml.v3 v3.0.1 // indirect
278275
honnef.co/go/tools v0.3.3 // indirect
279-
k8s.io/apiserver v0.32.1 // indirect
280-
k8s.io/cloud-provider v0.32.1 // indirect
276+
k8s.io/apiserver v0.33.2 // indirect
281277
k8s.io/component-helpers v0.32.1 // indirect
282278
k8s.io/controller-manager v0.32.1 // indirect
283-
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
284-
k8s.io/kms v0.32.1 // indirect
285-
k8s.io/kube-aggregator v0.32.1 // indirect
286-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
279+
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
280+
k8s.io/kms v0.33.2 // indirect
281+
k8s.io/kube-aggregator v0.33.2 // indirect
282+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
287283
k8s.io/kubelet v0.32.1 // indirect
288284
mvdan.cc/gofumpt v0.4.0 // indirect
289285
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
290286
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
291287
mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect
292-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
288+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
293289
sigs.k8s.io/gateway-api v1.1.0 // indirect
294290
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
295291
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
296-
sigs.k8s.io/kustomize/api v0.18.0 // indirect
297-
sigs.k8s.io/kustomize/cmd/config v0.15.0 // indirect
298-
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
292+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
293+
sigs.k8s.io/kustomize/cmd/config v0.19.0 // indirect
294+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
295+
sigs.k8s.io/randfill v1.0.0 // indirect
299296
)
300297

301298
replace github.com/cert-manager/cert-manager => github.com/openshift/jetstack-cert-manager v1.18.3

0 commit comments

Comments
 (0)