Update pod/container securityContext documentation in CRD

Signed-off-by: Angel Misevski <[email protected]>
devfile · Nov 2, 2022 · 14d5170 · 14d5170
1 parent 820a12b
commit 14d5170
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go b/apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go
@@ -142,12 +142,12 @@ type WorkspaceConfig struct {
 	// but the objects will be left on the cluster). The default value is false.
 	CleanupOnStop *bool `json:"cleanupOnStop,omitempty"`
 	// PodSecurityContext overrides the default PodSecurityContext used for all workspace-related
-	// pods created by the DevWorkspace Operator. If set, the entire pod security context is
-	// overridden; values are not merged.
+	// pods created by the DevWorkspace Operator. If set, defined values are merged into the default
+	// configuration
 	PodSecurityContext *corev1.PodSecurityContext `json:"podSecurityContext,omitempty"`
 	// ContainerSecurityContext overrides the default ContainerSecurityContext used for all
-	// workspace-related containers created by the DevWorkspace Operator. If set, the entire
-	// container security context is overridden; values are not merged.
+	// workspace-related containers created by the DevWorkspace Operator. If set, defined
+	// values are merged into the default configuration
 	ContainerSecurityContext *corev1.SecurityContext `json:"containerSecurityContext,omitempty"`
 	// DefaultTemplate defines an optional DevWorkspace Spec Template which gets applied to the workspace
 	// if the workspace's Template Spec Components are not defined. The DefaultTemplate will overwrite the existing

diff --git a/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml b/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml
diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml
diff --git a/...s/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml b/...s/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml
diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml
diff --git a/...t/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml b/...t/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml
diff --git a/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml b/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml