Merge pull request #159 from elfosardo/new-registry-woohoo

Use new registry registry.ci.openshift.org
openshift · Jun 18, 2021 · b2f88eb · b2f88eb
2 parents 62939a7 + 379c7bc
commit b2f88eb
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 33 deletions.
diff --git a/config/cluster-baremetal-operator/cluster-baremetal-operator.yaml b/config/cluster-baremetal-operator/cluster-baremetal-operator.yaml
@@ -23,7 +23,7 @@ spec:
       serviceAccountName: cluster-baremetal-operator
       containers:
       - name: cluster-baremetal-operator
-        image: registry.svc.ci.openshift.org/openshift:cluster-baremetal-operator
+        image: registry.ci.openshift.org/openshift:cluster-baremetal-operator
         command:
         - "/usr/bin/cluster-baremetal-operator"
         env:

diff --git a/config/profiles/default/manager_auth_proxy_patch.yaml b/config/profiles/default/manager_auth_proxy_patch.yaml
@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
       - name: kube-rbac-proxy
-        image: registry.svc.ci.openshift.org/openshift:kube-rbac-proxy
+        image: registry.ci.openshift.org/openshift:kube-rbac-proxy
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://localhost:8080/"

diff --git a/manifests/0000_31_cluster-baremetal-operator_01_images.configmap.yaml b/manifests/0000_31_cluster-baremetal-operator_01_images.configmap.yaml
@@ -10,13 +10,13 @@ metadata:
 data:
   images.json: >
     {
-      "clusterBaremetalOperator": "registry.svc.ci.openshift.org/openshift:cluster-baremetal-operator",
-      "kubeRBACProxy": "registry.svc.ci.openshift.org/openshift:kube-rbac-proxy",
-      "baremetalOperator": "registry.svc.ci.openshift.org/openshift:baremetal-operator",
-      "baremetalIronic": "registry.svc.ci.openshift.org/openshift:ironic",
-      "baremetalIronicInspector": "registry.svc.ci.openshift.org/openshift:ironic-inspector",
-      "baremetalIpaDownloader": "registry.svc.ci.openshift.org/openshift:ironic-ipa-downloader",
-      "baremetalMachineOsDownloader": "registry.svc.ci.openshift.org/openshift:ironic-machine-os-downloader",
-      "baremetalStaticIpManager": "registry.svc.ci.openshift.org/openshift:ironic-static-ip-manager"
+      "clusterBaremetalOperator": "registry.ci.openshift.org/openshift:cluster-baremetal-operator",
+      "kubeRBACProxy": "registry.ci.openshift.org/openshift:kube-rbac-proxy",
+      "baremetalOperator": "registry.ci.openshift.org/openshift:baremetal-operator",
+      "baremetalIronic": "registry.ci.openshift.org/openshift:ironic",
+      "baremetalIronicInspector": "registry.ci.openshift.org/openshift:ironic-inspector",
+      "baremetalIpaDownloader": "registry.ci.openshift.org/openshift:ironic-ipa-downloader",
+      "baremetalMachineOsDownloader": "registry.ci.openshift.org/openshift:ironic-machine-os-downloader",
+      "baremetalStaticIpManager": "registry.ci.openshift.org/openshift:ironic-static-ip-manager"
     }
 
diff --git a/manifests/0000_31_cluster-baremetal-operator_06_deployment.yaml b/manifests/0000_31_cluster-baremetal-operator_06_deployment.yaml
@@ -36,7 +36,7 @@ spec:
               fieldPath: metadata.namespace
         - name: METRICS_PORT
           value: "8080"
-        image: registry.svc.ci.openshift.org/openshift:cluster-baremetal-operator
+        image: registry.ci.openshift.org/openshift:cluster-baremetal-operator
         name: cluster-baremetal-operator
         ports:
         - containerPort: 9443
@@ -61,7 +61,7 @@ spec:
         - --config-file=/etc/kube-rbac-proxy/config-file.yaml
         - --logtostderr=true
         - --v=10
-        image: registry.svc.ci.openshift.org/openshift:kube-rbac-proxy
+        image: registry.ci.openshift.org/openshift:kube-rbac-proxy
         name: kube-rbac-proxy
         ports:
         - containerPort: 8443

diff --git a/manifests/image-references b/manifests/image-references
@@ -6,32 +6,32 @@ spec:
   - name: cluster-baremetal-operator
     from:
       kind: DockerImage
-      name: registry.svc.ci.openshift.org/openshift:cluster-baremetal-operator
+      name: registry.ci.openshift.org/openshift:cluster-baremetal-operator
   - name: baremetal-operator
     from:
       kind: DockerImage
