From 7a57a5c1471069ac49313e4ebc189d2fb6709d5a Mon Sep 17 00:00:00 2001 From: jmxnzo Date: Thu, 9 Jan 2025 15:10:58 +0100 Subject: [PATCH] cryptsetup: remove references to image --- .github/workflows/e2e.yml | 2 +- .github/workflows/e2e_aks_runtime.yml | 2 +- .github/workflows/release.yml | 4 ---- justfile | 7 ++----- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index d3f906e2a1..066e37abc5 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -70,7 +70,7 @@ jobs: echo "SYNC_FIFO_UUID=$sync_uuid" | tee -a "$GITHUB_ENV" - name: Build and prepare deployments run: | - just coordinator initializer port-forwarder openssl cryptsetup service-mesh-proxy node-installer ${{ inputs.platform }} + just coordinator initializer port-forwarder openssl service-mesh-proxy node-installer ${{ inputs.platform }} - name: E2E Test run: | nix build .#scripts.get-logs diff --git a/.github/workflows/e2e_aks_runtime.yml b/.github/workflows/e2e_aks_runtime.yml index 0f383ba657..e3d9d86cbb 100644 --- a/.github/workflows/e2e_aks_runtime.yml +++ b/.github/workflows/e2e_aks_runtime.yml @@ -54,7 +54,7 @@ jobs: echo "SYNC_FIFO_UUID=$sync_uuid" | tee -a "$GITHUB_ENV" - name: Build and prepare deployments run: | - nix shell .#just --command just coordinator initializer port-forwarder openssl cryptsetup service-mesh-proxy node-installer + nix shell .#just --command just coordinator initializer port-forwarder openssl service-mesh-proxy node-installer # steps taken from https://learn.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt#option-2-step-by-step-installation-instructions - name: Install `az` with extensions run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 48b9e56ff6..d39c48898e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -252,7 +252,6 @@ jobs: tardevSnapshotterImg=$(nix run .#containers.push-tardev-snapshotter -- "$container_registry/contrast/tardev-snapshotter") nydusSnapshotterImg=$(nix run .#containers.push-nydus-snapshotter -- "$container_registry/contrast/nydus-snapshotter") nydusPullImg=$(nix run .#containers.push-nydus-pull -- "$container_registry/contrast/nydus-pull") - cryptsetupImg=$(nix run .#containers.push-cryptsetup -- "$container_registry/contrast/cryptsetup") echo "coordinatorImg=$coordinatorImg" | tee -a "$GITHUB_ENV" echo "nodeInstallerMsftImg=$nodeInstallerMsftImg" | tee -a "$GITHUB_ENV" echo "nodeInstallerKataImg=$nodeInstallerKataImg" | tee -a "$GITHUB_ENV" @@ -261,7 +260,6 @@ jobs: echo "tardevSnapshotterImg=$tardevSnapshotterImg" | tee -a "$GITHUB_ENV" echo "nydusSnapshotterImg=$nydusSnapshotterImg" | tee -a "$GITHUB_ENV" echo "nydusPullImg=$nydusPullImg" | tee -a "$GITHUB_ENV" - echo "cryptsetupImg=$cryptsetupImg" | tee -a "$GITHUB_ENV" - name: Add tag to Coordinator image run: | tag() { @@ -275,7 +273,6 @@ jobs: echo "initializerImgTagged=$(tag "$initializerImg")" | tee -a "$GITHUB_ENV" echo "serviceMeshImgTagged=$(tag "$serviceMeshImg")" | tee -a "$GITHUB_ENV" echo "nydusPullImgTagged=$(tag "$nydusPullImg")" | tee -a "$GITHUB_ENV" - echo "cryptsetupImgTagged=$(tag "$cryptsetupImg")" | tee -a "$GITHUB_ENV" tardevVer=$(nix eval --impure --raw --expr "(builtins.getFlake \"git+file://$(pwd)?shallow=1\").outputs.legacyPackages.x86_64-linux.microsoft.tardev-snapshotter.version") front=${tardevSnapshotterImg%@*} @@ -297,7 +294,6 @@ jobs: echo "ghcr.io/edgelesssys/contrast/tardev-snapshotter:latest=$tardevSnapshotterImgTagged" echo "ghcr.io/edgelesssys/contrast/nydus-snapshotter:latest=$nydusSnapshotterImgTagged" echo "ghcr.io/edgelesssys/contrast/nydus-pull:latest=$nydusPullImgTagged" - echo "ghcr.io/edgelesssys/contrast/cryptsetup:latest=$cryptsetupImgTagged" } > image-replacements.txt - name: Upload image replacements file (for main branch PR) uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 diff --git a/justfile b/justfile index 8967e67b3e..10c20f13ef 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 cryptsetup port-forwarder service-mesh-proxy (node-installer platform) (deploy target cli platform) 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) (deploy target cli platform) set verify (wait-for-workload target) # Build and push a container image. push target: @@ -15,9 +15,6 @@ coordinator: (push "coordinator") # Build the openssl container and push it. openssl: (push "openssl") -# Build the cryptsetup container and push it. -cryptsetup: (push "cryptsetup") - # Build the port-forwarder container and push it. port-forwarder: (push "port-forwarder") @@ -66,7 +63,7 @@ node-installer platform=default_platform: ;; esac -e2e target=default_deploy_target platform=default_platform: soft-clean coordinator initializer cryptsetup openssl port-forwarder service-mesh-proxy (node-installer platform) +e2e target=default_deploy_target platform=default_platform: soft-clean coordinator initializer openssl port-forwarder service-mesh-proxy (node-installer platform) #!/usr/bin/env bash set -euo pipefail if [[ "{{ target }}" == "aks-runtime" ]]; then