Skip to content

Commit e3ee87b

Browse files
authored
[messagebus] Remove remaining refs (#18340)
1 parent 98aff7f commit e3ee87b

File tree

7 files changed

+0
-101
lines changed

7 files changed

+0
-101
lines changed

.werft/jobs/build/installer/post-process.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -365,12 +365,6 @@ while [ "$documentIndex" -le "$DOCS" ]; do
365365
# echo "---" >> /tmp/"$NAME"-"$KIND"-overrides.yaml
366366
# fi
367367

368-
# # Update the apiVersion to match what we installed, so we can uninstall at a later time w/o error
369-
# # if [[ "messagebus" == "$CONFIG_NAME" ]] && [[ "$CONFIG_KIND" == "PodDisruptionBudget" ]]; then
370-
# # echo "Update new $CONFIG_NAME $CONFIG_KIND in the gitpod-app ConfigMap"
371-
# # yq w -i /tmp/gitpod-app_config_"$ci" apiVersion $PDB_POLICY_VERSION
372-
# # fi
373-
374368
# cat /tmp/gitpod-app_config_"$ci" >> /tmp/"$NAME"-"$KIND"-overrides.yaml
375369
# ci=$((ci + 1))
376370
# new_ci=$((new_ci + 1))

components/server/src/prometheus-metrics.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ export function registerServerMetrics(registry: prometheusClient.Registry) {
1414
registry.registerMetric(apiCallDurationHistogram);
1515
registry.registerMetric(httpRequestTotal);
1616
registry.registerMetric(httpRequestDuration);
17-
registry.registerMetric(messagebusTopicReads);
1817
registry.registerMetric(gitpodVersionInfo);
1918
registry.registerMetric(instanceStartsSuccessTotal);
2019
registry.registerMetric(instanceStartsFailedTotal);
@@ -142,18 +141,6 @@ export function observeHttpRequestDuration(
142141
httpRequestDuration.observe({ method, route, statusCode }, durationInSeconds);
143142
}
144143

145-
const messagebusTopicReads = new prometheusClient.Counter({
146-
name: "gitpod_server_topic_reads_total",
147-
help: "The amount of reads from messagebus topics.",
148-
labelNames: ["topic"],
149-
});
150-
151-
export function increaseMessagebusTopicReads(topic: string) {
152-
messagebusTopicReads.inc({
153-
topic,
154-
});
155-
}
156-
157144
const gitpodVersionInfo = new prometheusClient.Gauge({
158145
name: "gitpod_version_info",
159146
help: "Gitpod's version",

components/service-waiter/cmd/redis.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/gitpod-io/gitpod/common-go/log"
1717
)
1818

19-
// messagebusCmd represents the messagebus command
2019
var redisCmd = &cobra.Command{
2120
Use: "redis",
2221
Short: "waits for redis to become reachable",

dev/gpctl/cmd/workspaces-watch.go

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

install/installer/pkg/common/constants.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ const (
2121
GitpodContainerRegistry = "eu.gcr.io/gitpod-core-dev/build"
2222
InClusterDbSecret = "mysql"
2323
InClusterMessageQueueName = "rabbitmq"
24-
InClusterMessageQueueTLS = "messagebus-certificates-secret-core"
2524
KubeRBACProxyRepo = "quay.io"
2625
KubeRBACProxyImage = "brancz/kube-rbac-proxy"
2726
KubeRBACProxyTag = "v0.14.2"

install/preview/entrypoint.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ rm /var/lib/rancher/k3s/server/manifests/gitpod/*Issuer*
210210
# update PersistentVolumeClaim's to use k3s's `local-path` storage class
211211
for f in /var/lib/rancher/k3s/server/manifests/gitpod/*PersistentVolumeClaim*.yaml; do yq e -i '.spec.storageClassName="local-path"' "$f"; done
212212
# Set `volumeClassTemplate` so that each replica creates its own PVC
213-
yq eval-all -i ". as \$item ireduce ({}; . *+ \$item)" /var/lib/rancher/k3s/server/manifests/gitpod/*_StatefulSet_messagebus.yaml /app/manifests/messagebus.yaml
214213
# update Statefulset's to use k3s's `local-path` storage class
215214
for f in /var/lib/rancher/k3s/server/manifests/gitpod/*StatefulSet*.yaml; do yq e -i '.spec.volumeClaimTemplates[0].spec.storageClassName="local-path"' "$f"; done
216215

test/pkg/integration/setup.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ var (
170170
{name: "node-labeler"},
171171
{name: "proxy"},
172172
{name: "public-api-server"},
173-
{name: "rabbitmq", labelKey: "app.kubernetes.io/name"}, // messagebus
174173
{name: "redis"},
175174
{name: "registry-facade"},
176175
{name: "server"},

0 commit comments

Comments
 (0)