Skip to content

Commit e7c4a69

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #984 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents be7d951 + 7fede92 commit e7c4a69

File tree

46 files changed

+614
-433
lines changed

Some content is hidden

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

46 files changed

+614
-433
lines changed

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
1616
github.com/onsi/ginkgo/v2 v2.22.2
1717
github.com/openshift/api v3.9.0+incompatible
18-
github.com/operator-framework/api v0.29.0
18+
github.com/operator-framework/api v0.30.0
1919
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
2020
github.com/operator-framework/operator-registry v1.51.0
2121
github.com/sirupsen/logrus v1.9.3
@@ -30,7 +30,7 @@ require (
3030
k8s.io/code-generator v0.32.2
3131
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
3232
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
33-
sigs.k8s.io/controller-runtime v0.20.2
33+
sigs.k8s.io/controller-runtime v0.20.3
3434
sigs.k8s.io/controller-tools v0.17.2
3535
)
3636

@@ -200,8 +200,8 @@ require (
200200
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
201201
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
202202
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
203-
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
204-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
203+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
204+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
205205
google.golang.org/grpc v1.70.0 // indirect
206206
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
207207
gopkg.in/inf.v0 v0.9.1 // indirect

‎go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -2973,8 +2973,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe/go.
29732973
google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014/go.mod h1:rbHMSEDyoYX62nRVLOCc4Qt1HbsdytAYoVwgjiOhF3I=
29742974
google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:PVreiBMirk8ypES6aw9d4p6iiBNSIfZEBqr3UGoAi2E=
29752975
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8=
2976-
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a h1:OAiGFfOiA0v9MRYsSidp3ubZaBnteRUyn3xB2ZQ5G/E=
2977-
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a/go.mod h1:jehYqy3+AhJU9ve55aNOaSml7wUXjF9x6z2LcCfpAhY=
2976+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950=
2977+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg=
29782978
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA=
29792979
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577/go.mod h1:NjCQG/D8JandXxM57PZbAJL1DCNL6EypA0vPPwfsc7c=
29802980
google.golang.org/genproto/googleapis/bytestream v0.0.0-20231030173426-d783a09b4405/go.mod h1:GRUCuLdzVqZte8+Dl/D4N25yLzcGqqWaYkeVOwulFqw=
@@ -3008,8 +3008,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.
30083008
google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014/go.mod h1:SaPjaZGWb0lPqs6Ittu0spdfrOArqji4ZdeP5IC/9N4=
30093009
google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk=
30103010
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
3011-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d h1:xJJRGY7TJcvIlpSrN3K6LAWgNFUILlO+OMAqtg9aqnw=
3012-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
3011+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e h1:YA5lmSs3zc/5w+xsRcHqpETkaYyK63ivEPzNTcUUlSA=
3012+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
30133013
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
30143014
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
30153015
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
@@ -3201,8 +3201,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
32013201
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
32023202
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
32033203
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
3204-
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
3205-
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
3204+
sigs.k8s.io/controller-runtime v0.20.3 h1:I6Ln8JfQjHH7JbtCD2HCYHoIzajoRxPNuvhvcDbZgkI=
3205+
sigs.k8s.io/controller-runtime v0.20.3/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
32063206
sigs.k8s.io/controller-tools v0.17.2 h1:jNFOKps8WnaRKZU2R+4vRCHnXyJanVmXBWqkuUPFyFg=
32073207
sigs.k8s.io/controller-tools v0.17.2/go.mod h1:4q5tZG2JniS5M5bkiXY2/potOiXyhoZVw/U48vLkXk0=
32083208
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎manifests/0000_50_olm_00-catalogsources.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ spec:
10311031
specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older
10321032
catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`.
10331033
1034-
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'
1034+
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/
10351035
type: string
10361036
enum:
10371037
- legacy

‎microshift-manifests/0000_50_olm_00-catalogsources.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ spec:
10311031
specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older
10321032
catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`.
10331033
1034-
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'
1034+
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/
10351035
type: string
10361036
enum:
10371037
- legacy

‎staging/api/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ YQ ?= $(LOCALBIN)/yq
104104
KIND ?= $(LOCALBIN)/kind
105105

106106
## Tool Versions
107-
CONTROLLER_TOOLS_VERSION ?= v0.17.0
108-
YQ_VERSION ?= v4.28.1
107+
CONTROLLER_TOOLS_VERSION ?= v0.17.2
108+
YQ_VERSION ?= v4.45.1
109109

110110
# Not guaranteed to have patch releases available and node image tags are full versions (i.e v1.28.0 - no v1.28, v1.29, etc.)
111111
# The KIND_NODE_VERSION is set by getting the version of the k8s.io/client-go dependency from the go.mod

‎staging/api/crds/operators.coreos.com_catalogsources.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
name: catalogsources.operators.coreos.com
77
spec:
88
group: operators.coreos.com
@@ -1027,7 +1027,7 @@ spec:
10271027
specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older
10281028
catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`.
10291029
1030-
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'
1030+
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/
10311031
type: string
10321032
enum:
10331033
- legacy

‎staging/api/crds/operators.coreos.com_clusterserviceversions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
name: clusterserviceversions.operators.coreos.com
77
spec:
88
group: operators.coreos.com

‎staging/api/crds/operators.coreos.com_installplans.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
name: installplans.operators.coreos.com
77
spec:
88
group: operators.coreos.com

‎staging/api/crds/operators.coreos.com_olmconfigs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
name: olmconfigs.operators.coreos.com
77
spec:
88
group: operators.coreos.com

‎staging/api/crds/operators.coreos.com_operatorconditions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
name: operatorconditions.operators.coreos.com
77
spec:
88
group: operators.coreos.com

‎staging/api/crds/operators.coreos.com_operatorgroups.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
name: operatorgroups.operators.coreos.com
77
spec:
88
group: operators.coreos.com

‎staging/api/crds/operators.coreos.com_operators.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
name: operators.operators.coreos.com
77
spec:
88
group: operators.coreos.com

‎staging/api/crds/operators.coreos.com_subscriptions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
name: subscriptions.operators.coreos.com
77
spec:
88
group: operators.coreos.com

‎staging/api/crds/zz_defs.go

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/api/go.mod

+14-14
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ require (
99
github.com/go-bindata/go-bindata/v3 v3.1.3
1010
github.com/google/cel-go v0.22.1
1111
github.com/sirupsen/logrus v1.9.3
12-
github.com/spf13/cobra v1.8.1
12+
github.com/spf13/cobra v1.9.1
1313
github.com/stretchr/testify v1.10.0
14-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7
15-
k8s.io/api v0.32.0
16-
k8s.io/apiextensions-apiserver v0.32.0
17-
k8s.io/apimachinery v0.32.0
18-
k8s.io/client-go v0.32.0
19-
sigs.k8s.io/controller-runtime v0.19.4
14+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb
15+
k8s.io/api v0.32.2
16+
k8s.io/apiextensions-apiserver v0.32.2
17+
k8s.io/apimachinery v0.32.2
18+
k8s.io/client-go v0.32.2
19+
sigs.k8s.io/controller-runtime v0.20.2
2020
sigs.k8s.io/yaml v1.4.0
2121
)
2222

@@ -55,7 +55,7 @@ require (
5555
github.com/prometheus/client_model v0.6.1 // indirect
5656
github.com/prometheus/common v0.55.0 // indirect
5757
github.com/prometheus/procfs v0.15.1 // indirect
58-
github.com/spf13/pflag v1.0.5 // indirect
58+
github.com/spf13/pflag v1.0.6 // indirect
5959
github.com/stoewer/go-strcase v1.3.0 // indirect
6060
github.com/x448/float16 v0.8.4 // indirect
6161
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
@@ -70,20 +70,20 @@ require (
7070
golang.org/x/lint v0.0.0-20241112194109-818c5a804067 // indirect
7171
golang.org/x/mod v0.22.0 // indirect
7272
golang.org/x/net v0.34.0 // indirect
73-
golang.org/x/oauth2 v0.23.0 // indirect
73+
golang.org/x/oauth2 v0.27.0 // indirect
7474
golang.org/x/sync v0.10.0 // indirect
7575
golang.org/x/sys v0.29.0 // indirect
7676
golang.org/x/term v0.28.0 // indirect
7777
golang.org/x/text v0.21.0 // indirect
7878
golang.org/x/time v0.7.0 // indirect
7979
golang.org/x/tools v0.29.0 // indirect
80-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
81-
google.golang.org/grpc v1.65.0 // indirect
82-
google.golang.org/protobuf v1.35.1 // indirect
80+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
81+
google.golang.org/grpc v1.67.1 // indirect
82+
google.golang.org/protobuf v1.36.5 // indirect
8383
gopkg.in/inf.v0 v0.9.1 // indirect
8484
gopkg.in/yaml.v3 v3.0.1 // indirect
85-
k8s.io/apiserver v0.32.0 // indirect
86-
k8s.io/component-base v0.32.0 // indirect
85+
k8s.io/apiserver v0.32.2 // indirect
86+
k8s.io/component-base v0.32.2 // indirect
8787
k8s.io/klog/v2 v2.130.1 // indirect
8888
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
8989
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

0 commit comments

Comments
 (0)