Skip to content

Commit 1f72c40

Browse files
committed
syz-cluster: fix migrate.job.yaml for local deployments
Use env from the global k8s configmap instead of requiring the user to pass the parameters explicitly. Set the missing labels that denied access from db-mgmt ot the Spanner emulator.
1 parent f91459f commit 1f72c40

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

syz-cluster/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ k8s-config-dev:
9797
k8s-config-gke: ensure-spanner-database-uri-env ensure-blob-storage-env ensure-workflow-artifacts-bucket
9898
@kubectl kustomize ./overlays/gke/ | sed $(SED_EXPRESSIONS)
9999

100-
migrate-job.yaml: ensure-spanner-database-uri-env
100+
migrate-job.yaml:
101101
@cat db-mgmt/migrate-job.yaml | sed $(SED_EXPRESSIONS)
102102

103103
fetch-kernels-once.yaml:

syz-cluster/db-mgmt/migrate-job.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@ spec:
99
ttlSecondsAfterFinished: 86400
1010
backoffLimit: 0
1111
template:
12+
metadata:
13+
labels:
14+
app: db-mgmt
1215
spec:
1316
serviceAccountName: gke-db-admin-ksa
1417
containers:
1518
- name: migrate
1619
image: ${IMAGE_PREFIX}db-mgmt:${IMAGE_TAG}
17-
env:
18-
- name: SPANNER_DATABASE_URI
19-
value: "${SPANNER_DATABASE_URI}"
20+
imagePullPolicy: IfNotPresent
21+
envFrom:
22+
- configMapRef:
23+
name: global-config-env
2024
args: ["migrate"]
2125
restartPolicy: Never

0 commit comments

Comments
 (0)