Skip to content

Commit a778e6d

Browse files
authored
[installer] Remove messagebus WEB-618 (#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
1 parent 8266f61 commit a778e6d

File tree

23 files changed

+4
-885
lines changed

23 files changed

+4
-885
lines changed

dev/preview/workflow/preview/deploy-gitpod.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ rm -f "${INSTALLER_RENDER_PATH}"
589589
# =========================
590590
# Wait for objects to be ready
591591
# =========================
592-
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
592+
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
593593
kubectl --kubeconfig "${PREVIEW_K3S_KUBE_PATH}" --context "${PREVIEW_K3S_KUBE_CONTEXT}" rollout status "${item}" --namespace="${PREVIEW_NAMESPACE}"
594594
done
595595

install/installer/pkg/common/common.go

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -236,48 +236,6 @@ func AnalyticsEnv(cfg *config.Config) (res []corev1.EnvVar) {
236236
}}
237237
}
238238

239-
func MessageBusEnv(cfg *config.Config) (res []corev1.EnvVar) {
240-
clusterObj := corev1.LocalObjectReference{Name: InClusterMessageQueueName}
241-
tlsObj := corev1.LocalObjectReference{Name: InClusterMessageQueueTLS}
242-
243-
credsSecret := clusterObj
244-
if cfg.MessageBus != nil && cfg.MessageBus.Credentials != nil {
245-
credsSecret = corev1.LocalObjectReference{Name: cfg.MessageBus.Credentials.Name}
246-
}
247-
248-
return []corev1.EnvVar{{
249-
Name: "MESSAGEBUS_USERNAME",
250-
ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{
251-
LocalObjectReference: clusterObj,
252-
Key: "username",
253-
}},
254-
}, {
255-
Name: "MESSAGEBUS_PASSWORD",
256-
ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{
257-
LocalObjectReference: credsSecret,
258-
Key: "rabbitmq-password",
259-
}},
260-
}, {
261-
Name: "MESSAGEBUS_CA",
262-
ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{
263-
LocalObjectReference: tlsObj,
264-
Key: "ca.crt",
265-
}},
266-
}, {
267-
Name: "MESSAGEBUS_CERT",
268-
ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{
269-
LocalObjectReference: tlsObj,
270-
Key: "tls.crt",
271-
}},
272-
}, {
273-
Name: "MESSAGEBUS_KEY",
274-
ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{
275-
LocalObjectReference: tlsObj,
276-
Key: "tls.key",
277-
}},
278-
}}
279-
}
280-
281239
func DatabaseEnv(cfg *config.Config) (res []corev1.EnvVar) {
282240
var (
283241
secretRef corev1.LocalObjectReference
@@ -508,26 +466,6 @@ func DatabaseWaiterContainer(ctx *RenderContext) *corev1.Container {
508466
}
509467
}
510468

511-
func MessageBusWaiterContainer(ctx *RenderContext) *corev1.Container {
512-
return &corev1.Container{
513-
Name: "msgbus-waiter",
514-
Image: ctx.ImageName(ctx.Config.Repository, "service-waiter", ctx.VersionManifest.Components.ServiceWaiter.Version),
515-
Args: []string{
516-
"-v",
517-
"messagebus",
518-
},
519-
SecurityContext: &corev1.SecurityContext{
520-
Privileged: pointer.Bool(false),
521-
AllowPrivilegeEscalation: pointer.Bool(false),
522-
RunAsUser: pointer.Int64(31001),
523-
},
524-
Env: MergeEnv(
525-
MessageBusEnv(&ctx.Config),
526-
ProxyEnv(&ctx.Config),
527-
),
528-
}
529-
}
530-
531469
func RedisWaiterContainer(ctx *RenderContext) *corev1.Container {
532470
return &corev1.Container{
533471
Name: "redis-waiter",

install/installer/pkg/components/components-webapp/components.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/gitpod-io/gitpod/installer/pkg/components/minio"
1515
"github.com/gitpod-io/gitpod/installer/pkg/components/proxy"
1616
public_api_server "github.com/gitpod-io/gitpod/installer/pkg/components/public-api-server"
17-
"github.com/gitpod-io/gitpod/installer/pkg/components/rabbitmq"
1817
"github.com/gitpod-io/gitpod/installer/pkg/components/redis"
1918
"github.com/gitpod-io/gitpod/installer/pkg/components/server"
2019
"github.com/gitpod-io/gitpod/installer/pkg/components/spicedb"
@@ -29,7 +28,6 @@ var Objects = common.CompositeRenderFunc(
2928
migrations.Objects,
3029
minio.Objects,
3130
proxy.Objects,
32-
rabbitmq.Objects,
3331
server.Objects,
3432
wsmanagerbridge.Objects,
3533
public_api_server.Objects,
@@ -42,5 +40,4 @@ var Objects = common.CompositeRenderFunc(
4240
var Helm = common.CompositeHelmFunc(
4341
database.Helm,
4442
minio.Helm,
45-
rabbitmq.Helm,
4643
)

install/installer/pkg/components/rabbitmq/certs/msgbus-ca.key

Lines changed: 0 additions & 54 deletions
This file was deleted.

install/installer/pkg/components/rabbitmq/certs/msgbus-ca.pem

Lines changed: 0 additions & 32 deletions
This file was deleted.

install/installer/pkg/components/rabbitmq/certs/msgbus-client.crt

Lines changed: 0 additions & 30 deletions
This file was deleted.

install/installer/pkg/components/rabbitmq/certs/msgbus-client.pem

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)