-      name: registry.svc.ci.openshift.org/openshift:baremetal-operator
+      name: registry.ci.openshift.org/openshift:baremetal-operator
   - name: ironic
     from:
       kind: DockerImage
-      name: registry.svc.ci.openshift.org/openshift:ironic
+      name: registry.ci.openshift.org/openshift:ironic
   - name: ironic-inspector
     from:
       kind: DockerImage
-      name: registry.svc.ci.openshift.org/openshift:ironic-inspector
+      name: registry.ci.openshift.org/openshift:ironic-inspector
   - name: ironic-ipa-downloader
     from:
       kind: DockerImage
-      name: registry.svc.ci.openshift.org/openshift:ironic-ipa-downloader
+      name: registry.ci.openshift.org/openshift:ironic-ipa-downloader
   - name: ironic-machine-os-downloader
     from:
       kind: DockerImage
-      name: registry.svc.ci.openshift.org/openshift:ironic-machine-os-downloader
+      name: registry.ci.openshift.org/openshift:ironic-machine-os-downloader
   - name: ironic-static-ip-manager
     from:
       kind: DockerImage
-      name: registry.svc.ci.openshift.org/openshift:ironic-static-ip-manager
+      name: registry.ci.openshift.org/openshift:ironic-static-ip-manager
   - name: kube-rbac-proxy
     from:
       kind: DockerImage
-      name: registry.svc.ci.openshift.org/openshift:kube-rbac-proxy
+      name: registry.ci.openshift.org/openshift:kube-rbac-proxy
diff --git a/provisioning/container_images_test.go b/provisioning/container_images_test.go
@@ -6,12 +6,12 @@ import (
 
 var (
 	TestImagesFile                = "sample_images.json"
-	expectedBaremetalOperator     = "registry.svc.ci.openshift.org/openshift:baremetal-operator"
-	expectedIronic                = "registry.svc.ci.openshift.org/openshift:ironic"
-	expectedIronicInspector       = "registry.svc.ci.openshift.org/openshift:ironic-inspector"
-	expectedIronicIpaDownloader   = "registry.svc.ci.openshift.org/openshift:ironic-ipa-downloader"
-	expectedMachineOsDownloader   = "registry.svc.ci.openshift.org/openshift:ironic-machine-os-downloader"
-	expectedIronicStaticIpManager = "registry.svc.ci.openshift.org/openshift:ironic-static-ip-manager"
+	expectedBaremetalOperator     = "registry.ci.openshift.org/openshift:baremetal-operator"
+	expectedIronic                = "registry.ci.openshift.org/openshift:ironic"
+	expectedIronicInspector       = "registry.ci.openshift.org/openshift:ironic-inspector"
+	expectedIronicIpaDownloader   = "registry.ci.openshift.org/openshift:ironic-ipa-downloader"
+	expectedMachineOsDownloader   = "registry.ci.openshift.org/openshift:ironic-machine-os-downloader"
+	expectedIronicStaticIpManager = "registry.ci.openshift.org/openshift:ironic-static-ip-manager"
 )
 
 func TestGetContainerImages(t *testing.T) {

diff --git a/provisioning/sample_images.json b/provisioning/sample_images.json
@@ -1,9 +1,9 @@
 {
-  "clusterBaremetalOperator": "registry.svc.ci.openshift.org/openshift:cluster-baremetal-operator",
-  "baremetalOperator": "registry.svc.ci.openshift.org/openshift:baremetal-operator",
-  "baremetalIronic": "registry.svc.ci.openshift.org/openshift:ironic",
-  "baremetalIronicInspector": "registry.svc.ci.openshift.org/openshift:ironic-inspector",
-  "baremetalIpaDownloader": "registry.svc.ci.openshift.org/openshift:ironic-ipa-downloader",
-  "baremetalMachineOsDownloader": "registry.svc.ci.openshift.org/openshift:ironic-machine-os-downloader",
-  "baremetalStaticIpManager": "registry.svc.ci.openshift.org/openshift:ironic-static-ip-manager"
+  "clusterBaremetalOperator": "registry.ci.openshift.org/openshift:cluster-baremetal-operator",
+  "baremetalOperator": "registry.ci.openshift.org/openshift:baremetal-operator",
+  "baremetalIronic": "registry.ci.openshift.org/openshift:ironic",
+  "baremetalIronicInspector": "registry.ci.openshift.org/openshift:ironic-inspector",
+  "baremetalIpaDownloader": "registry.ci.openshift.org/openshift:ironic-ipa-downloader",
+  "baremetalMachineOsDownloader": "registry.ci.openshift.org/openshift:ironic-machine-os-downloader",
+  "baremetalStaticIpManager": "registry.ci.openshift.org/openshift:ironic-static-ip-manager"
 }