enable azure

Author: vomba

.github/workflows/build-azure-capi-image.yml

@@ -26,10 +26,12 @@ on:
 env:
   version: ${{ inputs.version }}
   tag: ${{ inputs.tag }}
+  docker_image: "ghcr.io/elastisys/image-builder-amd64:Automate-production-of-CAPI-VM-images-09c9dac9dc61dc069b72ac55e654cbe1a9190911"
 
 defaults:
   run:
     working-directory: ./images/capi
+    shell: bash
 
 jobs:
   build-image:
@@ -38,42 +40,37 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v5
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.config/packer/plugins
-          key: packer-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/*.pkr.hcl') }}
-
       - name: replace variables
         run: |
           package="${version}-1.1"
           series="${version%.*}"
-         
+
           sed -r \
             -e "s/\\\$KUBERNETES_SERIES/${series}/" \
             -e "s/\\\$KUBERNETES_VERSION/${version}/" \
             -e "s/\\\$KUBERNETES_DEB_VERSION/${package}/" \
             -e "s/\\\$IMAGE_TAG/${tag}/" \
             <"template.json" >"kubernetes.json"
 
-      - name: install dependencies for azure
-        run: make deps-azure
-
       - name: build azure image
         run: |
-          az login --service-principal -u "${AZURE_CLIENT_ID}" -p "${AZURE_CLIENT_SECRET}" --tenant "${AZURE_TENANT_ID}"
-
           image_name="ubuntu-2404-kube-${version%%-*}-ck8s-capi-${tag}"
 
           export SIG_IMAGE_DEFINITION="${image_name}"
           export SIG_PUBLISHER="elastisys"
           export SIG_OFFER="ck8s-capi"
           export SIG_SKU="${image_name}"
 
-          
-          make build-azure-sig-ubuntu-2404-gen2
+          docker run -i --rm \
+          -e PACKER_VAR_FILES -e PACKER_GITHUB_API_TOKEN=${{ secrets.GITHUB_TOKEN }} \
+          -e SIG_IMAGE_DEFINITION -e SIG_PUBLISHER -e SIG_OFFER -e SIG_SKU \
+          -e AZURE_SUBSCRIPTION_ID -e AZURE_CLIENT_ID -e AZURE_CLIENT_SECRET -e AZURE_TENANT_ID -e AZURE_LOCATION \
+          -e RESOURCE_GROUP_NAME -e GALLERY_NAME -e BUILD_RESOURCE_GROUP_NAME \
+          -v ${{ github.workspace }}/images/capi:/tmp/host \
+          ${{ env.docker_image }} build-azure-sig-ubuntu-2404-gen2
+
         env:
-          PACKER_VAR_FILES: kubernetes.json
+          PACKER_VAR_FILES: /tmp/host/kubernetes.json
           AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID}}
           AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
           AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
@@ -82,5 +79,3 @@ jobs:
           RESOURCE_GROUP_NAME: ${{ secrets.RESOURCE_GROUP_NAME }}
           GALLERY_NAME: ${{ secrets.GALLERY_NAME }}
           BUILD_RESOURCE_GROUP_NAME: ${{ secrets.RESOURCE_GROUP_NAME }}
-       
-      

.github/workflows/build-capi-vm-images.yml

@@ -22,12 +22,12 @@ env:
 
 
 jobs:
-  # build-azure-image:
-  #   uses: ./.github/workflows/build-azure-capi-image.yml
-  #   with:
-  #     version: ${{ inputs.version || '1.33.1' }}
-  #     tag: ${{ inputs.tag || '0.8' }}
-  #   secrets: inherit
+  build-azure-image:
+    uses: ./.github/workflows/build-azure-capi-image.yml
+    with:
+      version: ${{ inputs.version || '1.33.1' }}
+      tag: ${{ inputs.tag || '0.8' }}
+    secrets: inherit
   build-openstack-image:
     uses: ./.github/workflows/build-openstack-capi-image.yml
     with:

.github/workflows/build-openstack-capi-image.yml

@@ -69,8 +69,6 @@ jobs:
            -e PACKER_VAR_FILES=/tmp/host/kubernetes.json -e PACKER_LOG -e PACKER_GITHUB_API_TOKEN=${{ secrets.GITHUB_TOKEN }} \
            -v ${{ github.workspace }}/images/capi:/tmp/host -v ${{ github.workspace }}/output:/home/imagebuilder/output:rw \
            ${{ env.docker_image }} build-qemu-ubuntu-2404-efi
-        env:
-          PACKER_LOG: 1
 
       - name: store openstack image
         uses: actions/upload-artifact@v4