goghvideo/cicd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: standardize pull secret

Browse Source
This commit is contained in:
Randal Harisch
2023-09-24 21:26:21 -06:00
parent 8ab769fb28
commit ac0c707393
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pipeline/conversion-engine.yaml
View File

@@ -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

2
pipeline/upload-to-nextcloud.yaml
View File

@@ -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

20
secrets/git-secret.yaml
View File

@@ -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: |-

2
secrets/provision-rbac.sh
View File

@@ -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

2
triggertemplate/conversionengine-template.yaml
View File

@@ -75,7 +75,7 @@ spec:
secretName: git-credentials
- name: dockerconfig
secret:
secretName: goghvideo-registry-pusher
secretName: goghvideo-container-registry-auth
- name: helm
volumeClaimTemplate:
spec:

2
triggertemplate/upload-to-nextcloud.yaml
View File

@@ -75,7 +75,7 @@ spec:
secretName: git-credentials
- name: dockerconfig
secret:
secretName: goghvideo-registry-pusher
secretName: goghvideo-container-registry-auth
- name: helm
volumeClaimTemplate:
spec: