diff --git a/ci-operator/config/kube-reporting/ghostunnel/kube-reporting-ghostunnel-master.yaml b/ci-operator/config/kube-reporting/ghostunnel/kube-reporting-ghostunnel-master.yaml index cf647df7c6da8..e5ba5dd6f8088 100644 --- a/ci-operator/config/kube-reporting/ghostunnel/kube-reporting-ghostunnel-master.yaml +++ b/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" diff --git a/ci-operator/config/kube-reporting/hadoop/kube-reporting-hadoop-master.yaml b/ci-operator/config/kube-reporting/hadoop/kube-reporting-hadoop-master.yaml index e2ba96e7da999..4a43d9ceeae66 100644 --- a/ci-operator/config/kube-reporting/hadoop/kube-reporting-hadoop-master.yaml +++ b/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: diff --git a/ci-operator/config/kube-reporting/helm/kube-reporting-helm-master.yaml b/ci-operator/config/kube-reporting/helm/kube-reporting-helm-master.yaml index c09e7cf55d269..657c5434f9e38 100644 --- a/ci-operator/config/kube-reporting/helm/kube-reporting-helm-master.yaml +++ b/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" diff --git a/ci-operator/config/kube-reporting/hive/kube-reporting-hive-master.yaml b/ci-operator/config/kube-reporting/hive/kube-reporting-hive-master.yaml index 88645dd28fdbf..1793c11645aa9 100644 --- a/ci-operator/config/kube-reporting/hive/kube-reporting-hive-master.yaml +++ b/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: diff --git a/ci-operator/config/kube-reporting/metering-operator/kube-reporting-metering-operator-master.yaml b/ci-operator/config/kube-reporting/metering-operator/kube-reporting-metering-operator-master.yaml index 7e9c5d796c261..ee53b74d6aba2 100644 --- a/ci-operator/config/kube-reporting/metering-operator/kube-reporting-metering-operator-master.yaml +++ b/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: diff --git a/ci-operator/config/kube-reporting/presto/kube-reporting-presto-master.yaml b/ci-operator/config/kube-reporting/presto/kube-reporting-presto-master.yaml index 00572123c28cd..afa8b9f4dd3cf 100644 --- a/ci-operator/config/kube-reporting/presto/kube-reporting-presto-master.yaml +++ b/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: diff --git a/ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-master.yaml b/ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-master.yaml index 5d78aee545c5c..0df700f9a404f 100644 --- a/ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-master.yaml +++ b/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 diff --git a/ci-operator/config/openshift/builder/openshift-builder-master.yaml b/ci-operator/config/openshift/builder/openshift-builder-master.yaml index 5af45005c2a93..eb2973180bab2 100644 --- a/ci-operator/config/openshift/builder/openshift-builder-master.yaml +++ b/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 diff --git a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml index 72cde2d45b85e..c6f80d9529373 100644 --- a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml +++ b/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 diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-master.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-master.yaml index 85951a5d6253e..fd570c95d9ebd 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-master.yaml +++ b/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 diff --git a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-master.yaml b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-master.yaml index a88e9ec36aba2..e39203811e924 100644 --- a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-master.yaml +++ b/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 diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml index 6500243a00678..69b2338b3005b 100644 --- a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml +++ b/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 diff --git a/ci-operator/config/openshift/cluster-kube-descheduler-operator/openshift-cluster-kube-descheduler-operator-master.yaml b/ci-operator/config/openshift/cluster-kube-descheduler-operator/openshift-cluster-kube-descheduler-operator-master.yaml index fad452741b18c..3976eaac0bfa3 100644 --- a/ci-operator/config/openshift/cluster-kube-descheduler-operator/openshift-cluster-kube-descheduler-operator-master.yaml +++ b/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 diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml index 8f7a05834b966..d75dc0b12de98 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml +++ b/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 diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml index a88dee42aacfa..7ec6f47fc5c5e 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml +++ b/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 diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml index e14cf1aae516b..e62e7fc4e2644 100644 --- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml +++ b/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: diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml index ba4456a9d57a2..f61ab1ccb6f91 100644 --- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml +++ b/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" diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml index febdd70d91ca1..a760186bd6728 100644 --- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml +++ b/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" diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml index eeea5341f700d..a67e37f65c425 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml +++ b/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 diff --git a/ci-operator/config/openshift/console/openshift-console-master.yaml b/ci-operator/config/openshift/console/openshift-console-master.yaml index aa0439c55e658..5dc457450932a 100644 --- a/ci-operator/config/openshift/console/openshift-console-master.yaml +++ b/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: diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml index 41fd3b919925e..1adba479dfb5f 100644 --- a/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml +++ b/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 diff --git a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-master.yaml b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-master.yaml index 0b0a0704cd56e..a4b9c48fe020e 100644 --- a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-master.yaml +++ b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-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: tag: golang-1.13 canonical_go_repository: github.com/kubernetes-csi/external-attacher 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 diff --git a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-master.yaml b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-master.yaml index 1332da2c7586f..b0e0bfb5a0552 100644 --- a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-master.yaml +++ b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-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: tag: golang-1.13 canonical_go_repository: github.com/kubernetes-csi/external-provisioner 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 diff --git a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-master.yaml b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-master.yaml index 6d73e8e7291ad..8d6cc34e4a063 100644 --- a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-master.yaml +++ b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-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 @@ -21,9 +25,12 @@ images: as: - registry.svc.ci.openshift.org/openshift/release:golang-1.13 to: csi-external-snapshotter -- dockerfile_path: Dockerfile.snapshot-controller.openshift +- dockerfile_path: Dockerfile.snapshot-controller.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 diff --git a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-master.yaml b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-master.yaml index 5a9acd06d7d0d..6f8c9893d1859 100644 --- a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-master.yaml +++ b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-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: tag: golang-1.13 canonical_go_repository: github.com/kubernetes-csi/livenessprobe 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 diff --git a/ci-operator/config/openshift/descheduler/openshift-descheduler-master.yaml b/ci-operator/config/openshift/descheduler/openshift-descheduler-master.yaml index fa2687618f68f..5a817379d405b 100644 --- a/ci-operator/config/openshift/descheduler/openshift-descheduler-master.yaml +++ b/ci-operator/config/openshift/descheduler/openshift-descheduler-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/descheduler images: -- dockerfile_path: images/descheduler/Dockerfile.origin +- dockerfile_path: images/descheduler/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 diff --git a/ci-operator/config/openshift/image-registry/openshift-image-registry-master.yaml b/ci-operator/config/openshift/image-registry/openshift-image-registry-master.yaml index cca495f2cfc53..0bc216eb31321 100644 --- a/ci-operator/config/openshift/image-registry/openshift-image-registry-master.yaml +++ b/ci-operator/config/openshift/image-registry/openshift-image-registry-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 diff --git a/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml b/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml index ceadeea2acc96..e18eda9ba0fab 100644 --- a/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml +++ b/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml @@ -9,7 +9,7 @@ build_root: namespace: openshift tag: golang-1.10 images: -- dockerfile_path: Dockerfile.rhel7 +- dockerfile_path: 2/Dockerfile.rhel8 from: base inputs: src: @@ -17,7 +17,7 @@ images: - destination_dir: . source_path: /go/src/github.com/openshift/jenkins/2/. to: jenkins -- dockerfile_path: Dockerfile.rhel7 +- dockerfile_path: slave-base/Dockerfile.rhel8 from: base inputs: src: @@ -25,7 +25,7 @@ images: - destination_dir: . source_path: /go/src/github.com/openshift/jenkins/slave-base/. to: jenkins-agent-base -- dockerfile_path: Dockerfile.rhel7 +- dockerfile_path: agent-maven-3.5/Dockerfile.rhel8 from: jenkins-agent-base inputs: src: @@ -33,7 +33,7 @@ images: - destination_dir: . source_path: /go/src/github.com/openshift/jenkins/agent-maven-3.5/. to: jenkins-agent-maven -- dockerfile_path: Dockerfile.rhel7 +- dockerfile_path: agent-nodejs-8/Dockerfile.rhel7 from: jenkins-agent-base inputs: src: diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-master.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-master.yaml index cf6a89877c1ed..d6aaad94d7e33 100644 --- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-master.yaml +++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-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.12: name: release namespace: openshift @@ -23,9 +27,12 @@ build_root: tag: golang-1.13 canonical_go_repository: k8s.io/autoscaler images: -- dockerfile_path: images/cluster-autoscaler/Dockerfile +- dockerfile_path: images/cluster-autoscaler/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 diff --git a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml index 8f6af03cf2e49..ed5608c14e508 100644 --- a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml +++ b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml @@ -19,7 +19,7 @@ build_root: tag: golang-1.13 canonical_go_repository: github.com/kubernetes-sigs/kube-storage-version-migrator images: -- dockerfile_path: images/ci/Dockerfile +- dockerfile_path: images/release/Dockerfile from: base inputs: openshift_release_golang-1.13: diff --git a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-master.yaml b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-master.yaml index 4f6c1768bb56e..1836f5ca12a63 100644 --- a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-master.yaml +++ b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-master.yaml @@ -18,10 +18,10 @@ images: from: src optional: true to: kuryr-tester -- dockerfile_path: openshift-kuryr-cni-ci-rhel8.Dockerfile +- dockerfile_path: openshift-kuryr-cni-rhel8.Dockerfile from: rpm-os to: kuryr-cni -- dockerfile_path: openshift-kuryr-controller-ci-rhel8.Dockerfile +- dockerfile_path: openshift-kuryr-controller-rhel8.Dockerfile from: rpm-os to: kuryr-controller promotion: diff --git a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-master.yaml b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-master.yaml index 712a87a92dbcf..521c8933e1e17 100644 --- a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-master.yaml +++ b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-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,16 +17,22 @@ 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 to: local-storage-operator -- dockerfile_path: Dockerfile.diskmaker +- dockerfile_path: Dockerfile.diskmaker.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 diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml index e4885802350cf..fb48f0d882608 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml @@ -7,6 +7,10 @@ base_images: name: test namespace: openshift-kni tag: dev-scripts + ocp_builder_golang-1.13: + name: builder + namespace: ocp + tag: golang-1.13 openshift_release_golang-1.13: name: release namespace: openshift @@ -18,8 +22,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 diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml index 8e1f48f37beb4..78ef00bd45ef7 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml @@ -7,6 +7,10 @@ base_images: name: test namespace: openshift-kni tag: dev-scripts + ocp_builder_golang-1.13: + name: builder + namespace: ocp + tag: golang-1.13 openshift_release_golang-1.13: name: release namespace: openshift @@ -17,9 +21,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 diff --git a/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml b/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml index abbe3e4f8f04b..68e9275fd4282 100644 --- a/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml +++ b/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml @@ -3,6 +3,10 @@ base_images: name: "4.6" namespace: ocp tag: cli + 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: namespace: openshift tag: golang-1.12 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.12: as: - registry.svc.ci.openshift.org/openshift/release:golang-1.12 diff --git a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-master.yaml b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-master.yaml index 27f7e7430a982..ff1125dee7b9c 100644 --- a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-master.yaml +++ b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-master.yaml @@ -3,6 +3,10 @@ base_images: name: "4.6" namespace: ocp tag: base + ocp_builder_golang-1.10: + name: builder + namespace: ocp + tag: golang-1.10 openshift_release_golang-1.10: name: release namespace: openshift @@ -13,8 +17,12 @@ build_root: namespace: openshift tag: golang-1.10 images: -- from: base +- dockerfile_path: Dockerfile.rhel7 + from: base inputs: + ocp_builder_golang-1.10: + as: + - registry.svc.ci.openshift.org/ocp/builder:golang-1.10 openshift_release_golang-1.10: as: - registry.svc.ci.openshift.org/openshift/release:golang-1.10 diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml index 2d4efb46b9a91..70755be3121ae 100644 --- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml +++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml @@ -14,7 +14,7 @@ build_root: namespace: openshift tag: golang-1.13 images: -- dockerfile_path: Dockerfile.rhel7 +- dockerfile_path: Dockerfile from: base inputs: openshift_release_golang-1.13: diff --git a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-master.yaml b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-master.yaml index 528572a5f1806..dc3d6a2b94fb7 100644 --- a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-master.yaml +++ b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-master.yaml @@ -16,10 +16,10 @@ images: - dockerfile_path: ci/dockerfiles/builder.Dockerfile from: root to: osdk-builder -- dockerfile_path: release/ansible/upstream.Dockerfile +- dockerfile_path: release/ansible/Dockerfile.rhel8 from: os to: ansible-operator -- dockerfile_path: release/helm/upstream.Dockerfile +- dockerfile_path: release/helm/Dockerfile from: os-minimal to: helm-operator - dockerfile_path: ci/dockerfiles/ansible-e2e.Dockerfile diff --git a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml index 9f1c8a28dadbb..34b6dc14db4c6 100644 --- a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml +++ b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml @@ -39,12 +39,10 @@ images: dockerfile_path: Dockerfile from: ubi7-ruby25 to: logging-fluentd -- context_dir: elasticsearch/ - dockerfile_path: Dockerfile.origin +- dockerfile_path: elasticsearch/Dockerfile.rhel8 from: ubi7 to: logging-elasticsearch6 -- context_dir: kibana/ - dockerfile_path: Dockerfile +- dockerfile_path: kibana/Dockerfile.rhel8 from: ubi7-nodejs10 to: logging-kibana6 - context_dir: curator/ diff --git a/ci-operator/config/openshift/router/openshift-router-master.yaml b/ci-operator/config/openshift/router/openshift-router-master.yaml index ad43e1aeefe22..2351fb0bb148f 100644 --- a/ci-operator/config/openshift/router/openshift-router-master.yaml +++ b/ci-operator/config/openshift/router/openshift-router-master.yaml @@ -21,7 +21,7 @@ images: - registry.svc.ci.openshift.org/openshift/release:golang-1.13 optional: true to: base-router -- dockerfile_path: images/router/haproxy/Dockerfile +- dockerfile_path: images/router/haproxy/Dockerfile.rhel8 from: base-router to: haproxy-router - dockerfile_path: images/router/f5/Dockerfile diff --git a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-master.yaml b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-master.yaml index 730c33b5c08be..25d754dfa5c6d 100644 --- a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-master.yaml +++ b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-master.yaml @@ -15,7 +15,8 @@ build_root: tag: golang-1.10 canonical_go_repository: github.com/kubernetes-incubator/service-catalog images: -- from: base +- dockerfile_path: images/service-catalog/Dockerfile + from: base inputs: openshift_release_golang-1.10: as: diff --git a/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-master.yaml b/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-master.yaml index 4dc55d86586d5..9d81bad7fcfd5 100644 --- a/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-master.yaml +++ b/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-master.yaml @@ -18,7 +18,7 @@ build_root: tag: golang-1.11 canonical_go_repository: sigs.k8s.io/sig-storage-local-static-provisioner images: -- dockerfile_path: Dockerfile.openshift +- dockerfile_path: Dockerfile.rhel7 from: base inputs: openshift_release_golang-1.13: diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml index 06b0e5c69e6f3..2b2d484f68f16 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml @@ -3,6 +3,10 @@ base_images: name: "4.6" namespace: ocp tag: base + ocp_builder_golang-1.10: + name: builder + namespace: ocp + tag: golang-1.10 openshift_release_golang-1.10: name: release namespace: openshift @@ -13,8 +17,12 @@ build_root: namespace: openshift tag: golang-1.10 images: -- from: base +- dockerfile_path: Dockerfile.rhel7 + from: base inputs: + ocp_builder_golang-1.10: + as: + - registry.svc.ci.openshift.org/ocp/builder:golang-1.10 openshift_release_golang-1.10: as: - registry.svc.ci.openshift.org/openshift/release:golang-1.10