[installer] Remove messagebus WEB-618 (gitpod-io#18216)

* [server] Publish events during workspace starter * retest * fix * fix * retest * retest * retest * retest * retest * retest * retest * retest * [server] Publish events during workspace starter * retest * retest * retest * retest * retest * retest * retest * retest * retest * retest * retest * fix * [installer] Remove messagebus * fix * fix
ZDSRKJ · Jul 24, 2023 · a778e6d · a778e6d
1 parent 8266f61
commit a778e6d
Show file tree

Hide file tree

Showing 23 changed files with 4 additions and 885 deletions.
diff --git a/dev/preview/workflow/preview/deploy-gitpod.sh b/dev/preview/workflow/preview/deploy-gitpod.sh
@@ -589,7 +589,7 @@ rm -f "${INSTALLER_RENDER_PATH}"
 # =========================
 # Wait for objects to be ready
 # =========================
-for item in deployment.apps/blobserve deployment.apps/content-service deployment.apps/dashboard deployment.apps/ide-metrics deployment.apps/ide-proxy deployment.apps/ide-service deployment.apps/image-builder-mk3 deployment.apps/minio deployment.apps/node-labeler deployment.apps/proxy deployment.apps/public-api-server deployment.apps/redis deployment.apps/server deployment.apps/spicedb deployment.apps/usage deployment.apps/ws-manager-mk2 deployment.apps/ws-manager-bridge deployment.apps/ws-proxy statefulset.apps/messagebus statefulset.apps/mysql statefulset.apps/openvsx-proxy daemonset.apps/agent-smith daemonset.apps/fluent-bit daemonset.apps/registry-facade daemonset.apps/ws-daemon; do
+for item in deployment.apps/blobserve deployment.apps/content-service deployment.apps/dashboard deployment.apps/ide-metrics deployment.apps/ide-proxy deployment.apps/ide-service deployment.apps/image-builder-mk3 deployment.apps/minio deployment.apps/node-labeler deployment.apps/proxy deployment.apps/public-api-server deployment.apps/redis deployment.apps/server deployment.apps/spicedb deployment.apps/usage deployment.apps/ws-manager-mk2 deployment.apps/ws-manager-bridge deployment.apps/ws-proxy statefulset.apps/mysql statefulset.apps/openvsx-proxy daemonset.apps/agent-smith daemonset.apps/fluent-bit daemonset.apps/registry-facade daemonset.apps/ws-daemon; do
   kubectl --kubeconfig "${PREVIEW_K3S_KUBE_PATH}" --context "${PREVIEW_K3S_KUBE_CONTEXT}" rollout status "${item}" --namespace="${PREVIEW_NAMESPACE}"
 done
 

diff --git a/install/installer/pkg/common/common.go b/install/installer/pkg/common/common.go
@@ -236,48 +236,6 @@ func AnalyticsEnv(cfg *config.Config) (res []corev1.EnvVar) {
 	}}
 }
 
-func MessageBusEnv(cfg *config.Config) (res []corev1.EnvVar) {
-	clusterObj := corev1.LocalObjectReference{Name: InClusterMessageQueueName}
-	tlsObj := corev1.LocalObjectReference{Name: InClusterMessageQueueTLS}
-
-	credsSecret := clusterObj
-	if cfg.MessageBus != nil && cfg.MessageBus.Credentials != nil {
-		credsSecret = corev1.LocalObjectReference{Name: cfg.MessageBus.Credentials.Name}
-	}
-
-	return []corev1.EnvVar{{
-		Name: "MESSAGEBUS_USERNAME",
-		ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{
-			LocalObjectReference: clusterObj,
-			Key:                  "username",
-		}},
-	}, {
-		Name: "MESSAGEBUS_PASSWORD",
-		ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{
-			LocalObjectReference: credsSecret,
-			Key:                  "rabbitmq-password",
-		}},
-	}, {
-		Name: "MESSAGEBUS_CA",
-		ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{
-			LocalObjectReference: tlsObj,
-			Key:                  "ca.crt",
-		}},
-	}, {
-		Name: "MESSAGEBUS_CERT",
-		ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{
-			LocalObjectReference: tlsObj,
-			Key:                  "tls.crt",
-		}},
-	}, {
-		Name: "MESSAGEBUS_KEY",
-		ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{
-			LocalObjectReference: tlsObj,
-			Key:                  "tls.key",
-		}},
-	}}
-}
-
 func DatabaseEnv(cfg *config.Config) (res []corev1.EnvVar) {
 	var (
 		secretRef corev1.LocalObjectReference
@@ -508,26 +466,6 @@ func DatabaseWaiterContainer(ctx *RenderContext) *corev1.Container {
 	}
 }
 
-func MessageBusWaiterContainer(ctx *RenderContext) *corev1.Container {
-	return &corev1.Container{
-		Name:  "msgbus-waiter",
-		Image: ctx.ImageName(ctx.Config.Repository, "service-waiter", ctx.VersionManifest.Components.ServiceWaiter.Version),
-		Args: []string{
-			"-v",
-			"messagebus",
-		},
-		SecurityContext: &corev1.SecurityContext{
-			Privileged:               pointer.Bool(false),
-			AllowPrivilegeEscalation: pointer.Bool(false),
-			RunAsUser:                pointer.Int64(31001),
-		},
-		Env: MergeEnv(
-			MessageBusEnv(&ctx.Config),
-			ProxyEnv(&ctx.Config),
-		),
-	}
-}
-
 func RedisWaiterContainer(ctx *RenderContext) *corev1.Container {
 	return &corev1.Container{
 		Name:  "redis-waiter",

diff --git a/install/installer/pkg/components/components-webapp/components.go b/install/installer/pkg/components/components-webapp/components.go
@@ -14,7 +14,6 @@ import (
 	"github.com/gitpod-io/gitpod/installer/pkg/components/minio"
 	"github.com/gitpod-io/gitpod/installer/pkg/components/proxy"
 	public_api_server "github.com/gitpod-io/gitpod/installer/pkg/components/public-api-server"
-	"github.com/gitpod-io/gitpod/installer/pkg/components/rabbitmq"
 	"github.com/gitpod-io/gitpod/installer/pkg/components/redis"
 	"github.com/gitpod-io/gitpod/installer/pkg/components/server"
 	"github.com/gitpod-io/gitpod/installer/pkg/components/spicedb"
@@ -29,7 +28,6 @@ var Objects = common.CompositeRenderFunc(
 	migrations.Objects,
 	minio.Objects,
 	proxy.Objects,
-	rabbitmq.Objects,
 	server.Objects,
 	wsmanagerbridge.Objects,
 	public_api_server.Objects,
@@ -42,5 +40,4 @@ var Objects = common.CompositeRenderFunc(
 var Helm = common.CompositeHelmFunc(
 	database.Helm,
 	minio.Helm,
-	rabbitmq.Helm,
 )
diff --git a/install/installer/pkg/components/rabbitmq/certs/msgbus-ca.key b/install/installer/pkg/components/rabbitmq/certs/msgbus-ca.key
diff --git a/install/installer/pkg/components/rabbitmq/certs/msgbus-ca.pem b/install/installer/pkg/components/rabbitmq/certs/msgbus-ca.pem
diff --git a/install/installer/pkg/components/rabbitmq/certs/msgbus-client.crt b/install/installer/pkg/components/rabbitmq/certs/msgbus-client.crt
diff --git a/install/installer/pkg/components/rabbitmq/certs/msgbus-client.pem b/install/installer/pkg/components/rabbitmq/certs/msgbus-client.pem