Tagging for Releases/Latest/Master (#56)

* tagging master, adding release tagging, currently fork * removed fork * changed job name to release * changed trigger to use release * removed latest conditionals Co-authored-by: Derek Wasinger <[email protected]>
rht-labs · Apr 29, 2020 · cb54402 · cb54402
1 parent b076da0
commit cb54402
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -36,3 +36,4 @@ jobs:
         image_push_registry: quay.io
         image_push_username: ${{ secrets.QUAY_USERNAME }}
         image_push_password: ${{ secrets.QUAY_PASSWORD }}
+        image_tags: master
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,31 @@
+name: Add Tags to Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: get the release version
+      id: get_version
+      run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+    - name: tag with release version
+      uses: tinact/[email protected]
+      with:
+        image_name: rht-labs/omp-backend
+        image_old_tag: ${{ github.sha }}
+        image_new_tag: ${{ steps.get_version.outputs.VERSION }}
+        registry: quay.io
+        registry_username: ${{ secrets.QUAY_USERNAME }}
+        registry_password: ${{ secrets.QUAY_PASSWORD }}
+    - name: tag with latest
+      uses: tinact/[email protected]
+      with:
+        image_name: rht-labs/omp-backend
+        image_old_tag: ${{ github.sha }}
+        registry: quay.io
+        registry_username: ${{ secrets.QUAY_USERNAME }}
+        registry_password: ${{ secrets.QUAY_PASSWORD }}
diff --git a/deployment/templates/deploymentconfig.yaml b/deployment/templates/deploymentconfig.yaml
@@ -30,11 +30,7 @@ spec:
       - envFrom:
         - secretRef:
             name: omp-backend-configuration
-        {{- if eq .Values.imageTag "latest" }}
         image: {{ .Values.name }}:{{ .Values.imageTag }}
-        {{- else }}
-        image: {{ .Values.imageName }}:{{ .Values.imageTag }}
-        {{- end }}
         imagePullPolicy: Always
         name: {{ .Values.name }}
         ports:
@@ -59,7 +55,6 @@ spec:
   test: false
   triggers:
   - type: ConfigChange
-  {{- if eq .Values.imageTag "latest" }}
   - type: ImageChange
     imageChangeParams:
       automatic: true
@@ -68,4 +63,3 @@ spec:
         name: {{ .Values.name }}:{{ .Values.imageTag }}
       containerNames:
       - {{ .Values.name }}
-  {{- end }}
diff --git a/deployment/templates/imagestream.yaml b/deployment/templates/imagestream.yaml
@@ -1,4 +1,3 @@
-{{- if or (eq .Values.imageTag "latest") (.Values.development) }}
 ---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
@@ -21,4 +20,3 @@ spec:
     referencePolicy:
       type: Source
   {{- end }}
-{{- end }}