From 673cc480265c91f5214e09f1e042ab3a4c85a8ec Mon Sep 17 00:00:00 2001 From: Peter Deme Date: Mon, 16 Sep 2024 12:59:37 +0200 Subject: [PATCH] feat(azure): publish to community gallery (#62) Signed-off-by: peterdeme --- .github/workflows/build_gcp_azure_manual.yml | 6 +++--- .github/workflows/ci.yml | 4 ++-- azure.pkr.hcl | 18 +++++++----------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_gcp_azure_manual.yml b/.github/workflows/build_gcp_azure_manual.yml index 8746b90..cf20c4b 100644 --- a/.github/workflows/build_gcp_azure_manual.yml +++ b/.github/workflows/build_gcp_azure_manual.yml @@ -26,8 +26,8 @@ jobs: PKR_VAR_image_resource_group: rg-worker_images-public-westeurope PKR_VAR_packer_work_group: rg-worker_images_packer-public-westeurope PKR_VAR_gallery_resource_group: rg-worker_images-public-westeurope - PKR_VAR_gallery_name: worker_images_public - PKR_VAR_gallery_image_name: ubuntu_20_04 + PKR_VAR_gallery_name: spacelift_worker_images_public + PKR_VAR_gallery_image_name: spacelift_worker_image PKR_VAR_gallery_replication_regions: '["westeurope"]' PKR_VAR_gallery_image_version: 1.0.${{ github.run_number }} @@ -53,7 +53,7 @@ jobs: - name: Authenticate with GCP if: matrix.cloud == 'gcp' - uses: google-github-actions/auth@v1 + uses: google-github-actions/auth@v2 with: credentials_json: ${{ secrets.GCP_CREDENTIALS_JSON }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 416f589..a31155c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,8 +33,8 @@ jobs: PKR_VAR_image_resource_group: rg-worker_images-public-westeurope PKR_VAR_packer_work_group: rg-worker_images_packer-public-westeurope PKR_VAR_gallery_resource_group: rg-worker_images-public-westeurope - PKR_VAR_gallery_name: worker_images_public - PKR_VAR_gallery_image_name: ubuntu_20_04 + PKR_VAR_gallery_name: spacelift_worker_images_public + PKR_VAR_gallery_image_name: spacelift_worker_image PKR_VAR_gallery_replication_regions: '["westeurope"]' PKR_VAR_gallery_image_version: 1.0.${{ github.run_number }} diff --git a/azure.pkr.hcl b/azure.pkr.hcl index 5c6a5da..491c650 100644 --- a/azure.pkr.hcl +++ b/azure.pkr.hcl @@ -47,7 +47,6 @@ variable "gallery_resource_group" { variable "gallery_name" { type = string - default = null } variable "gallery_image_name" { @@ -111,16 +110,13 @@ source "azure-arm" "spacelift" { managed_image_name = var.image_name managed_image_resource_group_name = var.image_resource_group - dynamic "shared_image_gallery_destination" { - for_each = var.gallery_name != null ? [0] : [] - content { - subscription = var.subscription_id - resource_group = var.gallery_resource_group - gallery_name = var.gallery_name - image_name = var.gallery_image_name - image_version = var.gallery_image_version - replication_regions = var.gallery_replication_regions - } + shared_image_gallery_destination { + subscription = var.subscription_id + resource_group = var.gallery_resource_group + gallery_name = var.gallery_name + image_name = var.gallery_image_name + image_version = var.gallery_image_version + replication_regions = var.gallery_replication_regions } os_type = "Linux"