Merge pull request #93 from packethost/tagged-image

ensure assets are released

Author: gianarb

.github/workflows/ci.yaml

@@ -4,7 +4,7 @@ on:
    types: [opened, synchronize, reopened]
  push:
    branches:
-     - master
+   - master
 
 jobs:
   report:
@@ -15,7 +15,7 @@ jobs:
       run: echo ${{ github.ref }}
     - name: event_name
       run: echo ${{ github.event_name }}
-  build:
+  build-test-deploy-release:
     name: Build
     runs-on: ubuntu-latest
     steps:
@@ -45,12 +45,12 @@ jobs:
       run: make image-all KUBEBUILDER_DIR=${KUBEBUILDER_DIR}
       env:
         KUBEBUILDER_ASSETS: ${{ env.KUBEBUILDER_DIR }}/bin
-    - name: hub login
-      if: (github.event_name == 'push' && endsWith(github.ref,'/master')) || (github.event_name == 'create' && startsWith(github.ref,'refs/tags/'))
+
+    # these next steps are used for merge to master (push the images)
+    # they really should be separate workflows or jobs, but github actions is awful about sharing between them, so it must be one job
+    - name: docker login
+      if: github.event_name == 'push' && endsWith(github.ref,'/master')
       run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
     - name: deploy   # when merged into master, tag master and push - ideally, this would be a separate job, but you cannot share docker build cache between jobs
       if: github.event_name == 'push' && endsWith(github.ref,'/master')
       run: make cd CONFIRM=true BRANCH_NAME=master
-    - name: release  # when based on a tag, tag master and push - ideally, this would be a separate job, but you cannot share docker build cache between jobs
-      if: github.event_name == 'create' && startsWith(github.ref,'refs/tags/')
-      run: make release CONFIRM=true

.github/workflows/release.yaml

@@ -1,3 +1,5 @@
+# workflow to release assets as part of the release
+
 on:
   push:
     tags:
@@ -6,8 +8,29 @@ on:
 name: Upload Release Asset
 
 jobs:
-  build:
+  readiness:
+    name: check for appropriate image
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set version and imagename
+      id: get_version
+      run: | 
+        echo ::set-env name=VERSION::${GITHUB_REF/refs\/tags\//}
+        echo ::set-env name=IMAGENAME::packethost/cluster-api-provider-packet
+        echo ::set-env name=COMMIT::${GITHUB_SHA}
+    - name: information
+      run: echo "checking for existence of image ${IMAGENAME}:${COMMIT}. If it does not exist, this will fail; wait for an earlier PR merge action to complete and re-run this job."
+    - name: docker login
+      run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+    - name: check for docker image on hub
+      run: docker buildx imagetools inspect ${IMAGENAME}:${COMMIT}
+    - name: report
+      run: ready for release; the docker image ${IMAGENAME}:${COMMIT} is available
+
+  release:
     name: Upload Release Asset
+    needs:
+    - readiness
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -74,3 +97,27 @@ jobs:
           asset_path: out/release/infrastructure-packet/${{ env.VERSION }}/metadata.yaml
           asset_name: metadata.yaml
           asset_content_type: application/yaml
+
+  images:
+    runs-on: ubuntu-latest
+    needs:
+    - readiness
+    steps:
+    - name: docker login
+      run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+    - name: Set version and imagename
+      id: get_version
+      run: | 
+        echo ::set-env name=VERSION::${GITHUB_REF/refs\/tags\//}
+        echo ::set-env name=IMAGENAME::packethost/cluster-api-provider-packet
+        echo ::set-env name=COMMIT::${GITHUB_SHA}
+    - name: get-image
+      run: docker image pull ${IMAGENAME}:${COMMIT}
+    - name: release-latest
+      run: | 
+        docker tag ${IMAGENAME}:${COMMIT} ${IMAGENAME}:latest
+        docker push ${IMAGENAME}:latest
+    - name: release-semver
+      run: | 
+        docker tag ${IMAGENAME}:${COMMIT} ${IMAGENAME}:${VERSION}
+        docker push ${IMAGENAME}:${VERSION}

Makefile

@@ -1,6 +1,6 @@
 .PHONY: vendor test manager clusterctl run install deploy crds generate fmt vet run kubebuilder ci cd
 
-GIT_VERSION ?= $(shell git log -1 --format="%h")
+GIT_VERSION ?= $(shell git log -1 --format="%H")
 RELEASE_TAG := $(shell git describe --abbrev=0 --tags ${TAG_COMMIT} 2>/dev/null || true)
 RELEASE_VERSION ?= $(shell cat VERSION)