File tree Expand file tree Collapse file tree 5 files changed +10
-14
lines changed
staging/operator-lifecycle-manager Expand file tree Collapse file tree 5 files changed +10
-14
lines changed Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ require (
15
15
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
16
16
github.com/onsi/ginkgo/v2 v2.19.0
17
17
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
19
19
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
20
20
github.com/operator-framework/operator-registry v1.43.1
21
21
github.com/sirupsen/logrus v1.9.3
Original file line number Diff line number Diff line change @@ -1023,19 +1023,15 @@ spec:
1023
1023
SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the
1024
1024
right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod
1025
1025
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`.
1034
1031
1035
1032
1036
1033
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'
1037
1034
type : string
1038
- default : legacy
1039
1035
enum :
1040
1036
- legacy
1041
1037
- restricted
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ require (
23
23
github.com/onsi/gomega v1.33.1
24
24
github.com/openshift/api v3.9.0+incompatible
25
25
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
27
27
github.com/operator-framework/operator-registry v1.43.1
28
28
github.com/otiai10/copy v1.14.0
29
29
github.com/pkg/errors v0.9.1
Original file line number Diff line number Diff line change @@ -1817,8 +1817,8 @@ github.com/openshift/api v0.0.0-20221021112143-4226c2167e40 h1:PxjGCA72RtsdHWToZ
1817
1817
github.com/openshift/api v0.0.0-20221021112143-4226c2167e40 /go.mod h1:aQ6LDasvHMvHZXqLHnX2GRmnfTWCF/iIwz8EMTTIE9A =
1818
1818
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c h1:CV76yFOTXmq9VciBR3Bve5ZWzSxdft7gaMVB3kS0rwg =
1819
1819
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 =
1822
1822
github.com/operator-framework/operator-registry v1.43.1 h1:ACahVHGIL/hINBXd3RKWqSFR5SmSM6L5/n9xXqpR51s =
1823
1823
github.com/operator-framework/operator-registry v1.43.1 /go.mod h1:qhssAIYWXDIW+nTg0C5i4iD9zpMtiXtfXqGUuUmGz5c =
1824
1824
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU =
Original file line number Diff line number Diff line change @@ -710,7 +710,7 @@ github.com/openshift/client-go/config/informers/externalversions/config
710
710
github.com/openshift/client-go/config/informers/externalversions/config/v1
711
711
github.com/openshift/client-go/config/informers/externalversions/internalinterfaces
712
712
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
714
714
## explicit; go 1.22.0
715
715
github.com/operator-framework/api/crds
716
716
github.com/operator-framework/api/pkg/constraints
You can’t perform that action at this time.
0 commit comments