apply artifact pull secret

bcgov · Dec 13, 2024 · 79a4f21 · 79a4f21
1 parent 8a6f730
commit 79a4f21
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 36 deletions.
diff --git a/openshift/templates/backend/backend-bc.yaml b/openshift/templates/backend/backend-bc.yaml
@@ -88,9 +88,5 @@ objects:
           forcePull: true
           noCache: true            
         type: Source
-      triggers:
-      - imageChange: {}
-        type: ImageChange
-      - type: ConfigChange
     status:
       lastVersion: 0
diff --git a/openshift/templates/cra/cra-bc-docker.yaml b/openshift/templates/cra/cra-bc-docker.yaml
@@ -67,18 +67,9 @@ objects:
       strategy:
         dockerStrategy:
           dockerfilePath: ./Dockerfile-Openshift
-          env:
-            - name: ARTIFACTORY_USER
-              valueFrom:
-                secretKeyRef:
-                  name: artifacts-default-pwpgbz
-                  key: username
-            - name: ARTIFACTORY_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: artifacts-default-pwpgbz
-                  key: password
+          pullSecret:
+            name: artifacts-pull-default-pwpgbz
+          forcePull: true
+          noCache: true    
         type: Docker
-      triggers:
-        - type: ConfigChange
-        - type: ImageChange
+
diff --git a/openshift/templates/frontend/frontend-bc-docker.yaml b/openshift/templates/frontend/frontend-bc-docker.yaml
@@ -67,18 +67,8 @@ objects:
     strategy:
       dockerStrategy:
         dockerfilePath: ./Dockerfile-Openshift
-        env:
-          - name: ARTIFACTORY_USER
-            valueFrom:
-              secretKeyRef:
-                name: artifacts-default-pwpgbz
-                key: username
-          - name: ARTIFACTORY_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: artifacts-default-pwpgbz
-                key: password
+        pullSecret:
+          name: artifacts-pull-default-pwpgbz
+        forcePull: true
+        noCache: true    
       type: Docker
-    triggers:
-    - type: ConfigChange
-    - type: ImageChange
diff --git a/openshift/templates/task-queue/task-queue-bc-docker.yaml b/openshift/templates/task-queue/task-queue-bc-docker.yaml
@@ -72,10 +72,8 @@ objects:
           dockerfilePath: ./Dockerfile-Openshift-Taskq
           pullSecret:
             name: artifacts-default-pwpgbz
+          forcePull: true
+          noCache: true    
         type: Docker      
-      # triggers:
-      #   - imageChange: {}
-      #     type: ImageChange
-      #   - type: ConfigChange
     status:
       lastVersion: 0