apply artifact pull secret

bcgov · Dec 13, 2024 · bceef60 · bceef60
1 parent 71f5c9a
commit bceef60
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 54 deletions.
diff --git a/openshift/templates/backend/backend-bc.yaml b/openshift/templates/backend/backend-bc.yaml
@@ -90,9 +90,5 @@ objects:
           forcePull: true
           noCache: true            
         type: Source
-      triggers:
-      - imageChange: {}
-        type: ImageChange
-      - type: ConfigChange
     status:
       lastVersion: 0
diff --git a/openshift/templates/frontend/frontend-bc-docker.yaml b/openshift/templates/frontend/frontend-bc-docker.yaml
@@ -69,24 +69,11 @@ objects:
     strategy:
       dockerStrategy:
         dockerfilePath: ./Dockerfile-Openshift
-        env:
-          - name: ARTIFACTORY_USER
-            valueFrom:
-              secretKeyRef:
-                name: artifacts-default-idxprm
-                key: username
-          - name: ARTIFACTORY_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: artifacts-default-idxprm
-                key: password
+        pullSecret:
+            name: artifacts-pull-default-idxprm
         noCache: true
         forcePull: true
       type: Docker
-    successfulBuildsHistoryLimit: 5
-    triggers: 
-      - imageChange: {}
-        type: ImageChange
-      - type: ConfigChange    
+    successfulBuildsHistoryLimit: 5  
   status:
     lastVersion: 0
diff --git a/openshift/templates/task-queue/task-queue-bc.yaml b/openshift/templates/task-queue/task-queue-bc.yaml
@@ -69,24 +69,11 @@ objects:
     strategy:
       dockerStrategy:
         dockerfilePath: ./Dockerfile.taskq.Openshift
-        env:
-          - name: ARTIFACTORY_USER
-            valueFrom:
-              secretKeyRef:
-                name: artifacts-default-idxprm
-                key: username
-          - name: ARTIFACTORY_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: artifacts-default-idxprm
-                key: password
+        pullSecret:
+          name: artifacts-pull-default-idxprm
         noCache: true
         forcePull: true
       type: Docker
     successfulBuildsHistoryLimit: 5
-    triggers: 
-      - imageChange: {}
-        type: ImageChange
-      - type: ConfigChange    
   status:
     lastVersion: 0
diff --git a/openshift/templates/vinpower/vinpower-bc.yaml b/openshift/templates/vinpower/vinpower-bc.yaml
@@ -67,23 +67,9 @@ objects:
       strategy:
         dockerStrategy:
           dockerfilePath: ./Dockerfile-Openshift
-          env:
-            - name: ARTIFACTORY_USER
-              valueFrom:
-                secretKeyRef:
-                  name: artifacts-default-idxprm
-                  key: username
-            - name: ARTIFACTORY_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: artifacts-default-idxprm
-                  key: password
-            - name: ARTIFACTORY_URL
-              valueFrom:
-                secretKeyRef:
-                  name: cthub-artifactory
-                  key: ARTIFACTORY_URL
+          pullSecret:
+            name: artifacts-pull-default-idxprm
+          noCache: true
+          forcePull: true
         type: Docker
-      triggers:
-        - type: ConfigChange
-        - type: ImageChange
+