Skip to content

Commit dc59fa1

Browse files
committed
chore: Add hostUsers field to DWOC
Signed-off-by: Anatolii Bazko <[email protected]>
1 parent 8f2d764 commit dc59fa1

11 files changed

+59
-0
lines changed

apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,12 @@ type WorkspaceConfig struct {
196196
// If not specified or "0", the timeout is disabled.
197197
// +kubebuilder:validation:Optional
198198
PostStartTimeout string `json:"postStartTimeout,omitempty"`
199+
// Use the host's user namespace.
200+
// Optional: Default to true.
201+
// If set to true or not present, the pod will be run in the host user namespace.
202+
// When set to false, a new userns is created for the pod.
203+
// +kubebuilder:validation:Optional
204+
HostUsers *bool `json:"hostUsers,omitempty"`
199205
}
200206

201207
type WebhookConfig struct {

apis/controller/v1alpha1/zz_generated.deepcopy.go

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

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

Lines changed: 7 additions & 0 deletions
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: 7 additions & 0 deletions
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: 7 additions & 0 deletions
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: 7 additions & 0 deletions
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: 7 additions & 0 deletions
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: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/config/defaults.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{
8282
RetainTime: pointer.Int32(2592000),
8383
Schedule: "0 0 1 * *",
8484
},
85+
HostUsers: pointer.Bool(true),
8586
},
8687
}
8788

pkg/config/sync.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,10 @@ func mergeConfig(from, to *controller.OperatorConfiguration) {
435435
if from.Workspace.PostStartTimeout != "" {
436436
to.Workspace.PostStartTimeout = from.Workspace.PostStartTimeout
437437
}
438+
439+
if from.Workspace.HostUsers != nil {
440+
to.Workspace.HostUsers = from.Workspace.HostUsers
441+
}
438442
}
439443
}
440444

0 commit comments

Comments
 (0)