✨ Add support for kube-vip

.github/actions/metadata/action.yaml

@@ -0,0 +1,46 @@
+name: 'Metadata'
+description: 'Generate Image Metadata'
+inputs:
+  docker_username:
+    description: 'docker_username'
+    required: true
+  quay_username:
+    description: 'quay_username'
+    required: true
+  metadata_flavor:
+    description: 'metadata_flavor'
+    required: true
+  metadata_tags:
+    description: 'metadata_tags'
+    required: true
+outputs:
+  tags:
+    description: "generated image tags"
+    value: ${{ steps.meta.outputs.tags }}
+  labels:
+    description: "generated image labels"
+    value: ${{ steps.meta.outputs.labels }}
+  version:
+    description: "generated image version"
+    value: ${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+runs:
+  using: "composite"
+  steps:
+  - name: Build image urls
+    shell: bash
+    id: image-urls
+    env:
+      DOCKER_USERNAME: ${{ inputs.docker_username }}
+      QUAY_USERNAME: ${{ inputs.quay_username }}
+    run: |
+      IMAGES=${GHCR_REGISTRY}/${IMAGE_NAME}
+      [[ -n "$DOCKER_USERNAME" ]] && IMAGES=${IMAGES},${DOCKER_REGISTRY}/${IMAGE_NAME}
+      [[ -n "$QUAY_USERNAME" ]] && IMAGES=${IMAGES},${QUAY_REGISTRY}/${IMAGE_NAME}
+      echo "::set-output name=images::${IMAGES}"
+  - name: Docker manager metadata
+    id: meta
+    uses: docker/metadata-action@v3
+    with:
+      images: ${{ steps.image-urls.outputs.images }}
+      flavor: ${{ inputs.metadata_flavor }}
+      tags: ${{ inputs.metadata_tags }}

.github/workflows/ci.yaml

@@ -3,12 +3,17 @@ on:
   push:
     branches:
     - main
-    - capi-v1 # TODO: Used for testing my fork, remove prior to merge
   schedule:
     - cron: "0 */4 * * *" # TODO: Run every 4 hours to soak test, should be less frequent before merge (weekly/daily/???)
 env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
+  IMAGE_NAME: cluster-api-provider-packet
+  GHCR_REGISTRY: ghcr.io/${{ github.repository_owner }}
+  DOCKER_REGISTRY: ${{ secrets.DOCKER_ORG }}
+  QUAY_REGISTRY: quay.io/${{ secrets.QUAY_ORG }}
+  REGISTRY: quay.io/${{ secrets.QUAY_ORG }}
+  metadata_flavor: latest=false
+  metadata_tags: type=sha
+
 jobs:
   validate:
     name: "Validate ${{ matrix.target }}"
@@ -38,10 +43,12 @@ jobs:
           ${{ runner.os }}-tmp-
     - name: ${{ matrix.target }}
       run: make ${{ matrix.target }}
+
   manager-image:
     name: Build and push manager image
     runs-on: ubuntu-latest
-    needs: [validate]
+    needs:
+    - validate
     steps:
     - name: checkout
       uses: actions/checkout@v3
@@ -50,19 +57,42 @@ jobs:
       uses: docker/setup-qemu-action@v1
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
-    - name: Docker manager metadata
+
+    - name: Generate metadata
       id: meta
-      uses: docker/metadata-action@v3
+      uses: ./.github/actions/metadata
       with:
-        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-        tags: |
-          type=sha
-    - name: Log in to the Container registry
+        docker_username: ${{ secrets.DOCKER_USERNAME }}
+        quay_username: ${{ secrets.QUAY_USERNAME }}
+        metadata_flavor: ${{ env.metadata_flavor }}
+        metadata_tags: ${{ env.metadata_tags }}
+
+    - name: Log in to ghcr.io
       uses: docker/login-action@v1
       with:
-        registry: ${{ env.REGISTRY }}
+        registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Log into DockerHub
+      uses: docker/login-action@v1
+      env:
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      if: ${{ env.DOCKER_USERNAME != '' }}
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Log into quay.io
+      uses: docker/login-action@v1
+      env:
+        QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
+      if: ${{ env.QUAY_USERNAME != '' }}
+      with:
+        registry: quay.io
+        username: ${{ secrets.QUAY_USERNAME }}
+        password: ${{ secrets.QUAY_PASSWORD }}
+
     - name: Build and push manager image
       uses: docker/build-push-action@v2
       with:
@@ -73,10 +103,12 @@ jobs:
         platforms: linux/amd64,linux/arm64
         cache-from: type=gha, scope=${{ github.workflow }}
         cache-to: type=gha, mode=max, scope=${{ github.workflow }}
+
   test-release:
     name: Test Release
     runs-on: ubuntu-latest
-    needs: [validate]
+    needs:
+    - validate
     steps:
     - name: checkout
       uses: actions/checkout@v3
@@ -88,22 +120,26 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-tools-bin-release-
           ${{ runner.os }}-tools-bin-
-    - name: Docker manager metadata
+
+    - name: Generate metadata
       id: meta
-      uses: docker/metadata-action@v3
+      uses: ./.github/actions/metadata
       with:
-        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-        tags: |
-          type=sha
+        docker_username: ${{ secrets.DOCKER_USERNAME }}
+        quay_username: ${{ secrets.QUAY_USERNAME }}
+        metadata_flavor: ${{ env.metadata_flavor }}
+        metadata_tags: ${{ env.metadata_tags }}
+
     - name: Test Release
       env:
-        TAG: ${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+        TAG: ${{ steps.meta.outputs.version }}
       run: make release
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: test-release
         path: out/release
+
   e2e-quickstart:
     name: "E2E quickstart"
     concurrency: ci-${{ github.ref }}-e2e-quickstart
@@ -127,13 +163,23 @@ jobs:
       with:
         name: test-release
         path: out/release
-    - name: Set TAG env variable
-      run: |
-        echo "TAG=sha-${GITHUB_SHA::7}" >> $GITHUB_ENV
+
+    - name: Generate metadata
+      id: meta
+      uses: ./.github/actions/metadata
+      with:
+        docker_username: ${{ secrets.DOCKER_USERNAME }}
+        quay_username: ${{ secrets.QUAY_USERNAME }}
+        metadata_flavor: ${{ env.metadata_flavor }}
+        metadata_tags: ${{ env.metadata_tags }}
+
     - name: Prepull the pre-built image
       run: docker pull ${REGISTRY}/${IMAGE_NAME}:${TAG}
+      env:
+        TAG: ${{ steps.meta.outputs.version }}
     - name: "e2e-quickstart"
       env:
+        TAG: ${{ steps.meta.outputs.version }}
         PACKET_API_KEY: ${{ secrets.PACKET_API_TOKEN }}
         PROJECT_ID: ${{ secrets.PROJECT_ID }}
         E2E_CONF_FILE_SOURCE: "${{ github.workspace }}/test/e2e/config/packet-ci-actions.yaml"
@@ -173,13 +219,23 @@ jobs:
       with:
         name: test-release
         path: out/release
-    - name: Set TAG env variable
-      run: |
-        echo "TAG=sha-${GITHUB_SHA::7}" >> $GITHUB_ENV
+
+    - name: Generate metadata
+      id: meta
+      uses: ./.github/actions/metadata
+      with:
+        docker_username: ${{ secrets.DOCKER_USERNAME }}
+        quay_username: ${{ secrets.QUAY_USERNAME }}
+        metadata_flavor: ${{ env.metadata_flavor }}
+        metadata_tags: ${{ env.metadata_tags }}
+
     - name: Prepull the pre-built image
       run: docker pull ${REGISTRY}/${IMAGE_NAME}:${TAG}
+      env:
+        TAG: ${{ steps.meta.outputs.version }}
     - name: "e2e"
       env:
+        TAG: ${{ steps.meta.outputs.version }}
         PACKET_API_KEY: ${{ secrets.PACKET_API_TOKEN }}
         PROJECT_ID: ${{ secrets.PROJECT_ID }}
         E2E_CONF_FILE_SOURCE: "${{ github.workspace }}/test/e2e/config/packet-ci-actions.yaml"
@@ -219,13 +275,23 @@ jobs:
       with:
         name: test-release
         path: out/release
-    - name: Set TAG env variable
-      run: |
-        echo "TAG=sha-${GITHUB_SHA::7}" >> $GITHUB_ENV
+
+    - name: Generate metadata
+      id: meta
+      uses: ./.github/actions/metadata
+      with:
+        docker_username: ${{ secrets.DOCKER_USERNAME }}
+        quay_username: ${{ secrets.QUAY_USERNAME }}
+        metadata_flavor: ${{ env.metadata_flavor }}
+        metadata_tags: ${{ env.metadata_tags }}
+
     - name: Prepull the pre-built image
       run: docker pull ${REGISTRY}/${IMAGE_NAME}:${TAG}
+      env:
+        TAG: ${{ steps.meta.outputs.version }}
     - name: "e2e-conformance"
       env:
+        TAG: ${{ steps.meta.outputs.version }}
         PACKET_API_KEY: ${{ secrets.PACKET_API_TOKEN }}
         PROJECT_ID: ${{ secrets.PROJECT_ID }}
         E2E_CONF_FILE_SOURCE: "${{ github.workspace }}/test/e2e/config/packet-ci-actions.yaml"
@@ -265,13 +331,23 @@ jobs:
       with:
         name: test-release
         path: out/release
-    - name: Set TAG env variable
-      run: |
-        echo "TAG=sha-${GITHUB_SHA::7}" >> $GITHUB_ENV
+
+    - name: Generate metadata
+      id: meta
+      uses: ./.github/actions/metadata
+      with:
+        docker_username: ${{ secrets.DOCKER_USERNAME }}
+        quay_username: ${{ secrets.QUAY_USERNAME }}
+        metadata_flavor: ${{ env.metadata_flavor }}
+        metadata_tags: ${{ env.metadata_tags }}
+
     - name: Prepull the pre-built image
       run: docker pull ${REGISTRY}/${IMAGE_NAME}:${TAG}
+      env:
+        TAG: ${{ steps.meta.outputs.version }}
     - name: "e2e-management-upgrade"
       env:
+        TAG: ${{ steps.meta.outputs.version }}
         PACKET_API_KEY: ${{ secrets.PACKET_API_TOKEN }}
         PROJECT_ID: ${{ secrets.PROJECT_ID }}
         E2E_CONF_FILE_SOURCE: "${{ github.workspace }}/test/e2e/config/packet-ci-actions.yaml"
@@ -311,13 +387,23 @@ jobs:
       with:
         name: test-release
         path: out/release
-    - name: Set TAG env variable
-      run: |
-        echo "TAG=sha-${GITHUB_SHA::7}" >> $GITHUB_ENV
+
+    - name: Generate metadata
+      id: meta
+      uses: ./.github/actions/metadata
+      with:
+        docker_username: ${{ secrets.DOCKER_USERNAME }}
+        quay_username: ${{ secrets.QUAY_USERNAME }}
+        metadata_flavor: ${{ env.metadata_flavor }}
+        metadata_tags: ${{ env.metadata_tags }}
+
     - name: Prepull the pre-built image
       run: docker pull ${REGISTRY}/${IMAGE_NAME}:${TAG}
+      env:
+        TAG: ${{ steps.meta.outputs.version }}
     - name: "e2e-workload-upgrade"
       env:
+        TAG: ${{ steps.meta.outputs.version }}
         PACKET_API_KEY: ${{ secrets.PACKET_API_TOKEN }}
         PROJECT_ID: ${{ secrets.PROJECT_ID }}
         E2E_CONF_FILE_SOURCE: "${{ github.workspace }}/test/e2e/config/packet-ci-actions.yaml"

.github/workflows/pr.yaml

@@ -2,9 +2,6 @@ name: Pull Request Validation
 on:
  pull_request:
    types: [opened, synchronize, reopened]
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
 jobs:
   validate:
     name: "Validate ${{ matrix.target }}"