[oko] Move push/pull registry to docker.io

openshift · Jan 23, 2024 · 10ba7e3 · 10ba7e3
1 parent e70aed8
commit 10ba7e3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/...tor/step-registry/openstack-k8s-operators/build/openstack-k8s-operators-build-commands.sh b/...tor/step-registry/openstack-k8s-operators/build/openstack-k8s-operators-build-commands.sh
@@ -199,7 +199,7 @@ ln -ns /secrets/internal/config.json ${BASE_DIR}/containers/auth.json
 
 # Secret for pushing containers - openstack namespace
 PUSH_REGISTRY_SECRET=push-quay-secret
-oc create secret generic ${PUSH_REGISTRY_SECRET} --from-file=.dockerconfigjson=/secrets/rdoquay/config.json --type=kubernetes.io/dockerconfigjson
+oc create secret generic ${PUSH_REGISTRY_SECRET} --from-file=.dockerconfigjson=${PUSH_REGISTRY_SECRET_PATH}/config.json --type=kubernetes.io/dockerconfigjson
 
 # Build operator
 IMAGE_TAG_BASE=${PUSH_REGISTRY}/${PUSH_ORGANIZATION}/${BASE_OP}

diff --git a/...erator/step-registry/openstack-k8s-operators/build/openstack-k8s-operators-build-ref.yaml b/...erator/step-registry/openstack-k8s-operators/build/openstack-k8s-operators-build-ref.yaml
@@ -8,10 +8,13 @@ ref:
       memory: 100Mi
   env:
     - name: PUSH_REGISTRY
-      default: "quay.rdoproject.org"
+      default: "docker.io"
       documentation: Registry to push containers built by this step.
+    - name: PUSH_REGISTRY_SECRET_PATH
+      default: "/secrets/docker"
+      documentation: Mount path of the secret to be used when pushing container images.
     - name: PUSH_ORGANIZATION
-      default: "openstack-k8s-operators"
+      default: "rdotripleomirror"
       documentation: Registry organization to push containers built by this step.
     - name: BUILD_COMPLETE_TIMEOUT
       default: "300"

diff --git a/...ator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-ref.yaml b/...ator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-ref.yaml
@@ -8,10 +8,10 @@ ref:
       memory: 100Mi
   env:
     - name: PULL_REGISTRY
-      default: "quay.rdoproject.org"
+      default: "docker.io"
       documentation: Registry to pull containers built in previous steps.
     - name: PULL_ORGANIZATION
-      default: "openstack-k8s-operators"
+      default: "rdotripleomirror"
       documentation: Registry organization to pull containers built in previous steps.
     - name: TIMEOUT_OPERATORS_AVAILABLE
       default: "240"

diff --git a/...p-registry/openstack-k8s-operators/fips-check/openstack-k8s-operators-fips-check-ref.yaml b/...p-registry/openstack-k8s-operators/fips-check/openstack-k8s-operators-fips-check-ref.yaml
@@ -8,10 +8,10 @@ ref:
       memory: 100Mi
   env:
     - name: PULL_REGISTRY
-      default: "quay.rdoproject.org"
+      default: "docker.io"
       documentation: Registry to pull containers built in previous step.
     - name: PULL_ORGANIZATION
-      default: "openstack-k8s-operators"
+      default: "rdotripleomirror"
       documentation: Registry organization to pull containers built in previous step.
     - name: NS_FIPS_CHECK
       default: "openstack"

diff --git a/...erator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-ref.yaml b/...erator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-ref.yaml
@@ -8,10 +8,10 @@ ref:
       memory: 100Mi
   env:
     - name: REGISTRY
-      default: "quay.rdoproject.org"
+      default: "docker.io"
       documentation: Registry to push containers built by this step.
     - name: ORGANIZATION
-      default: "openstack-k8s-operators"
+      default: "rdotripleomirror"
       documentation: Registry organization to push containers built by this step.
     - name: CEPH_HOSTNETWORK
       default: "true"