From b329ba1a2395ed16ff5863e5f05ad478b1bdb444 Mon Sep 17 00:00:00 2001 From: "Randal S. Harisch" Date: Tue, 20 Aug 2024 05:53:11 -0600 Subject: [PATCH 1/2] chore: added redhat pull secret --- secrets/redhat-pull-secret.yaml | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 secrets/redhat-pull-secret.yaml diff --git a/secrets/redhat-pull-secret.yaml b/secrets/redhat-pull-secret.yaml new file mode 100644 index 0000000..81833c4 --- /dev/null +++ b/secrets/redhat-pull-secret.yaml @@ -0,0 +1,36 @@ +apiVersion: v1 +kind: Secret +metadata: + name: 15073480-registry-puller-pull-secret +data: + .dockerconfigjson: ENC[AES256_GCM,data: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,iv:8yBo2EEktzq7jGQnQ8vmXrbQFTtbkHLEimBtBZ33IXQ=,tag:8TgyClNQqTQSuXX9+i2gIQ==,type:str] +type: kubernetes.io/dockerconfigjson +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2024-08-20T11:52:22Z" + mac: ENC[AES256_GCM,data:5aVOpC1+SIO6Py/fRuJAaZad3hJLj7cdfBTZULaIMfaSlprf7L565M/JSa1ah6kuQ/w2hoFZa4ncjAo0eE9sw1kLpGgR9XHywbb/IhWg7D9ma/WYC4lxuGWLa8gDGOBPcGRa5OFkI4bfG64d4deUZRH2r9Rmex6plKv8QA1mzXQ=,iv:DEAUpV1qA0wtlbNLqz4GyDBNkGWeBO0cztyYmN2OW7Y=,tag:z29tNT/ydbj2a4x9VrRQCw==,type:str] + pgp: + - created_at: "2024-08-20T11:52:11Z" + enc: |- + -----BEGIN PGP MESSAGE----- + + wcDMA0gtINCTAeZuAQv+LdbZUHs3zoocnKuFP3ZOqcZTRA7V+GQgziKxNiOY/5oM + ddU4rQnUbhp9gIOibTGU7rTMe2rh4Rp0W0Gm2II/MvXkGr+A2ICHOxLnqhTop/Vd + ipgfjPXFl3zwBfoRYjkD5nF98LX/FutJHiD6xqEtRi+0dCtiVc3SO6BwHOKqx0tn + 87dttXEuH/qa8xDB/vUvVEkm5zI6RgZ9BmgXWISOGREPbpKE8YPxB5KJOc0pc6aC + /2JEo/devSAJrrs4j0K2sv7CLFecSpHYm5siq6BJEc3bEqH8oEFSwGg05Lxh4HR6 + /r5i+SZfy/1Oot+I+4TIupyDpPlZxadIdDwDSBJtvME32TwnEErZ6+PbnUXV1t+U + KtOuRfqv5sISCwdzdCqjKzyu/kD/vld3YrfWpiCkufcRfO4w8gcgzoXT5BXyqd9o + x0zFjyfOWKKf/s92zgk1oM2bA+CXDsXhQUrRPmeVrzcpGpV0wrhVpWLQ981ffMpU + uTDaOb/HOhhZAbGEHe/u0lEBO6cf8s9Z/23RiuzrTOwh30oLsR+qLTRDUwnm86/c + GYjkP6ft6sk1dw8Ij+GvpQu/MlenQA2n/eKmqhE1+z4Gm4R0ozrOejrF+nsjlHXY + 4OE= + =RRWX + -----END PGP MESSAGE----- + fp: 72E72623346EA4589F9348C8DD8DF053BEDF14D1 + encrypted_regex: ^(user.*|pass.*|.*[Bb]earer.*|.*[Kk]ey|.*[Kk]eys|salt|sentry.*|.*[Tt]oken|data.*|stringData.*)$ + version: 3.7.3 -- 2.49.1 From e3989df0c6c712da6bd0d99fdd53d1ee5e1da4b6 Mon Sep 17 00:00:00 2001 From: "Randal S. Harisch" Date: Wed, 21 Aug 2024 00:20:55 -0600 Subject: [PATCH 2/2] chore: modernize images --- charts/notification/Chart.yaml | 2 +- charts/notification/charts/common-0.1.0.tgz | Bin 12842 -> 12714 bytes common/templates/_task-git-semver.yaml | 2 +- common/templates/_task-s2i-go.yaml | 8 ++++---- common/templates/_triggertemplate.yaml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/notification/Chart.yaml b/charts/notification/Chart.yaml index 0bd1766..6cf0e49 100644 --- a/charts/notification/Chart.yaml +++ b/charts/notification/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.7 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/notification/charts/common-0.1.0.tgz b/charts/notification/charts/common-0.1.0.tgz index d5c69e9c383c06d44bfa13409357447820e723b2..affa62a5ac4dcc1a8706ecb9030c1a906f6f5dc3 100644 GIT binary patch literal 12714 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 IdH@yy0GD+=_5c6? diff --git a/common/templates/_task-git-semver.yaml b/common/templates/_task-git-semver.yaml index 7d4e029..22b5840 100644 --- a/common/templates/_task-git-semver.yaml +++ b/common/templates/_task-git-semver.yaml @@ -25,7 +25,7 @@ spec: value: $(params.gitrepositoryurl) - name: PARAM_BRANCH value: $(params.gitbranch) - image: {{ .Values.quayHostname }}/goghvideo/gitversion:latest + image: {{ .Values.quayHostname }}/goghvideo/gitversion:5.11.0-alpine.3.13-6.0 name: clone-and-calculate-semver script: | #!/usr/bin/env bash diff --git a/common/templates/_task-s2i-go.yaml b/common/templates/_task-s2i-go.yaml index 6106d60..d1b7448 100644 --- a/common/templates/_task-s2i-go.yaml +++ b/common/templates/_task-s2i-go.yaml @@ -13,7 +13,7 @@ spec: description: s2i-go task clones a Git repository and builds and pushes a container image using S2I and a Go builder image. params: - - default: latest + - default: "1.22" description: The tag of go imagestream for go version name: VERSION type: string @@ -29,7 +29,7 @@ spec: - description: Location of the repo where image has to be pushed name: IMAGE type: string - - default: registry.redhat.io/rhel8/buildah@sha256:00795fafdab9bbaa22cd29d1faa1a01e604e4884a2c935c1bf8e3d1f0ad1c084 + - default: quay01.ipa.endofday.com/goghvideo/buildah:latest description: The location of the buildah builder image. name: BUILDER_IMAGE type: string @@ -50,7 +50,7 @@ spec: env: - name: HOME value: /tekton/home - image: registry.redhat.io/ocp-tools-4-tech-preview/source-to-image-rhel8@sha256:98d8cb3a255641ca6a1bce854e5e2460c20de9fb9b28e3cc67eb459f122873dd + image: quay01.ipa.endofday.com/goghvideo/openshift-pipeline-s2i:nightly name: generate script: | echo "Processing Build Environment Variables" @@ -63,7 +63,7 @@ spec: echo "Outputting Generated /env-vars/env-file" cat /env-vars/env-file - s2i build $(params.PATH_CONTEXT) image-registry.openshift-image-registry.svc:5000/openshift/golang:$(params.VERSION) \ + s2i build $(params.PATH_CONTEXT) quay01.ipa.endofday.com/goghvideo/golang:$(params.VERSION) \ --as-dockerfile /gen-source/Dockerfile.gen --environment-file /env-vars/env-file echo "Outputting Generated /gen-source/Dockerfile.gen file" diff --git a/common/templates/_triggertemplate.yaml b/common/templates/_triggertemplate.yaml index 682d7e0..77d0d6e 100644 --- a/common/templates/_triggertemplate.yaml +++ b/common/templates/_triggertemplate.yaml @@ -63,7 +63,7 @@ spec: - name: image value: {{ .Values.quayHostname }}/{{ .Values.organizationName }}/{{ include "common.name" . }} - name: s2i-builder-image - value: {{ .Values.quayHostname }}/{{ .Values.organizationName }}/golang-s2i-buildah:v1 + value: {{ .Values.quayHostname }}/{{ .Values.organizationName }}/golang-s2i-buildah:v1.37 - name: git-token-secret-name value: git-http-credentials - name: git-token-secret-key -- 2.49.1