Skip to content

[ws-manager-mk2] remove experimental mode feature #18513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 15, 2023
Merged

[ws-manager-mk2] remove experimental mode feature #18513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c0f5511
[installer] remove experimental mode
kylos101 Aug 14, 2023
1b44b6b
[ws-manager-mk2] remove experimental node selector
kylos101 Aug 14, 2023
cfb77ec
[ws-manager-api] remove ExperimentalMode from configuration
kylos101 Aug 14, 2023
324280d
Add `ws-manager-api` to vscode workspace
kylos101 Aug 14, 2023
b2c8111
[preview] remove experimental & bump deps
kylos101 Aug 14, 2023
99edeac
[preview] LocalStorageCapacityIsolation is GA, no needed as a gate in…
kylos101 Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions components/ws-manager-api/go/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,6 @@ type Configuration struct {
// TimeoutMaxConcurrentReconciles configures the max amount of concurrent workspace reconciliations on
// the timeout controller.
TimeoutMaxConcurrentReconciles int `json:"timeoutMaxConcurrentReconciles,omitempty"`
// ExperimentalMode controls if experimental features are enabled
ExperimentalMode bool `json:"experimentalMode"`
// EnableCustomSSLCertificate controls if we need to support custom SSL certificates for git operations
EnableCustomSSLCertificate bool `json:"enableCustomSSLCertificate"`
}
Expand Down
12 changes: 0 additions & 12 deletions components/ws-manager-mk2/controllers/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,18 +348,6 @@ func createDefiniteWorkspacePod(sctx *startWorkspaceContext) (*corev1.Pod, error
},
}

if sctx.Config.ExperimentalMode {
matchExpressions = append(matchExpressions, corev1.NodeSelectorRequirement{
Key: "gitpod.io/experimental",
Operator: corev1.NodeSelectorOpExists,
})
} else {
matchExpressions = append(matchExpressions, corev1.NodeSelectorRequirement{
Key: "gitpod.io/experimental",
Operator: corev1.NodeSelectorOpDoesNotExist,
})
}

affinity := &corev1.Affinity{
NodeAffinity: &corev1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
Expand Down
2 changes: 1 addition & 1 deletion dev/preview/infrastructure/modules/gce/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ variable "harvester_ingress_ip" {
variable "vm_image" {
type = string
description = "The VM image"
default = "gitpod-k3s-202308111617"
default = "gitpod-k3s-202308150341"
}

variable "cert_issuer" {
Expand Down
2 changes: 1 addition & 1 deletion dev/preview/infrastructure/modules/harvester/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ variable "ssh_key" {
variable "vm_image" {
type = string
description = "The VM image"
default = "gitpod-k3s-202308111617"
default = "gitpod-k3s-202308150341"
}

variable "harvester_ingress_ip" {
Expand Down
2 changes: 0 additions & 2 deletions dev/preview/infrastructure/scripts/bootstrap-k3s.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ export INSTALL_K3S_SKIP_DOWNLOAD=true
--flannel-backend=none \
--kubelet-arg config=/etc/kubernetes/kubelet-config.json \
--kubelet-arg cgroup-driver=systemd \
--kubelet-arg feature-gates=LocalStorageCapacityIsolation=true \
--kubelet-arg feature-gates=LocalStorageCapacityIsolationFSQuotaMonitoring=true \
--kube-apiserver-arg feature-gates=LocalStorageCapacityIsolation=true \
--kube-apiserver-arg feature-gates=LocalStorageCapacityIsolationFSQuotaMonitoring=true \
--cluster-init

Expand Down
2 changes: 1 addition & 1 deletion dev/preview/infrastructure/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ variable "vm_type" {
variable "vm_image" {
type = string
description = "The VM image"
default = "gitpod-k3s-202308111617"
default = "gitpod-k3s-202308150341"
}

variable "cert_issuer" {
Expand Down
3 changes: 3 additions & 0 deletions gitpod-ws.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
{
"path": "components/ws-daemon"
},
{
"path": "components/ws-manager-api"
},
{
"path": "components/ws-manager-mk2"
},
Expand Down
4 changes: 0 additions & 4 deletions install/installer/pkg/components/ws-manager-mk2/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
}

var schedulerName string
var experimentalMode bool
gitpodHostURL := "https://" + ctx.Config.Domain
workspaceClusterHost := fmt.Sprintf("ws%s.%s", installationShortNameSuffix, ctx.Config.Domain)
workspaceURLTemplate := fmt.Sprintf("https://{{ .Prefix }}.ws%s.%s", installationShortNameSuffix, ctx.Config.Domain)
Expand Down Expand Up @@ -142,8 +141,6 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
}
rateLimits = ucfg.Workspace.WSManagerRateLimits

experimentalMode = ucfg.Workspace.UseMk2ExperimentalMode

return nil
})
if err != nil {
Expand Down Expand Up @@ -214,7 +211,6 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
RegistryFacadeHost: fmt.Sprintf("reg.%s:%d", ctx.Config.Domain, common.RegistryFacadeServicePort),
WorkspaceMaxConcurrentReconciles: 25,
TimeoutMaxConcurrentReconciles: 15,
ExperimentalMode: experimentalMode,
},
Content: struct {
Storage storageconfig.StorageConfig `json:"storage"`
Expand Down
1 change: 0 additions & 1 deletion install/installer/pkg/config/v1/experimental/experimental.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ type WorkspaceConfig struct {
} `json:"contentService"`

EnableProtectedSecrets *bool `json:"enableProtectedSecrets"`
UseMk2ExperimentalMode bool `json:"useMk2ExperimentalMode,omitempty"`
}

type WorkspaceClass struct {
Expand Down