From ac0c707393dea535e004403844789f7d3ef70105 Mon Sep 17 00:00:00 2001
From: "Randal S. Harisch" <randal@endofday.com>
Date: Sun, 24 Sep 2023 21:26:21 -0600
Subject: [PATCH] chore: standardize pull secret

---
 pipeline/conversion-engine.yaml               |  2 +-
 pipeline/upload-to-nextcloud.yaml             |  2 +-
 secrets/git-secret.yaml                       | 20 +++++++++----------
 secrets/provision-rbac.sh                     |  2 +-
 .../conversionengine-template.yaml            |  2 +-
 triggertemplate/upload-to-nextcloud.yaml      |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pipeline/conversion-engine.yaml b/pipeline/conversion-engine.yaml
index 0bc2485..d9e2ac8 100644
--- a/pipeline/conversion-engine.yaml
+++ b/pipeline/conversion-engine.yaml
@@ -152,7 +152,7 @@ spec:
             x=0; until [[ -n $(oc -n goghvideo-test-${RANDOMID} get secret/goghvideo-openshift-builder-pull-secret 2>/dev/null) || $x -eq 10 ]]; do echo "Waiting for secret replication" && sleep 10 && ((x++)); done
             if [[ "${x}" -eq 10 ]]; then exit 1; fi
 
-            oc -n goghvideo-test-${RANDOMID} secrets link default goghvideo-openshift-builder-pull-secret --for=pull
+            oc -n goghvideo-test-${RANDOMID} secrets link default goghvideo-container-registry-auth --for=pull
 
             oc apply -f - <<EOF
             apiVersion: rabbitmq.com/v1beta1
diff --git a/pipeline/upload-to-nextcloud.yaml b/pipeline/upload-to-nextcloud.yaml
index c015fc1..b85cc1d 100644
--- a/pipeline/upload-to-nextcloud.yaml
+++ b/pipeline/upload-to-nextcloud.yaml
@@ -153,7 +153,7 @@ spec:
             x=0; until [[ -n $(oc -n goghvideo-test-${RANDOMID} get secret/goghvideo-openshift-builder-pull-secret 2>/dev/null) || $x -eq 10 ]]; do echo "Waiting for secret replication" && sleep 10 && ((x++)); done
             if [[ "${x}" -eq 10 ]]; then exit 1; fi
 
-            oc -n goghvideo-test-${RANDOMID} secrets link default goghvideo-openshift-builder-pull-secret --for=pull
+            oc -n goghvideo-test-${RANDOMID} secrets link default goghvideo-container-registry-auth --for=pull
 
             oc apply -f - <<EOF
             apiVersion: rabbitmq.com/v1beta1
