Update promotion dockerfiles to match ocp-build-data configuration

ci-operator/config/kube-reporting/ghostunnel/kube-reporting-ghostunnel-master.yaml

@@ -10,7 +10,8 @@ build_root:
     tag: golang-1.13
 canonical_go_repository: github.com/square/ghostunnel
 images:
-- from: base
+- dockerfile_path: Dockerfile.rhel
+  from: base
   to: ghostunnel
 promotion:
   name: "4.6"

ci-operator/config/kube-reporting/hadoop/kube-reporting-hadoop-master.yaml

@@ -9,7 +9,7 @@ build_root:
     namespace: openshift
     tag: golang-1.13
 images:
-- dockerfile_path: Dockerfile.okd
+- dockerfile_path: Dockerfile.rhel
   from: base
   to: metering-hadoop
 promotion:

ci-operator/config/kube-reporting/helm/kube-reporting-helm-master.yaml

@@ -10,7 +10,8 @@ build_root:
     tag: golang-1.13
 canonical_go_repository: k8s.io/helm
 images:
-- from: base
+- dockerfile_path: Dockerfile.rhel
+  from: base
   to: metering-helm
 promotion:
   name: "4.6"

ci-operator/config/kube-reporting/hive/kube-reporting-hive-master.yaml

@@ -9,7 +9,7 @@ build_root:
     namespace: openshift
     tag: golang-1.13
 images:
-- dockerfile_path: Dockerfile.okd
+- dockerfile_path: Dockerfile.rhel8
   from: metering-hadoop
   to: metering-hive
 promotion:

ci-operator/config/kube-reporting/metering-operator/kube-reporting-metering-operator-master.yaml

@@ -24,10 +24,10 @@ build_root:
     context_dir: .
     dockerfile_path: Dockerfile.src
 images:
-- dockerfile_path: Dockerfile.reporting-operator.okd
+- dockerfile_path: Dockerfile.reporting-operator.rhel
   from: base
   to: metering-reporting-operator
-- dockerfile_path: Dockerfile.metering-ansible-operator
+- dockerfile_path: Dockerfile.metering-ansible-operator.rhel8
   from: ansible-operator
   inputs:
     ocp_4.4_base:

ci-operator/config/kube-reporting/presto/kube-reporting-presto-master.yaml

@@ -7,7 +7,7 @@ build_root:
   project_image:
     dockerfile_path: Dockerfile.build
 images:
-- dockerfile_path: Dockerfile.okd
+- dockerfile_path: Dockerfile.rhel
   from: base
   to: metering-presto
 promotion:

ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-master.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_golang-1.13:
+    name: builder
+    namespace: ocp
+    tag: golang-1.13
   openshift_release_golang-1.13:
     name: release
     namespace: openshift
@@ -15,9 +19,12 @@ build_root:
     tag: golang-1.13
 canonical_go_repository: github.com/kubernetes-sigs/aws-ebs-csi-driver
 images:
-- dockerfile_path: Dockerfile.openshift
+- dockerfile_path: Dockerfile.openshift.rhel7
   from: base
   inputs:
+    ocp_builder_golang-1.13:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.13
     openshift_release_golang-1.13:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.13

ci-operator/config/openshift/builder/openshift-builder-master.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_golang-1.13:
+    name: builder
+    namespace: ocp
+    tag: golang-1.13
   openshift_release_golang-1.13:
     name: release
     namespace: openshift
@@ -13,8 +17,12 @@ build_root:
     namespace: openshift
     tag: golang-1.13
 images:
-- from: base
+- dockerfile_path: Dockerfile.rhel8
+  from: base
   inputs:
+    ocp_builder_golang-1.13:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.13
     openshift_release_golang-1.13:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.13

ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_golang-1.13:
+    name: builder
+    namespace: ocp
+    tag: golang-1.13
   openshift_release_golang-1.13:
     name: release
     namespace: openshift
@@ -14,9 +18,12 @@ build_root:
     namespace: openshift
     tag: golang-1.13
 images:
-- dockerfile_path: Dockerfile
+- dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
+    ocp_builder_golang-1.13:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.13
     openshift_release_golang-1.13:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.13

ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-master.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_golang-1.13:
+    name: builder
+    namespace: ocp
+    tag: golang-1.13
   openshift_release_golang-1.13:
     name: release
     namespace: openshift
@@ -15,9 +19,12 @@ build_root:
     tag: golang-1.13
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-openstack
 images:
-- dockerfile_path: Dockerfile
+- dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
+    ocp_builder_golang-1.13:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.13
     openshift_release_golang-1.13:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.13

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

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_golang-1.13:
+    name: builder
+    namespace: ocp
+    tag: golang-1.13
   openshift_release_golang-1.13:
     name: release
     namespace: openshift
@@ -14,9 +18,12 @@ build_root:
     namespace: openshift
     tag: golang-1.13
 images:
-- dockerfile_path: Dockerfile
+- dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
+    ocp_builder_golang-1.13:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.13
     openshift_release_golang-1.13:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.13

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

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_golang-1.12:
+    name: builder
+    namespace: ocp
+    tag: golang-1.12
   openshift_release_golang-1.12:
     name: release
     namespace: openshift
