Merge pull request openshift#11985 from openshift-bot/registry-replacer

Registry-Replacer autoupdate

Author: openshift-merge-robot

ci-operator/config/openshift-priv/cloud-provider-openstack/openshift-priv-cloud-provider-openstack-master.yaml

@@ -3,6 +3,10 @@ base_images:
     name: 4.6-priv
     namespace: ocp-private
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -17,6 +21,9 @@ images:
 - dockerfile_path: images/manila-csi-plugin/Dockerfile
   from: base
   inputs:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
     ocp_builder_rhel-8-golang-openshift-4.6:
       as:
       - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6

ci-operator/config/openshift-priv/cloud-provider-openstack/openshift-priv-cloud-provider-openstack-release-4.6.yaml

@@ -3,6 +3,10 @@ base_images:
     name: 4.6-priv
     namespace: ocp-private
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -17,6 +21,9 @@ images:
 - dockerfile_path: images/manila-csi-plugin/Dockerfile
   from: base
   inputs:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
     ocp_builder_rhel-8-golang-openshift-4.6:
       as:
       - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6

ci-operator/config/openshift-priv/cloud-provider-openstack/openshift-priv-cloud-provider-openstack-release-4.7.yaml

@@ -3,6 +3,10 @@ base_images:
     name: 4.7-priv
     namespace: ocp-private
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -17,6 +21,9 @@ images:
 - dockerfile_path: images/manila-csi-plugin/Dockerfile
   from: base
   inputs:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
     ocp_builder_rhel-8-golang-openshift-4.6:
       as:
       - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6

ci-operator/config/openshift-priv/csi-driver-manila-operator/openshift-priv-csi-driver-manila-operator-master.yaml

@@ -3,6 +3,10 @@ base_images:
     name: 4.6-priv
     namespace: ocp-private
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -18,9 +22,9 @@ images:
 - dockerfile_path: build/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: csi-driver-manila-operator
 promotion:
   name: 4.6-priv

ci-operator/config/openshift-priv/csi-driver-manila-operator/openshift-priv-csi-driver-manila-operator-release-4.6.yaml

@@ -3,6 +3,10 @@ base_images:
     name: 4.6-priv
     namespace: ocp-private
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -18,9 +22,9 @@ images:
 - dockerfile_path: build/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: csi-driver-manila-operator
 promotion:
   disabled: true

ci-operator/config/openshift-priv/csi-driver-manila-operator/openshift-priv-csi-driver-manila-operator-release-4.7.yaml

@@ -3,6 +3,10 @@ base_images:
     name: 4.7-priv
     namespace: ocp-private
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -18,9 +22,9 @@ images:
 - dockerfile_path: build/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: csi-driver-manila-operator
 promotion:
   name: 4.7-priv

ci-operator/config/openshift-priv/kube-state-metrics/openshift-priv-kube-state-metrics-master.yaml

@@ -3,6 +3,10 @@ base_images:
     name: 4.6-priv
     namespace: ocp-private
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -25,9 +29,9 @@ images:
 - dockerfile_path: Dockerfile.ocp
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: kube-state-metrics
 promotion:
   name: 4.6-priv

ci-operator/config/openshift-priv/kube-state-metrics/openshift-priv-kube-state-metrics-release-4.7.yaml

@@ -3,6 +3,10 @@ base_images:
     name: 4.7-priv
     namespace: ocp-private
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -25,9 +29,9 @@ images:
 - dockerfile_path: Dockerfile.ocp
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: kube-state-metrics
 promotion:
   name: 4.7-priv

ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-master.yaml

@@ -3,6 +3,10 @@ base_images:
     name: 4.6-priv
     namespace: ocp-private
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -25,9 +29,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: openshift-state-metrics
 promotion:
   name: 4.6-priv

ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.6.yaml

@@ -3,6 +3,10 @@ base_images:
     name: 4.6-priv
     namespace: ocp-private
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -25,9 +29,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: openshift-state-metrics
 promotion:
   disabled: true

ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.7.yaml

@@ -3,6 +3,10 @@ base_images:
     name: 4.7-priv
     namespace: ocp-private
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -25,9 +29,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: openshift-state-metrics
 promotion:
   name: 4.7-priv

ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.6.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -17,6 +21,9 @@ images:
 - dockerfile_path: images/manila-csi-plugin/Dockerfile
   from: base
   inputs:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
     ocp_builder_rhel-8-golang-openshift-4.6:
       as:
       - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6

ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.7.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.7"
     namespace: ocp
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -17,6 +21,9 @@ images:
 - dockerfile_path: images/manila-csi-plugin/Dockerfile
   from: base
   inputs:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
     ocp_builder_rhel-8-golang-openshift-4.6:
       as:
       - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6

ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml

@@ -11,6 +11,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.13
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -30,9 +34,9 @@ images:
 - dockerfile_path: images/cluster-capacity/Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: cluster-capacity
 promotion:
   name: "4.6"

ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.6.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -17,9 +21,9 @@ images:
 - dockerfile_path: build/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: csi-driver-manila-operator
 promotion:
   disabled: true

ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.7.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.7"
     namespace: ocp
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -17,9 +21,9 @@ images:
 - dockerfile_path: build/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: csi-driver-manila-operator
 promotion:
   name: "4.7"

ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.6.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -25,9 +29,9 @@ images:
 - dockerfile_path: Dockerfile.ocp
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: kube-state-metrics
 promotion:
   disabled: true