Skip to content

Commit

Permalink
Prefer getting env vars from the new configmaps #3326
Browse files Browse the repository at this point in the history
  • Loading branch information
@erkannt
erkannt committed Jun 18, 2024
1 parent b4fc417 commit 297fe46
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 30 deletions.
20 changes: 10 additions & 10 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,17 @@ staging-sql:
kubectl run psql \
--rm -it --image=postgres:12.3 \
--env=PGHOST=$$(kubectl get configmap sciety--staging--public-env-vars -o json | jq -r '.data.PGHOST') \
--env=PGDATABASE=$$(kubectl get secret hive-staging-rds-postgres -o json | jq -r '.data."postgresql-database"'| base64 -d) \
--env=PGUSER=$$(kubectl get secret hive-staging-rds-postgres -o json | jq -r '.data."postgresql-username"'| base64 -d) \
--env=PGDATABASE=$$(kubectl get configmap sciety--staging--public-env-vars -o json | jq -r '.data.PGDATABASE') \
--env=PGUSER=$$(kubectl get configmap sciety--staging--public-env-vars -o json | jq -r '.data.PGUSER') \
--env=PGPASSWORD=$$(kubectl get secret hive-staging-rds-postgres -o json | jq -r '.data."postgresql-password"'| base64 -d | sed -e 's/\$$\$$/$$$$$$$$/g') \
-- psql

prod-sql:
kubectl run psql \
--rm -it --image=postgres:12.3 \
--env=PGHOST=$$(kubectl get configmap sciety--prod--public-env-vars -o json | jq -r '.data.PGHOST') \
--env=PGDATABASE=$$(kubectl get secret hive-prod-rds-postgres -o json | jq -r '.data."postgresql-database"'| base64 -d) \
--env=PGUSER=$$(kubectl get secret hive-prod-rds-postgres -o json | jq -r '.data."postgresql-username"'| base64 -d) \
--env=PGDATABASE=$$(kubectl get configmap sciety--prod--public-env-vars -o json | jq -r '.data.PGDATABASE') \
--env=PGUSER=$$(kubectl get configmap sciety--prod--public-env-vars -o json | jq -r '.data.PGUSER') \
--env=PGPASSWORD=$$(kubectl get secret hive-prod-rds-postgres -o json | jq -r '.data."postgresql-password"'| base64 -d) \
-- psql

Expand All @@ -161,8 +161,8 @@ download-exploratory-test-from-prod:
--command=true \
--restart=Never \
--env=PGHOST=$$(kubectl get configmap sciety--prod--public-env-vars -o json | jq -r '.data.PGHOST') \
--env=PGDATABASE=$$(kubectl get secret hive-prod-rds-postgres -o json | jq -r '.data."postgresql-database"'| base64 -d) \
--env=PGUSER=$$(kubectl get secret hive-prod-rds-postgres -o json | jq -r '.data."postgresql-username"'| base64 -d) \
--env=PGDATABASE=$$(kubectl get configmap sciety--prod--public-env-vars -o json | jq -r '.data.PGDATABASE') \
--env=PGUSER=$$(kubectl get configmap sciety--prod--public-env-vars -o json | jq -r '.data.PGUSER') \
--env=PGPASSWORD=$$(kubectl get secret hive-prod-rds-postgres -o json | jq -r '.data."postgresql-password"'| base64 -d) \
--env=AWS_ACCESS_KEY_ID=$$(kubectl get secret sciety-events-shipper-aws-credentials -o json | jq -r '.data."id"'| base64 -d) \
--env=AWS_SECRET_ACCESS_KEY=$$(kubectl get secret sciety-events-shipper-aws-credentials -o json | jq -r '.data."secret"'| base64 -d) \
Expand All @@ -179,8 +179,8 @@ download-exploratory-test-from-staging:
--command=true \
--restart=Never \
--env=PGHOST=$$(kubectl get configmap sciety--staging--public-env-vars -o json | jq -r '.data.PGHOST') \
--env=PGDATABASE=$$(kubectl get secret hive-staging-rds-postgres -o json | jq -r '.data."postgresql-database"'| base64 -d) \
--env=PGUSER=$$(kubectl get secret hive-staging-rds-postgres -o json | jq -r '.data."postgresql-username"'| base64 -d) \
--env=PGDATABASE=$$(kubectl get configmap sciety--staging--public-env-vars -o json | jq -r '.data.PGDATABASE') \
--env=PGUSER=$$(kubectl get configmap sciety--staging--public-env-vars -o json | jq -r '.data.PGUSER') \
--env=PGPASSWORD=$$(kubectl get secret hive-staging-rds-postgres -o json | jq -r '.data."postgresql-password"'| base64 -d | sed -e 's/\$$\$$/$$$$$$$$/g') \
--env=AWS_ACCESS_KEY_ID=$$(kubectl get secret sciety-events-shipper-aws-credentials -o json | jq -r '.data."id"'| base64 -d) \
--env=AWS_SECRET_ACCESS_KEY=$$(kubectl get secret sciety-events-shipper-aws-credentials -o json | jq -r '.data."secret"'| base64 -d) \
Expand All @@ -207,8 +207,8 @@ replace-staging-database-with-snapshot-from-prod: download-exploratory-test-from
kubectl run psql \
--image=postgres:12.3 \
--env=PGHOST=$$(kubectl get configmap sciety--staging--public-env-vars -o json | jq -r '.data.PGHOST') \
--env=PGDATABASE=$$(kubectl get secret hive-staging-rds-postgres -o json | jq -r '.data."postgresql-database"'| base64 -d) \
--env=PGUSER=$$(kubectl get secret hive-staging-rds-postgres -o json | jq -r '.data."postgresql-username"'| base64 -d) \
--env=PGDATABASE=$$(kubectl get configmap sciety--staging--public-env-vars -o json | jq -r '.data.PGDATABASE') \
--env=PGUSER=$$(kubectl get configmap sciety--staging--public-env-vars -o json | jq -r '.data.PGUSER') \
--env=PGPASSWORD=$$(kubectl get secret hive-staging-rds-postgres -o json | jq -r '.data."postgresql-password"'| base64 -d | sed -e 's/\$$\$$/$$$$$$$$/g') \
-- sleep 600
kubectl wait --for condition=Ready pod psql
Expand Down
20 changes: 0 additions & 20 deletions helm/sciety/templates/export-events-job.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,11 @@ spec:
name: {{ .Release.Name }}--public-env-vars
optional: true
env:
- name: PGDATABASE
valueFrom:
secretKeyRef:
name: "{{ .Values.postgresqlSecretName }}"
key: postgresql-database
- name: PGUSER
valueFrom:
secretKeyRef:
name: "{{ .Values.postgresqlSecretName }}"
key: postgresql-username
- name: PGPASSWORD
valueFrom:
secretKeyRef:
name: "{{ .Values.postgresqlSecretName }}"
key: postgresql-password
- name: PGHOST
valueFrom:
secretKeyRef:
name: "{{ .Values.postgresqlSecretName }}"
key: postgresql-host
- name: PGPORT
valueFrom:
secretKeyRef:
name: "{{ .Values.postgresqlSecretName }}"
key: postgresql-port
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
Expand Down

0 comments on commit 297fe46

Please sign in to comment.