@@ -15,9 +19,12 @@ build_root:
     tag: golang-1.12
 canonical_go_repository: sigs.k8s.io/cluster-capacity
 images:
-- dockerfile_path: images/cluster-capacity/Dockerfile
+- dockerfile_path: images/cluster-capacity/Dockerfile.rhel7
   from: base
   inputs:
+    ocp_builder_golang-1.12:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.12
     openshift_release_golang-1.12:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.12

ci-operator/config/openshift/cluster-kube-descheduler-operator/openshift-cluster-kube-descheduler-operator-master.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_golang-1.13:
+    name: builder
+    namespace: ocp
+    tag: golang-1.13
   openshift_release_golang-1.13:
     name: release
     namespace: openshift
@@ -13,8 +17,12 @@ build_root:
     namespace: openshift
     tag: golang-1.13
 images:
-- from: base
+- dockerfile_path: Dockerfile.rhel7
+  from: base
   inputs:
+    ocp_builder_golang-1.13:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.13
     openshift_release_golang-1.13:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.13

ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_golang-1.13:
+    name: builder
+    namespace: ocp
+    tag: golang-1.13
   openshift_release_golang-1.13:
     name: release
     namespace: openshift
@@ -13,8 +17,12 @@ build_root:
     namespace: openshift
     tag: golang-1.13
 images:
-- from: base
+- dockerfile_path: Dockerfile.rhel7
+  from: base
   inputs:
+    ocp_builder_golang-1.13:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.13
     openshift_release_golang-1.13:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.13

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

@@ -7,6 +7,10 @@ base_images:
     name: test
     namespace: openshift-kni
     tag: dev-scripts
+  ocp_builder_golang-1.12:
+    name: builder
+    namespace: ocp
+    tag: golang-1.12
   openshift_release_golang-1.13:
     name: release
     namespace: openshift
@@ -18,9 +22,12 @@ build_root:
     namespace: openshift
     tag: golang-1.13
 images:
-- dockerfile_path: Dockerfile
+- dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
+    ocp_builder_golang-1.12:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.12
     openshift_release_golang-1.13:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.13

ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml

@@ -21,7 +21,7 @@ build_root:
     namespace: openshift
     tag: golang-1.14
 images:
-- dockerfile_path: Dockerfile.rhel7
+- dockerfile_path: Dockerfile.rhel8
   from: base
   inputs:
     ocp_4.6_base:

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

@@ -7,18 +7,25 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-7-golang-1.13
+  openshift_release_golang-1.13:
+    name: release
+    namespace: openshift
+    tag: golang-1.13
 build_root:
   image_stream_tag:
     name: release
     namespace: openshift
     tag: golang-1.13
 images:
-- dockerfile_path: Dockerfile.rhel7
+- dockerfile_path: Dockerfile
   from: base
   inputs:
     ocp_builder_rhel-7-golang-1.13:
       as:
       - registry.svc.ci.openshift.org/ocp/builder:rhel-7-golang-1.13
+    openshift_release_golang-1.13:
+      as:
+      - registry.svc.ci.openshift.org/openshift/release:golang-1.13
   to: cluster-samples-operator
 promotion:
   name: "4.6"

ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml

@@ -9,7 +9,8 @@ build_root:
     namespace: openshift
     tag: golang-1.10
 images:
-- from: base
+- dockerfile_path: Dockerfile.rhel
+  from: base
   to: cluster-update-keys
 promotion:
   name: "4.6"

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

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_golang-1.14:
+    name: builder
+    namespace: ocp
+    tag: golang-1.14
   openshift_release_golang-1.13:
     name: release
     namespace: openshift
@@ -17,8 +21,12 @@ build_root:
     namespace: openshift
     tag: golang-1.13
 images:
-- from: base
+- dockerfile_path: Dockerfile.rhel7
+  from: base
   inputs:
+    ocp_builder_golang-1.14:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.14
     openshift_release_golang-1.14:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.14

ci-operator/config/openshift/console/openshift-console-master.yaml

@@ -9,7 +9,8 @@ build_root:
     namespace: openshift
     tag: tectonic-console-builder-v20
 images:
-- from: base
+- dockerfile_path: Dockerfile.product
+  from: base
   to: console
 promotion:
   additional_images:

ci-operator/config/openshift/coredns/openshift-coredns-master.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ocp_builder_golang-1.12:
+    name: builder
+    namespace: ocp
+    tag: golang-1.12
   openshift_release_golang-1.12:
     name: release
     namespace: openshift
@@ -14,9 +18,12 @@ build_root:
     tag: golang-1.12
 canonical_go_repository: github.com/coredns/coredns
 images:
-- dockerfile_path: Dockerfile.openshift
+- dockerfile_path: Dockerfile.openshift.rhel7
   from: base
   inputs:
+    ocp_builder_golang-1.12:
+      as:
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.12
     openshift_release_golang-1.12:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.12