diff --git a/secrets/git-secret.yaml b/secrets/git-secret.yaml
index 5b1d4c3..459d409 100644
--- a/secrets/git-secret.yaml
+++ b/secrets/git-secret.yaml
@@ -13,8 +13,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-09-25T01:17:00Z"
-    mac: ENC[AES256_GCM,data:KsnJsvA6VaFvx81Ru84Fu92TuZloisZQLIP3LR4n7POlZ03JEuMEFOB3DeKmf69pP+4KjiGjOLlsNFJU4JnAeMt1zfjuf5dMhkyq+DprOeKjATu1zKn9ECR3q6jeTKk0MmrPtqxHhX+0h+jNR9Il//F6xpMJIobR3vt2BzPRZA0=,iv:xtmqSzARAyS25rsJTvS6qbIL69yvD5BfcTKek1H4BNo=,tag:J+5pgKeUW8Dqmr3y1CXjFQ==,type:str]
+    lastmodified: "2023-09-25T03:19:12Z"
+    mac: ENC[AES256_GCM,data:RQwm+6sKHkdhaEyb5U+0dLEBitGY284VmyJx4Cp4J0WGRWWizhECHvx2NgAkCwB2g5l60o93RYRoOKXhqOdrUwRjT3lGOAJRXGRW4ov7Gsg5uR//e7McxRvTdny3vI35oZ8iMYT0pMb5Ki/cR7TqQrqQ/0EFFY59uvwTrZobH7k=,iv:To45ygDS+BMVVOn2KiWyRmIe9m6UQHn9CcyFdSBZamw=,tag:0W9qWCPCNhVeJs8VFO1WIA==,type:str]
     pgp:
         - created_at: "2023-09-24T23:07:57Z"
           enc: |-
@@ -55,8 +55,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-09-25T01:17:00Z"
-    mac: ENC[AES256_GCM,data:KsnJsvA6VaFvx81Ru84Fu92TuZloisZQLIP3LR4n7POlZ03JEuMEFOB3DeKmf69pP+4KjiGjOLlsNFJU4JnAeMt1zfjuf5dMhkyq+DprOeKjATu1zKn9ECR3q6jeTKk0MmrPtqxHhX+0h+jNR9Il//F6xpMJIobR3vt2BzPRZA0=,iv:xtmqSzARAyS25rsJTvS6qbIL69yvD5BfcTKek1H4BNo=,tag:J+5pgKeUW8Dqmr3y1CXjFQ==,type:str]
+    lastmodified: "2023-09-25T03:19:12Z"
+    mac: ENC[AES256_GCM,data:RQwm+6sKHkdhaEyb5U+0dLEBitGY284VmyJx4Cp4J0WGRWWizhECHvx2NgAkCwB2g5l60o93RYRoOKXhqOdrUwRjT3lGOAJRXGRW4ov7Gsg5uR//e7McxRvTdny3vI35oZ8iMYT0pMb5Ki/cR7TqQrqQ/0EFFY59uvwTrZobH7k=,iv:To45ygDS+BMVVOn2KiWyRmIe9m6UQHn9CcyFdSBZamw=,tag:0W9qWCPCNhVeJs8VFO1WIA==,type:str]
     pgp:
         - created_at: "2023-09-24T23:07:57Z"
           enc: |-
@@ -92,8 +92,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-09-25T01:17:00Z"
-    mac: ENC[AES256_GCM,data:KsnJsvA6VaFvx81Ru84Fu92TuZloisZQLIP3LR4n7POlZ03JEuMEFOB3DeKmf69pP+4KjiGjOLlsNFJU4JnAeMt1zfjuf5dMhkyq+DprOeKjATu1zKn9ECR3q6jeTKk0MmrPtqxHhX+0h+jNR9Il//F6xpMJIobR3vt2BzPRZA0=,iv:xtmqSzARAyS25rsJTvS6qbIL69yvD5BfcTKek1H4BNo=,tag:J+5pgKeUW8Dqmr3y1CXjFQ==,type:str]
+    lastmodified: "2023-09-25T03:19:12Z"
+    mac: ENC[AES256_GCM,data:RQwm+6sKHkdhaEyb5U+0dLEBitGY284VmyJx4Cp4J0WGRWWizhECHvx2NgAkCwB2g5l60o93RYRoOKXhqOdrUwRjT3lGOAJRXGRW4ov7Gsg5uR//e7McxRvTdny3vI35oZ8iMYT0pMb5Ki/cR7TqQrqQ/0EFFY59uvwTrZobH7k=,iv:To45ygDS+BMVVOn2KiWyRmIe9m6UQHn9CcyFdSBZamw=,tag:0W9qWCPCNhVeJs8VFO1WIA==,type:str]
     pgp:
         - created_at: "2023-09-24T23:07:57Z"
           enc: |-
@@ -119,19 +119,19 @@ sops:
 apiVersion: v1
 kind: Secret
 metadata:
-    name: goghvideo-registry-pusher
+    name: goghvideo-container-registry-auth
     namespace: goghvideo-cicd-pipeline
 type: Opaque
 data:
-    config.json: ENC[AES256_GCM,data:fUpbi7InOAHXkmKkIpCfNBUV9c0p8upV9MgeTEF7x0l3mEaz5yUQNCxhrE+lvpbBoIORR22vNXLgHDbutpNlIVc+xCXH6+MnnJ8yasK+FNCENIXZGO+8bMYqSwOJ6b8iIlbWA4O6KZzuNJHi7qngEwDtIWcHea8yQPUs2o3CMblTSSUTrl5aoUuISRQJV8AsNs98C6nGM9lXK97RLiOda4+84OKjlyLPhWzIXXwS+832WoN8joDQum7y7Wh0CBJ0bsslDP9vUqvhxNVt9xCqGYEg/rJmaiU7bxNA+q20ToeEYQgJiT7j6kdViM4LTHDv7JRVSaBMdCK37+rjh4Hm2rPgZz8DMbQLBo7Qa6fv39cgVMxWR2IJj1tl6GNXj9Qs4yDtl539KZY=,iv:pc1ROzWzyAQGcu0dJcBk5Rt3L8nlEJ9uSPOxmTcQuUU=,tag:+INqQisB9ycJevOXci70yw==,type:str]
+    .dockerconfig.json: ENC[AES256_GCM,data:F+plnO4amrIlBw9ZpotIgBtrIdZKrQfy3YUeMC8UH/tDgZpTj+YMCuDxbPDpM2md0uw9TK5OWG1NSmQ4Nncqw+Y3YsFWNb0Mc+pW1PymWm9VAJBDl8xcUxx1rBVfQOfMUAo+Yw5ILDYpEqxvE05wQgt3G8ZQgZdbLBVOs3tWqgDaC1qMwh+H1OqPAFhciNLE5ujYOgTWiXg6Dbvw9JrsD3zm2lx3idjfMJxNl9SqF0Ez9pYtbUEWZeULX74aZ/pwfncFxfkDl7DzkDNcLj0Kwiy2gyc2UFlNdrGEv+rtOAV8hhvzVKshUH3EoXlMhOWSaCdspJP7OSGdekUofVdAkhLa9hHiet7TkUD+UsdDlhV3fQc/ywjcS1Cn2s0Shxa1XtvA3548QR4=,iv:NoquGTDfrf0BpL2NtGrzC6p2R7lkp/uGoGD8GT9UIsk=,tag:Eqkd3y8NZZJSlCJnRVPDZg==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-09-25T01:17:00Z"
-    mac: ENC[AES256_GCM,data:KsnJsvA6VaFvx81Ru84Fu92TuZloisZQLIP3LR4n7POlZ03JEuMEFOB3DeKmf69pP+4KjiGjOLlsNFJU4JnAeMt1zfjuf5dMhkyq+DprOeKjATu1zKn9ECR3q6jeTKk0MmrPtqxHhX+0h+jNR9Il//F6xpMJIobR3vt2BzPRZA0=,iv:xtmqSzARAyS25rsJTvS6qbIL69yvD5BfcTKek1H4BNo=,tag:J+5pgKeUW8Dqmr3y1CXjFQ==,type:str]
+    lastmodified: "2023-09-25T03:19:12Z"
+    mac: ENC[AES256_GCM,data:RQwm+6sKHkdhaEyb5U+0dLEBitGY284VmyJx4Cp4J0WGRWWizhECHvx2NgAkCwB2g5l60o93RYRoOKXhqOdrUwRjT3lGOAJRXGRW4ov7Gsg5uR//e7McxRvTdny3vI35oZ8iMYT0pMb5Ki/cR7TqQrqQ/0EFFY59uvwTrZobH7k=,iv:To45ygDS+BMVVOn2KiWyRmIe9m6UQHn9CcyFdSBZamw=,tag:0W9qWCPCNhVeJs8VFO1WIA==,type:str]
     pgp:
         - created_at: "2023-09-24T23:07:57Z"
           enc: |-
diff --git a/secrets/provision-rbac.sh b/secrets/provision-rbac.sh
index c16fdef..d51c3c0 100644
--- a/secrets/provision-rbac.sh
+++ b/secrets/provision-rbac.sh
@@ -1,3 +1,3 @@
-oc -n goghvideo-cicd-pipeline secret link pipeline goghvideo-registry-pusher --for=pull
+oc -n goghvideo-cicd-pipeline secret link pipeline goghvideo-container-registry-auth --for=pull
 oc -n goghvideo-cicd-pipeline adm policy add-cluster-role-to-user cluster-admin -z pipeline
 oc -n goghvideo-cicd-pipeline adm policy add-scc-to-user anyuid -z pipeline
diff --git a/triggertemplate/conversionengine-template.yaml b/triggertemplate/conversionengine-template.yaml
index 3704980..78f6660 100644
--- a/triggertemplate/conversionengine-template.yaml
+++ b/triggertemplate/conversionengine-template.yaml
@@ -75,7 +75,7 @@ spec:
             secretName: git-credentials
         - name: dockerconfig
           secret:
-            secretName: goghvideo-registry-pusher
+            secretName: goghvideo-container-registry-auth
         - name: helm
           volumeClaimTemplate:
             spec:
diff --git a/triggertemplate/upload-to-nextcloud.yaml b/triggertemplate/upload-to-nextcloud.yaml
index fb7324c..0c9848f 100644
--- a/triggertemplate/upload-to-nextcloud.yaml
+++ b/triggertemplate/upload-to-nextcloud.yaml
@@ -75,7 +75,7 @@ spec:
             secretName: git-credentials
         - name: dockerconfig
           secret:
-            secretName: goghvideo-registry-pusher
+            secretName: goghvideo-container-registry-auth
         - name: helm
           volumeClaimTemplate:
             spec: