From 772c37d1a4858cfd19f5b4ed35e6395c1123a05a Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Fri, 29 Apr 2022 13:46:07 +0200 Subject: [PATCH] remove pinned (stale) coordinator binary from CoreOS Makefile Signed-off-by: Malte Poll --- .github/workflows/build-coreos.yml | 2 +- image/Makefile | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-coreos.yml b/.github/workflows/build-coreos.yml index c61167ddb..ef6e22fb5 100644 --- a/.github/workflows/build-coreos.yml +++ b/.github/workflows/build-coreos.yml @@ -104,6 +104,6 @@ jobs: - name: "Build and Upload" run: > make -j$(nproc) CONTAINER_ENGINE=docker NETRC=/tmp/.netrc GCP_IMAGE_NAME="${{ env.IMAGE_TIMESTAMP }}" AZURE_IMAGE_NAME="${{ env.IMAGE_TIMESTAMP }}" - AZURE_IMAGE_DEFINITION="constellation-coreos" AZURE_IMAGE_VERSION="${{env.IMAGE_VERSION }}" COORDINATOR_URL="https://${{ secrets.PUBLIC_BUCKET_NAME }}.s3.us-east-2.amazonaws.com/coordinator/${{ inputs.coordinator-name }}${{ github.event.inputs.coordinator-name }}" + AZURE_IMAGE_DEFINITION="constellation-coreos" AZURE_IMAGE_VERSION="${{env.IMAGE_VERSION }}" DOWNLOAD_COORDINATOR=y COORDINATOR_URL="https://${{ secrets.PUBLIC_BUCKET_NAME }}.s3.us-east-2.amazonaws.com/coordinator/${{ inputs.coordinator-name }}${{ github.event.inputs.coordinator-name }}" image-gcp image-azure upload-gcp upload-azure working-directory: ${{ env.working-directory }} diff --git a/image/Makefile b/image/Makefile index 23a51b19b..7d5a81f48 100644 --- a/image/Makefile +++ b/image/Makefile @@ -14,9 +14,8 @@ OVERRIDE_KERNEL ?= n KERNEL_RPM_URL ?= "https://kojipkgs.fedoraproject.org/packages/kernel/5.17.0/0.rc3.89.fc36/x86_64/kernel-5.17.0-0.rc3.89.fc36.x86_64.rpm" KERNEL_CORE_RPM_URL ?= "https://kojipkgs.fedoraproject.org/packages/kernel/5.17.0/0.rc3.89.fc36/x86_64/kernel-core-5.17.0-0.rc3.89.fc36.x86_64.rpm" KERNEL_MODULES_RPM_URL ?= "https://kojipkgs.fedoraproject.org/packages/kernel/5.17.0/0.rc3.89.fc36/x86_64/kernel-modules-5.17.0-0.rc3.89.fc36.x86_64.rpm" -DOWNLOAD_COORDINATOR ?= y -COORDINATOR_BINARY ?= $(DEPENDENCIES)/coordinator -COORDINATOR_URL ?= "https://public-edgeless-constellation.s3.us-east-2.amazonaws.com/coordinator/coordinator-090232f06302957f47ab86207bd96f413eda07d9534afc12524a97363b7d203d863d52cbb1780fb76c6874df6df0387f89021b3140d5769d6a8aec1739515a66" +DOWNLOAD_COORDINATOR ?= n +COORDINATOR_BINARY ?= $(BASE_PATH)/../build/coordinator CILIUM_CLI_BINARY ?= $(DEPENDENCIES)/cilium CILIUM_CLI_URL ?= "https://github.com/cilium/cilium-cli/releases/download/v0.11.1/cilium-linux-amd64.tar.gz" DISK_MAPPER_BINARY ?= $(BASE_PATH)/../build/disk-mapper