From e8d6ab0e64237398dedd72d9fb7c15c7503827b5 Mon Sep 17 00:00:00 2001 From: Aravindh Puthiyaparambil Date: Fri, 9 Sep 2022 12:56:35 -0700 Subject: [PATCH] wmco: remove golang 1.17 from base_images Master and 4.11 should only be using golang 1.18. --- ...indows-machine-config-operator-community-4.11__okd.yaml | 7 ------- .../openshift-windows-machine-config-operator-master.yaml | 7 ------- ...shift-windows-machine-config-operator-release-4.11.yaml | 7 ------- 3 files changed, 21 deletions(-) diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml index 191412af859f1..b05c9e432e1d8 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - name: builder - namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: name: release namespace: openshift @@ -14,9 +10,6 @@ build_root: images: - dockerfile_path: build/Dockerfile.ci inputs: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: as: - registry.ci.openshift.org/openshift/release:golang-1.18 diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml index c383541ed81d4..6fb4297b98b26 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - name: builder - namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: name: release namespace: openshift @@ -14,9 +10,6 @@ build_root: images: - dockerfile_path: build/Dockerfile.ci inputs: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: as: - registry.ci.openshift.org/openshift/release:golang-1.18 diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.11.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.11.yaml index 764205787c18a..3b6203644bf07 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.11.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.11.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - name: builder - namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: name: release namespace: openshift @@ -14,9 +10,6 @@ build_root: images: - dockerfile_path: build/Dockerfile.ci inputs: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: as: - registry.ci.openshift.org/openshift/release:golang-1.18