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

kylos101 · web-flow · commit 34b4602286a4 · 2023-08-15T06:37:41.000+02:00
* [installer] remove experimental mode * [ws-manager-mk2] remove experimental node selector * [ws-manager-api] remove ExperimentalMode from configuration * Add `ws-manager-api` to vscode workspace * [preview] remove experimental & bump deps Depends on gitpod-io/gitpod-packer-gcp-image#246 * [preview] LocalStorageCapacityIsolation is GA, no needed as a gate in 1.27
diff --git a/components/ws-manager-api/go/config/config.go b/components/ws-manager-api/go/config/config.go
@@ -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"`
 }
diff --git a/components/ws-manager-mk2/controllers/create.go b/components/ws-manager-mk2/controllers/create.go
@@ -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{
diff --git a/dev/preview/infrastructure/modules/gce/variables.tf b/dev/preview/infrastructure/modules/gce/variables.tf
@@ -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" {
diff --git a/dev/preview/infrastructure/modules/harvester/variables.tf b/dev/preview/infrastructure/modules/harvester/variables.tf
@@ -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" {
diff --git a/dev/preview/infrastructure/scripts/bootstrap-k3s.sh b/dev/preview/infrastructure/scripts/bootstrap-k3s.sh
@@ -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
 
diff --git a/dev/preview/infrastructure/variables.tf b/dev/preview/infrastructure/variables.tf
@@ -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" {
diff --git a/gitpod-ws.code-workspace b/gitpod-ws.code-workspace
@@ -60,6 +60,9 @@
         {
             "path": "components/ws-daemon"
         },
+        {
+            "path": "components/ws-manager-api"
+        },
         {
             "path": "components/ws-manager-mk2"
         },
diff --git a/install/installer/pkg/components/ws-manager-mk2/configmap.go b/install/installer/pkg/components/ws-manager-mk2/configmap.go
@@ -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)
@@ -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 {
@@ -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"`
diff --git a/install/installer/pkg/config/v1/experimental/experimental.go b/install/installer/pkg/config/v1/experimental/experimental.go
@@ -125,7 +125,6 @@ type WorkspaceConfig struct {
 	} `json:"contentService"`
 
 	EnableProtectedSecrets *bool `json:"enableProtectedSecrets"`
-	UseMk2ExperimentalMode bool  `json:"useMk2ExperimentalMode,omitempty"`
 }
 
 type WorkspaceClass struct {

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,6 @@ type Configuration struct {`
`131`	`131`	`// TimeoutMaxConcurrentReconciles configures the max amount of concurrent workspace reconciliations on`
`132`	`132`	`// the timeout controller.`
`133`	`133`	TimeoutMaxConcurrentReconciles int `json:"timeoutMaxConcurrentReconciles,omitempty"`
`134`		`- // ExperimentalMode controls if experimental features are enabled`
`135`		- ExperimentalMode bool `json:"experimentalMode"`
`136`	`134`	`// EnableCustomSSLCertificate controls if we need to support custom SSL certificates for git operations`
`137`	`135`	EnableCustomSSLCertificate bool `json:"enableCustomSSLCertificate"`
`138`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ variable "harvester_ingress_ip" {`
`44`	`44`	`variable "vm_image" {`
`45`	`45`	`type = string`
`46`	`46`	`description = "The VM image"`
`47`		`- default = "gitpod-k3s-202308111617"`
	`47`	`+ default = "gitpod-k3s-202308150341"`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`variable "cert_issuer" {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ variable "ssh_key" {`
`33`	`33`	`variable "vm_image" {`
`34`	`34`	`type = string`
`35`	`35`	`description = "The VM image"`
`36`		`- default = "gitpod-k3s-202308111617"`
	`36`	`+ default = "gitpod-k3s-202308150341"`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`variable "harvester_ingress_ip" {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ variable "vm_type" {`
`35`	`35`	`variable "vm_image" {`
`36`	`36`	`type = string`
`37`	`37`	`description = "The VM image"`
`38`		`- default = "gitpod-k3s-202308111617"`
	`38`	`+ default = "gitpod-k3s-202308150341"`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`variable "cert_issuer" {`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@`
`60`	`60`	`{`
`61`	`61`	`"path": "components/ws-daemon"`
`62`	`62`	`},`
	`63`	`+ {`
	`64`	`+ "path": "components/ws-manager-api"`
	`65`	`+ },`
`63`	`66`	`{`
`64`	`67`	`"path": "components/ws-manager-mk2"`
`65`	`68`	`},`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ type WorkspaceConfig struct {`
`125`	`125`	} `json:"contentService"`
`126`	`126`
`127`	`127`	EnableProtectedSecrets *bool `json:"enableProtectedSecrets"`
`128`		- UseMk2ExperimentalMode bool `json:"useMk2ExperimentalMode,omitempty"`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`type WorkspaceClass struct {`