diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml index 35437faf4a89a..d280ce5f25a0c 100644 --- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml @@ -19,7 +19,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.13 + tag: rhel-8-release-golang-1.15-openshift-4.6 images: - from: base inputs: diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.6.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.6.yaml index d65b8ac936613..278388be859b3 100644 --- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.6.yaml +++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.6.yaml @@ -19,7 +19,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.13 + tag: rhel-8-release-golang-1.15-openshift-4.6 images: - from: base inputs: diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.7.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.7.yaml index 8eada161ebd6d..cfebf7be0b579 100644 --- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.7.yaml +++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.7.yaml @@ -19,7 +19,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.13 + tag: rhel-8-release-golang-1.15-openshift-4.6 images: - from: base inputs: diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml index 90a20ac6e34c6..d14083103283f 100644 --- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml @@ -19,7 +19,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.13 + tag: rhel-8-release-golang-1.15-openshift-4.6 images: - from: base inputs: diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.6.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.6.yaml index d9ed1ca278bd4..b2283318212a8 100644 --- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.6.yaml +++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.6.yaml @@ -19,7 +19,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.13 + tag: rhel-8-release-golang-1.15-openshift-4.6 images: - from: base inputs: diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.7.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.7.yaml index b333efda62de6..b8857b45a03f9 100644 --- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.7.yaml +++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.7.yaml @@ -19,7 +19,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.13 + tag: rhel-8-release-golang-1.15-openshift-4.6 images: - from: base inputs: diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml index ac48fd237d362..8669aa095cbf6 100644 --- a/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml +++ b/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml @@ -23,7 +23,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.12 + tag: rhel-8-release-golang-1.15-openshift-4.6 canonical_go_repository: github.com/coredns/coredns images: - dockerfile_path: Dockerfile.openshift.rhel7 diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.6.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.6.yaml index 0310b4791557c..fb9f8a2291c7d 100644 --- a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.6.yaml +++ b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.6.yaml @@ -23,7 +23,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.12 + tag: rhel-8-release-golang-1.15-openshift-4.6 canonical_go_repository: github.com/coredns/coredns images: - dockerfile_path: Dockerfile.openshift.rhel7 diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.7.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.7.yaml index 08cfde3dc2554..ba97a773dfba9 100644 --- a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.7.yaml +++ b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.7.yaml @@ -23,7 +23,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.12 + tag: rhel-8-release-golang-1.15-openshift-4.6 canonical_go_repository: github.com/coredns/coredns images: - dockerfile_path: Dockerfile.openshift.rhel7 diff --git a/ci-operator/config/openshift/router/openshift-router-master.yaml b/ci-operator/config/openshift/router/openshift-router-master.yaml index e75222c35ec44..9f9fbe0b6550b 100644 --- a/ci-operator/config/openshift/router/openshift-router-master.yaml +++ b/ci-operator/config/openshift/router/openshift-router-master.yaml @@ -27,7 +27,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-openshift-4.6 + tag: rhel-8-release-golang-1.15-openshift-4.6 images: - dockerfile_path: images/router/base/Dockerfile.rhel from: base diff --git a/ci-operator/config/openshift/router/openshift-router-release-4.6.yaml b/ci-operator/config/openshift/router/openshift-router-release-4.6.yaml index aec1cb28e4b58..6132a9cca5f04 100644 --- a/ci-operator/config/openshift/router/openshift-router-release-4.6.yaml +++ b/ci-operator/config/openshift/router/openshift-router-release-4.6.yaml @@ -27,7 +27,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-openshift-4.6 + tag: rhel-8-release-golang-1.15-openshift-4.6 images: - dockerfile_path: images/router/base/Dockerfile.rhel from: base diff --git a/ci-operator/config/openshift/router/openshift-router-release-4.7.yaml b/ci-operator/config/openshift/router/openshift-router-release-4.7.yaml index 505f7768ac558..2f9339900f13a 100644 --- a/ci-operator/config/openshift/router/openshift-router-release-4.7.yaml +++ b/ci-operator/config/openshift/router/openshift-router-release-4.7.yaml @@ -27,7 +27,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-openshift-4.6 + tag: rhel-8-release-golang-1.15-openshift-4.6 images: - dockerfile_path: images/router/base/Dockerfile.rhel from: base