From 72a678f4d948cd26003e29dc2d40805bea39b19f Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:30:53 +0200 Subject: [PATCH] justfile: supply platform when generating deployment --- justfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/justfile b/justfile index f4cfba89b0..586d0525cb 100644 --- a/justfile +++ b/justfile @@ -1,5 +1,5 @@ # Undeploy, rebuild, deploy. -default target=default_deploy_target platform=default_platform cli=default_cli: soft-clean coordinator initializer openssl port-forwarder service-mesh-proxy (node-installer platform) (runtime platform) (apply "runtime") (deploy target cli) set verify (wait-for-workload target) +default target=default_deploy_target platform=default_platform cli=default_cli: soft-clean coordinator initializer openssl port-forwarder service-mesh-proxy (node-installer platform) (runtime platform) (apply "runtime") (deploy target cli platform) set verify (wait-for-workload target) # Build and push a container image. push target: @@ -57,7 +57,7 @@ e2e target=default_deploy_target: soft-clean coordinator initializer openssl por --skip-undeploy=true # Generate policies, apply Kubernetes manifests. -deploy target=default_deploy_target cli=default_cli: (populate target) (generate cli) (apply target) +deploy target=default_deploy_target cli=default_cli platform=default_platform: (populate target) (generate cli platform) (apply target) # Populate the workspace with a runtime class deployment runtime platform=default_platform: @@ -69,24 +69,24 @@ runtime platform=default_platform: runtime > ./{{ workspace_dir }}/runtime/runtime.yml # Populate the workspace with a Kubernetes deployment -populate target=default_deploy_target: +populate target=default_deploy_target platform=default_platform: #!/usr/bin/env bash set -euo pipefail mkdir -p ./{{ workspace_dir }} mkdir -p ./{{ workspace_dir }}/deployment nix shell .#contrast --command resourcegen \ --image-replacements ./{{ workspace_dir }}/just.containerlookup --namespace {{ target }}${namespace_suffix-} \ - --add-namespace-object --add-port-forwarders \ + --add-namespace-object --add-port-forwarders --platform {{ platform }} \ {{ target }} coordinator > ./{{ workspace_dir }}/deployment/deployment.yml echo "{{ target }}${namespace_suffix-}" > ./{{ workspace_dir }}/just.namespace # Generate policies, update manifest. -generate cli=default_cli: +generate cli=default_cli platform=default_platform: #!/usr/bin/env bash nix run .#{{ cli }} -- generate \ --workspace-dir ./{{ workspace_dir }} \ --image-replacements ./{{ workspace_dir }}/just.containerlookup \ - --reference-values aks-clh-snp \ + --reference-values {{ platform }}\ ./{{ workspace_dir }}/deployment/*.yml # Apply Kubernetes manifests from /deployment