fix: pulling images from ghcr directly

bcgov · Mar 27, 2024 · 8baa1a5 · 8baa1a5
1 parent 8d5b523
commit 8baa1a5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/tools/helm/tools/templates/dev-release-pipeline.yaml b/tools/helm/tools/templates/dev-release-pipeline.yaml
@@ -9,7 +9,7 @@ spec:
     - name: dev-registry-portal
       params:
         - name: sourceImage
-          value: artifacts.developer.gov.bc.ca/github-docker-remote/bcgov/ecc-ecer/registry-portal
+          value: ghcr.io/bcgov/ecc-ecer/registry-portal
         - name: sourceTag
           value: latest
         - name: destinationImage
@@ -24,7 +24,7 @@ spec:
     - name: dev-api
       params:
         - name: sourceImage
-          value: artifacts.developer.gov.bc.ca/github-docker-remote/bcgov/ecc-ecer/api
+          value: ghcr.io/bcgov/ecc-ecer/api
         - name: sourceTag
           value: latest
         - name: destinationImage
@@ -35,4 +35,4 @@ spec:
           value: true
       taskRef:
         kind: Task
-        name: tag-image-task
+        name: tag-image-task
diff --git a/tools/helm/tools/templates/promote-image-task.yml b/tools/helm/tools/templates/promote-image-task.yml
@@ -10,6 +10,9 @@ spec:
       type: string
     - name: toTag
       type: string
+    - name: referencePolicy
+      type: string
+      default: source
   steps:
     - name: backup
       image: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
@@ -27,7 +30,7 @@ spec:
         echo old image: $old
         if [ ! -z "$old" -a "$new" != "$old" ];          
         then
-          oc tag $(params.imageName):$(params.toTag) $(params.imageName):$(params.toTag)-backup
+          oc tag $(params.imageName):$(params.toTag) $(params.imageName):$(params.toTag)-backup --reference-policy=$(params.referencePolicy)
         fi
     - name: promote
       image: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
@@ -39,4 +42,4 @@ spec:
           cpu: 5m
           memory: 32Mi
       script: |
-        oc tag $(params.imageName):$(params.fromTag) $(params.imageName):$(params.toTag)
+        oc tag $(params.imageName):$(params.fromTag) $(params.imageName):$(params.toTag) --reference-policy=$(params.referencePolicy)
diff --git a/tools/helm/tools/templates/tag-image-task.yml b/tools/helm/tools/templates/tag-image-task.yml
@@ -15,6 +15,9 @@ spec:
     - name: scheduled
       type: string
       default: false
+    - name: referencePolicy
+      type: string
+      default: source
   steps:
     - name: tag
       image: 'image-registry.openshift-image-registry.svc:5000/openshift/cli:latest'
@@ -26,4 +29,4 @@ spec:
           cpu: 5m
           memory: 32Mi
       script: |
-        oc tag $(params.sourceImage):$(params.sourceTag) $(params.destinationImage):$(params.destinationTag) --scheduled=$(params.scheduled)
+        oc tag $(params.sourceImage):$(params.sourceTag) $(params.destinationImage):$(params.destinationTag) --scheduled=$(params.scheduled) --reference-policy=$(params.referencePolicy)
diff --git a/tools/helm/tools/values.yaml b/tools/helm/tools/values.yaml
@@ -1,9 +1,9 @@
 images:
   registry-portal:
-    image: artifacts.developer.gov.bc.ca/github-docker-remote/bcgov/ecc-ecer/registry-portal
+    image: ghcr.io/bcgov/ecc-ecer/registry-portal
     tags:
       dev: latest
   api:
-    image: artifacts.developer.gov.bc.ca/github-docker-remote/bcgov/ecc-ecer/api
+    image: ghcr.io/bcgov/ecc-ecer/api
     tags:
       dev: latest