Skip to content

Commit 78cf43f

Browse files
joelanfordci-robot
authored andcommitted
bump of/api to v0.26.0 (#3317)
Signed-off-by: Joe Lanford <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 59606f2864ea94bfe8780e075392e0daa27fb9df
1 parent c921a18 commit 78cf43f

File tree

5 files changed

+10
-14
lines changed

5 files changed

+10
-14
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
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.19.0
1717
github.com/openshift/api v3.9.0+incompatible
18-
github.com/operator-framework/api v0.25.0
18+
github.com/operator-framework/api v0.26.0
1919
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
2020
github.com/operator-framework/operator-registry v1.43.1
2121
github.com/sirupsen/logrus v1.9.3

staging/operator-lifecycle-manager/deploy/chart/crds/0000_50_olm_00-catalogsources.crd.yaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,19 +1023,15 @@ spec:
10231023
SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the
10241024
right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod
10251025
Security Admission (PSA) `restricted` mode, or doesn't set these values at all, in which case the pod can only be
1026-
run in PSA `baseline` or `privileged` namespaces. Currently if the SecurityContextConfig is unspecified, the default
1027-
value of `legacy` is used. Specifying a value other than `legacy` or `restricted` result in a validation error.
1028-
When using older catalog images, which could not be run in `restricted` mode, the SecurityContextConfig should be
1029-
set to `legacy`.
1030-
1031-
1032-
In a future version will the default will be set to `restricted`, catalog maintainers should rebuild their catalogs
1033-
with a version of opm that supports running catalogSource pods in `restricted` mode to prepare for these changes.
1026+
run in PSA `baseline` or `privileged` namespaces. If the SecurityContextConfig is unspecified, the mode will be
1027+
determined by the namespace's PSA configuration. If the namespace is enforcing `restricted` mode, then the pod
1028+
will be configured as if `restricted` was specified. Otherwise, it will be configured as if `legacy` was
1029+
specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older
1030+
catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`.
10341031
10351032
10361033
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'
10371034
type: string
1038-
default: legacy
10391035
enum:
10401036
- legacy
10411037
- restricted

staging/operator-lifecycle-manager/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/onsi/gomega v1.33.1
2424
github.com/openshift/api v3.9.0+incompatible
2525
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
26-
github.com/operator-framework/api v0.25.0
26+
github.com/operator-framework/api v0.26.0
2727
github.com/operator-framework/operator-registry v1.43.1
2828
github.com/otiai10/copy v1.14.0
2929
github.com/pkg/errors v0.9.1

staging/operator-lifecycle-manager/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1817,8 +1817,8 @@ github.com/openshift/api v0.0.0-20221021112143-4226c2167e40 h1:PxjGCA72RtsdHWToZ
18171817
github.com/openshift/api v0.0.0-20221021112143-4226c2167e40/go.mod h1:aQ6LDasvHMvHZXqLHnX2GRmnfTWCF/iIwz8EMTTIE9A=
18181818
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c h1:CV76yFOTXmq9VciBR3Bve5ZWzSxdft7gaMVB3kS0rwg=
18191819
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c/go.mod h1:lFMO8mLHXWFzSdYvGNo8ivF9SfF6zInA8ZGw4phRnUE=
1820-
github.com/operator-framework/api v0.25.0 h1:pSQwFSoPmZaTIERadawxtCwicehLkC7i9n3w3+70SVI=
1821-
github.com/operator-framework/api v0.25.0/go.mod h1:PvyCQb0x53ytIqdTECH5e+iqv+am3uZ0qGsZWmL35gQ=
1820+
github.com/operator-framework/api v0.26.0 h1:YVntU2NkVl5zSLLwK5kFcH6P3oSvN9QDgTsY9mb4yUM=
1821+
github.com/operator-framework/api v0.26.0/go.mod h1:3IxOwzVUeGxYlzfwKCcfCyS+q3EEhWA/4kv7UehbeyM=
18221822
github.com/operator-framework/operator-registry v1.43.1 h1:ACahVHGIL/hINBXd3RKWqSFR5SmSM6L5/n9xXqpR51s=
18231823
github.com/operator-framework/operator-registry v1.43.1/go.mod h1:qhssAIYWXDIW+nTg0C5i4iD9zpMtiXtfXqGUuUmGz5c=
18241824
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ github.com/openshift/client-go/config/informers/externalversions/config
710710
github.com/openshift/client-go/config/informers/externalversions/config/v1
711711
github.com/openshift/client-go/config/informers/externalversions/internalinterfaces
712712
github.com/openshift/client-go/config/listers/config/v1
713-
# github.com/operator-framework/api v0.25.0 => ./staging/api
713+
# github.com/operator-framework/api v0.26.0 => ./staging/api
714714
## explicit; go 1.22.0
715715
github.com/operator-framework/api/crds
716716
github.com/operator-framework/api/pkg/constraints

0 commit comments

Comments
 (0)