[installer] Remove messagebus

Author: easyCZ

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

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,
 )