Skip to content

Commit f82748a

Browse files
committed
fixup! fixup! fixup! fixes
Signed-off-by: Oleksii Kurinnyi <[email protected]>
1 parent dfc4a73 commit f82748a

File tree

9 files changed

+3
-8
lines changed

9 files changed

+3
-8
lines changed

apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ type WorkspaceConfig struct {
205205
HostUsers *bool `json:"hostUsers,omitempty"`
206206
// InitContainers defines a list of Kubernetes init containers that are automatically injected into all workspace pods.
207207
// Typical uses: injecting organization tools/configs, initializing persistent home, etc.
208-
// Note: Only administrators should be allowed to edit the DevWorkspaceOperatorConfig.
209208
InitContainers []corev1.Container `json:"initContainers,omitempty"`
210209
}
211210

controllers/workspace/devworkspace_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
535535
// Inject operator-configured init containers
536536
if workspace.Config != nil && workspace.Config.Workspace != nil && len(workspace.Config.Workspace.InitContainers) > 0 {
537537
// Check if init-persistent-home should be disabled
538-
disableHomeInit := pointer.BoolDeref(workspace.Config.Workspace.PersistUserHome.DisableInitContainer, false)
538+
disableHomeInit := pointer.BoolDeref(workspace.Config.Workspace.PersistUserHome.DisableInitContainer, constants.DefaultDisableHomeInitContainer)
539539

540540
// Prepare patches: filter and preprocess init containers from config
541541
patches := []corev1.Container{}

deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml

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

deploy/deployment/kubernetes/combined.yaml

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

deploy/deployment/kubernetes/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

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

deploy/deployment/openshift/combined.yaml

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

deploy/deployment/openshift/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

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

deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml

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

pkg/constants/constants.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ const (
4545

4646
HomeInitEventId = "init-persistent-home"
4747

48+
DefaultDisableHomeInitContainer = false
49+
4850
SshAgentStartEventId = "init-ssh-agent-command"
4951

5052
ServiceAccount = "devworkspace"

0 commit comments

Comments
 (0)