diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2025-02-26 17:25:03 +0100 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2025-03-05 13:15:16 +0000 |
| commit | dff1965dd5adf0193a9540716fe249adfa7171cd (patch) | |
| tree | 58fcba6e85c0952b6d2a0beb36687c50123e2afe | |
| parent | bebec3acb1ab61ea9a85752b200b44b816e07c67 (diff) | |
syz-cluster/Makefile: fix variable substitution
Only replace the variables we intended to fix.
This should fix the kernel-disk cron.
| -rw-r--r-- | syz-cluster/Makefile | 14 | ||||
| -rw-r--r-- | syz-cluster/kernel-disk/fetch-kernels-cron.yaml | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/syz-cluster/Makefile b/syz-cluster/Makefile index ab5a1c796..823f380f1 100644 --- a/syz-cluster/Makefile +++ b/syz-cluster/Makefile @@ -63,12 +63,10 @@ restart-spanner: build-db-mgmt minikube addons enable cloud-spanner; ./run-local.sh db-mgmt migrate +SUBSTITUTE_VARS := '$$IMAGE_PREFIX $${IMAGE_TAG}' + k8s-config-dev: - @kubectl kustomize ./overlays/minikube/ | IMAGE_PREFIX=${IMAGE_PREFIX} IMAGE_TAG=${IMAGE_TAG} envsubst - -migrate-job.yaml: - @if [ -z "${SPANNER_DATABASE_URI}" ]; then \ - echo "Error: SPANNER_DATABASE_URI must be defined."; \ - exit 1; \ - fi - @cat db-mgmt/migrate-job.yaml | IMAGE_PREFIX=${IMAGE_PREFIX} IMAGE_TAG=${IMAGE_TAG} envsubst + @kubectl kustomize ./overlays/minikube/ | IMAGE_PREFIX=${IMAGE_PREFIX} IMAGE_TAG=${IMAGE_TAG} envsubst ${SUBSTITUTE_VARS} + +migrate-job.yaml: ensure-spanner-database-uri-env + @cat db-mgmt/migrate-job.yaml | IMAGE_PREFIX=${IMAGE_PREFIX} IMAGE_TAG=${IMAGE_TAG} envsubst ${SUBSTITUTE_VARS} diff --git a/syz-cluster/kernel-disk/fetch-kernels-cron.yaml b/syz-cluster/kernel-disk/fetch-kernels-cron.yaml index 85022329d..640bb0f38 100644 --- a/syz-cluster/kernel-disk/fetch-kernels-cron.yaml +++ b/syz-cluster/kernel-disk/fetch-kernels-cron.yaml @@ -15,6 +15,7 @@ spec: podMetadata: labels: tier: workflow + serviceAccountName: argo-executor-ksa templates: - name: main parallelism: 1 |