Skip to content

Commit a8496e2

Browse files
authored
fix(public-api-gateway): add AMQP_URL env. var (#432)
## 📝 Description Fixes `public-api-gateway` deployment issues: * Adds missing `AMQP_URL` environment variable * Corrects `JOBS_V1ALPHA_PUBLIC_GRPC_API_ENDPOINT` gRPC endpoint Also updates E2E test configuration to align with changes in secret creation during bootstrapping. Related [task](renderedtext/project-tasks#2640). ## ✅ Checklist - [x] I have tested this change - [ ] ~This change requires documentation update~ N/A
1 parent c5c8333 commit a8496e2

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

e2e/scripts/test-setup.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ if [[ "$CLOUD_TEST_ENVIRONMENT_TYPE" == "gke" ]]; then
77
artifact pull project "environments/${CLOUD_TEST_ENV_PREFIX}/terraform.tfstate" -d terraform.tfstate
88
CLUSTER_NAME=$(terraform output -raw cluster_name)
99
gcloud container clusters get-credentials ${CLUSTER_NAME} --region us-east4 --project ${GOOGLE_PROJECT_NAME}
10-
export SEMAPHORE_API_TOKEN=$(kubectl get secret root-user -o jsonpath='{.data.token}' | base64 -d)
11-
export SEMAPHORE_USER_PASSWORD=$(kubectl get secret root-user -o jsonpath='{.data.password}' | base64 -d)
10+
export SEMAPHORE_API_TOKEN=$(kubectl get secret semaphore-authentication -o jsonpath='{.data.ROOT_USER_TOKEN}' | base64 -d)
11+
export SEMAPHORE_USER_PASSWORD=$(kubectl get secret semaphore-authentication -o jsonpath='{.data.ROOT_USER_PASSWORD}' | base64 -d)
1212
elif [[ "$CLOUD_TEST_ENVIRONMENT_TYPE" == "single-vm" ]]; then
1313
artifact pull project "environments/${CLOUD_TEST_ENV_PREFIX}/private-ssh-key" -d private-ssh-key
1414
artifact pull project "environments/${CLOUD_TEST_ENV_PREFIX}/private-ssh-key.pub" -d private-ssh-key.pub
1515
chmod 400 private-ssh-key
16-
export SEMAPHORE_API_TOKEN=$(gcloud compute ssh --ssh-key-file private-ssh-key test-${CLOUD_TEST_ENV_PREFIX} --command "kubectl get secret root-user -o jsonpath='{.data.token}' | base64 -d")
17-
export SEMAPHORE_USER_PASSWORD=$(gcloud compute ssh --ssh-key-file private-ssh-key test-${CLOUD_TEST_ENV_PREFIX} --command "kubectl get secret root-user -o jsonpath='{.data.password}' | base64 -d")
16+
export SEMAPHORE_API_TOKEN=$(gcloud compute ssh --ssh-key-file private-ssh-key test-${CLOUD_TEST_ENV_PREFIX} --command "kubectl get secret semaphore-authentication -o jsonpath='{.data.ROOT_USER_TOKEN}' | base64 -d")
17+
export SEMAPHORE_USER_PASSWORD=$(gcloud compute ssh --ssh-key-file private-ssh-key test-${CLOUD_TEST_ENV_PREFIX} --command "kubectl get secret semaphore-authentication -o jsonpath='{.data.ROOT_USER_PASSWORD}' | base64 -d")
1818
else
1919
echo "Unknown environment type: ${CLOUD_TEST_ENVIRONMENT_TYPE}"
2020
exit 1

e2e/test/e2e/ui/git_integrations_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ defmodule E2E.UI.GitIntegrationsTest do
9898
session
9999
|> assert_has(Wallaby.Query.text("GitHub App Connection"))
100100
# Green circle indicator
101-
|> assert_has(Wallaby.Query.css("[data-testid='connection-status']"))
101+
|> assert_has(Wallaby.Query.css("[data-testid='connection-status']", minimum: 1))
102102
end
103103

104104
test "has required permissions section", %{session: session} do

public-api-gateway/helm/templates/dpl.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,16 @@ spec:
6060
- name: DASHBOARDS_V1ALPHA_PUBLIC_GRPC_API_ENDPOINT
6161
value: "dashboards-v1alpha-public-grpc-api:50051"
6262
- name: JOBS_V1ALPHA_PUBLIC_GRPC_API_ENDPOINT
63-
value: "jobs-v1alpha-public-grpc-api:50051"
63+
value: "jobs-v1alpha-public-grpc-api-headless:50051"
6464
- name: NOTIFICATIONS_V1ALPHA_PUBLIC_GRPC_API_ENDPOINT
6565
value: "notifications-v1alpha-public-grpc-api:50051"
6666
- name: PROJECT_SECRETS_V1_PUBLIC_GRPC_API_ENDPOINT
6767
value: "secrethub-grpc:50051"
68+
- name: AMQP_URL
69+
valueFrom:
70+
secretKeyRef:
71+
name: {{ .Values.global.rabbitmq.secretName }}
72+
key: amqp-url
6873
{{- if .Values.resources }}
6974
resources:
7075
{{ toYaml .Values.resources | indent 13 }}

0 commit comments

Comments
 (0)