Skip to content

Commit 096fed5

Browse files
joelanfordPer Goncalves da Silva
authored andcommitted
remove default value of catsrc.spec.grpcPodConfig.securityContextConfig (#342)
Signed-off-by: Joe Lanford <[email protected]> Upstream-repository: api Upstream-commit: 5d2d3fbe061b7b4a942747877efa58958fa9889e
1 parent b2ba330 commit 096fed5

File tree

8 files changed

+24
-40
lines changed

8 files changed

+24
-40
lines changed

manifests/0000_50_olm_00-catalogsources.crd.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,9 +613,8 @@ spec:
613613
description: If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default.
614614
type: string
615615
securityContextConfig:
616-
description: "SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod Security Admission (PSA) `restricted` mode, or doesn't set these values at all, in which case the pod can only be run in PSA `baseline` or `privileged` namespaces. Currently if the SecurityContextConfig is unspecified, the default value of `legacy` is used. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older catalog images, which could not be run in `restricted` mode, the SecurityContextConfig should be set to `legacy`. \n In a future version will the default will be set to `restricted`, catalog maintainers should rebuild their catalogs with a version of opm that supports running catalogSource pods in `restricted` mode to prepare for these changes. \n More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'"
616+
description: "SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod Security Admission (PSA) `restricted` mode, or doesn't set these values at all, in which case the pod can only be run in PSA `baseline` or `privileged` namespaces. If the SecurityContextConfig is unspecified, the mode will be determined by the namespace's PSA configuration. If the namespace is enforcing `restricted` mode, then the pod will be configured as if `restricted` was specified. Otherwise, it will be configured as if `legacy` was specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`. \n More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'"
617617
type: string
618-
default: legacy
619618
enum:
620619
- legacy
621620
- restricted

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,9 +613,8 @@ spec:
613613
description: If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default.
614614
type: string
615615
securityContextConfig:
616-
description: "SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod Security Admission (PSA) `restricted` mode, or doesn't set these values at all, in which case the pod can only be run in PSA `baseline` or `privileged` namespaces. Currently if the SecurityContextConfig is unspecified, the default value of `legacy` is used. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older catalog images, which could not be run in `restricted` mode, the SecurityContextConfig should be set to `legacy`. \n In a future version will the default will be set to `restricted`, catalog maintainers should rebuild their catalogs with a version of opm that supports running catalogSource pods in `restricted` mode to prepare for these changes. \n More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'"
616+
description: "SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod Security Admission (PSA) `restricted` mode, or doesn't set these values at all, in which case the pod can only be run in PSA `baseline` or `privileged` namespaces. If the SecurityContextConfig is unspecified, the mode will be determined by the namespace's PSA configuration. If the namespace is enforcing `restricted` mode, then the pod will be configured as if `restricted` was specified. Otherwise, it will be configured as if `legacy` was specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`. \n More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'"
617617
type: string
618-
default: legacy
619618
enum:
620619
- legacy
621620
- restricted

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -989,19 +989,15 @@ spec:
989989
SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the
990990
right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod
991991
Security Admission (PSA) `restricted` mode, or doesn't set these values at all, in which case the pod can only be
992-
run in PSA `baseline` or `privileged` namespaces. Currently if the SecurityContextConfig is unspecified, the default
993-
value of `legacy` is used. Specifying a value other than `legacy` or `restricted` result in a validation error.
994-
When using older catalog images, which could not be run in `restricted` mode, the SecurityContextConfig should be
995-
set to `legacy`.
996-
997-
998-
In a future version will the default will be set to `restricted`, catalog maintainers should rebuild their catalogs
999-
with a version of opm that supports running catalogSource pods in `restricted` mode to prepare for these changes.
992+
run in PSA `baseline` or `privileged` namespaces. If the SecurityContextConfig is unspecified, the mode will be
993+
determined by the namespace's PSA configuration. If the namespace is enforcing `restricted` mode, then the pod
994+
will be configured as if `restricted` was specified. Otherwise, it will be configured as if `legacy` was
995+
specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older
996+
catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`.
1000997
1001998
1002999
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'
10031000
type: string
1004-
default: legacy
10051001
enum:
10061002
- legacy
10071003
- restricted

staging/api/crds/zz_defs.go

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

staging/api/pkg/operators/v1alpha1/catalogsource_types.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,18 +133,15 @@ type GrpcPodConfig struct {
133133
// SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the
134134
// right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod
135135
// Security Admission (PSA) `restricted` mode, or doesn't set these values at all, in which case the pod can only be
136-
// run in PSA `baseline` or `privileged` namespaces. Currently if the SecurityContextConfig is unspecified, the default
137-
// value of `legacy` is used. Specifying a value other than `legacy` or `restricted` result in a validation error.
138-
// When using older catalog images, which could not be run in `restricted` mode, the SecurityContextConfig should be
139-
// set to `legacy`.
140-
//
141-
// In a future version will the default will be set to `restricted`, catalog maintainers should rebuild their catalogs
142-
// with a version of opm that supports running catalogSource pods in `restricted` mode to prepare for these changes.
136+
// run in PSA `baseline` or `privileged` namespaces. If the SecurityContextConfig is unspecified, the mode will be
137+
// determined by the namespace's PSA configuration. If the namespace is enforcing `restricted` mode, then the pod
138+
// will be configured as if `restricted` was specified. Otherwise, it will be configured as if `legacy` was
139+
// specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older
140+
// catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`.
143141
//
144142
// More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'
145143
// +optional
146144
// +kubebuilder:validation:Enum=legacy;restricted
147-
// +kubebuilder:default:=legacy
148145
SecurityContextConfig SecurityConfig `json:"securityContextConfig,omitempty"`
149146

150147
// MemoryTarget configures the $GOMEMLIMIT value for the gRPC catalog Pod. This is a soft memory limit for the server,

vendor/github.com/operator-framework/api/crds/operators.coreos.com_catalogsources.yaml

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

vendor/github.com/operator-framework/api/crds/zz_defs.go

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

vendor/github.com/operator-framework/api/pkg/operators/v1alpha1/catalogsource_types.go

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

0 commit comments

Comments
 (0)