From 0cd95db4c338cccc0dc751911b73e5404c5cbed8 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Tue, 30 Jan 2024 12:07:00 +0000 Subject: [PATCH] ci-operator-config-mirror --config-dir ./ci-operator/config --to-org openshift-priv --only-org openshift --whitelist-file ./core-services/openshift-priv/_whitelist.yaml --- ...v-cluster-api-provider-openstack-main.yaml | 18 ++++---- ...riv-cluster-api-provider-ovirt-master.yaml | 8 ++++ ...uster-api-provider-ovirt-release-4.10.yaml | 8 ++++ ...uster-api-provider-ovirt-release-4.11.yaml | 8 ++++ ...uster-api-provider-ovirt-release-4.12.yaml | 8 ++++ ...uster-api-provider-ovirt-release-4.13.yaml | 8 ++++ ...uster-api-provider-ovirt-release-4.14.yaml | 8 ++++ ...uster-api-provider-ovirt-release-4.15.yaml | 8 ++++ ...uster-api-provider-ovirt-release-4.16.yaml | 8 ++++ ...uster-api-provider-ovirt-release-4.17.yaml | 8 ++++ ...luster-api-provider-ovirt-release-4.8.yaml | 4 ++ ...luster-api-provider-ovirt-release-4.9.yaml | 4 ++ ...hift-priv-cluster-nfd-operator-master.yaml | 4 ++ ...riv-cluster-nfd-operator-release-4.10.yaml | 4 ++ ...riv-cluster-nfd-operator-release-4.11.yaml | 4 ++ ...riv-cluster-nfd-operator-release-4.12.yaml | 4 ++ ...riv-cluster-nfd-operator-release-4.13.yaml | 4 ++ ...riv-cluster-nfd-operator-release-4.14.yaml | 4 ++ ...riv-cluster-nfd-operator-release-4.15.yaml | 4 ++ ...riv-cluster-nfd-operator-release-4.16.yaml | 4 ++ ...riv-cluster-nfd-operator-release-4.17.yaml | 4 ++ ...priv-cluster-nfd-operator-release-4.9.yaml | 4 ++ ...ft-priv-insights-operator-release-4.7.yaml | 4 ++ .../openshift-priv-kubernetes-master.yaml | 44 ++++++++++--------- ...ift-priv-oauth-apiserver-release-4.15.yaml | 4 +- 25 files changed, 159 insertions(+), 31 deletions(-) diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-main.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-main.yaml index 011d860eb136..ee48d5d2f8b7 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-main.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-main.yaml @@ -1,12 +1,12 @@ base_images: - ocp_4.15_base: - name: "4.15" - namespace: ocp + ocp_4.16_base: + name: 4.16-priv + namespace: ocp-private tag: base - ocp_builder_rhel-8-golang-1.20-openshift-4.15: + ocp_builder_rhel-8-golang-1.21-openshift-4.16: name: builder namespace: ocp - tag: rhel-8-golang-1.20-openshift-4.15 + tag: rhel-8-golang-1.21-openshift-4.16 binary_build_commands: make build build_root: from_repository: true @@ -14,12 +14,12 @@ canonical_go_repository: sigs.k8s.io/cluster-api-provider-openstack images: - dockerfile_path: Dockerfile.rhel inputs: - ocp_4.15_base: + ocp_4.16_base: as: - - registry.ci.openshift.org/ocp/4.15:base - ocp_builder_rhel-8-golang-1.20-openshift-4.15: + - registry.ci.openshift.org/ocp/4.16:base + ocp_builder_rhel-8-golang-1.21-openshift-4.16: as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 to: openstack-cluster-api-controllers promotion: to: diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml index e733a197bf6a..c04217392f41 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.16_base-rhel9: name: 4.16-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.20-openshift-4.16 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml index 210a9e7edf8e..290aaab8191a 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.10-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.17-openshift-4.10 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml index 0f0ffda411fb..0ec7ae533d66 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.11-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.18-openshift-4.11 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml index d704477fdfac..0390bc7028d1 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.12-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.19-openshift-4.12 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml index 025ae06d4349..64226bde06f0 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.13-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.19-openshift-4.13 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml index ca5c5b27cf9f..cfe46d17ceb0 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.14-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.20-openshift-4.14 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml index ff9fd964b7d6..18a391765909 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.14_base: name: 4.14-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.20-openshift-4.14 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml index ae8162611d5f..227216aeec63 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.16_base-rhel9: name: 4.16-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.20-openshift-4.16 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml index 997d314561c8..8177dfd11ac8 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.16_base-rhel9: name: 4.17-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.20-openshift-4.16 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml index 134e14bbc6e2..5962c0fb235f 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.8-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml index 0579ca8abae8..711968949777 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.9-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml index ddc330a476c5..fa3d7bfaf40a 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml @@ -1,4 +1,8 @@ base_images: + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_4.16_base-rhel9: name: 4.16-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml index 6d04309cf5be..d0cee1215afd 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml @@ -3,6 +3,10 @@ base_images: name: 4.10-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml index 13b7086beb03..b2c1355a584c 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml @@ -3,6 +3,10 @@ base_images: name: 4.11-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.18-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml index 0a9329576e3d..57b2210112ba 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml @@ -3,6 +3,10 @@ base_images: name: 4.12-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.19-openshift-4.12: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml index badd8f918626..d22256399f68 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml @@ -3,6 +3,10 @@ base_images: name: 4.13-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.19-openshift-4.13: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml index 0b2012dd336e..3a6a70cec0a0 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml @@ -3,6 +3,10 @@ base_images: name: 4.14-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.20-openshift-4.14: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml index b571764d4475..79a15f63c11d 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml @@ -1,4 +1,8 @@ base_images: + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_4.15_base-rhel9: name: 4.15-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml index a634eadecdce..29a0ae7b24cb 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml @@ -1,4 +1,8 @@ base_images: + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_4.16_base-rhel9: name: 4.16-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml index a373a8478030..612dc50c6b6d 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml @@ -1,4 +1,8 @@ base_images: + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_4.16_base-rhel9: name: 4.17-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml index b91b3cf5321b..ef2e666b29cb 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml @@ -3,6 +3,10 @@ base_images: name: 4.9-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.16-openshift-4.9: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml index 6b8490752fc1..3bc800cf3806 100644 --- a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml +++ b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml @@ -3,6 +3,10 @@ base_images: name: 4.7-priv namespace: ocp-private tag: base + insights-operator-tests: + name: insights-operator-tests + namespace: ci + tag: latest ocp_builder_rhel-8-golang-1.15-openshift-4.7: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml index bdbc0f1e102c..98dd2a314a17 100644 --- a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml +++ b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml @@ -27,18 +27,22 @@ base_images: name: 4.16-priv namespace: ocp-private tag: oc-rpms - ocp_4.13_tools: - name: "4.13" - namespace: ocp + ocp_4.16_base-rhel9: + name: 4.16-priv + namespace: ocp-private + tag: base-rhel9 + ocp_4.16_tools: + name: 4.16-priv + namespace: ocp-private tag: tools - ocp_4.14_base: - name: "4.14" + ocp_builder_rhel-8-golang-1.21-openshift-4.16: + name: builder namespace: ocp - tag: base - ocp_builder_rhel-8-golang-1.20-openshift-4.14: + tag: rhel-8-golang-1.21-openshift-4.16 + ocp_builder_rhel-9-golang-1.21-openshift-4.16: name: builder namespace: ocp - tag: rhel-8-golang-1.20-openshift-4.14 + tag: rhel-9-golang-1.21-openshift-4.16 rhel-coreos-base: name: 4.16-priv namespace: ocp-private @@ -54,21 +58,21 @@ canonical_go_repository: k8s.io/kubernetes images: - dockerfile_path: openshift-hack/images/hyperkube/Dockerfile.rhel inputs: - ocp_4.14_base: + ocp_4.16_base-rhel9: as: - - registry.ci.openshift.org/ocp/4.14:base - ocp_builder_rhel-8-golang-1.20-openshift-4.14: + - registry.ci.openshift.org/ocp/4.16:base-rhel9 + ocp_builder_rhel-9-golang-1.21-openshift-4.16: as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 to: hyperkube - dockerfile_path: openshift-hack/images/tests/Dockerfile.rhel inputs: - ocp_4.13_tools: + ocp_4.16_tools: as: - - registry.svc.ci.openshift.org/ocp/4.13:tools - ocp_builder_rhel-8-golang-1.20-openshift-4.14: + - registry.ci.openshift.org/ocp/4.16:tools + ocp_builder_rhel-8-golang-1.21-openshift-4.16: as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 to: kubernetes-tests - context_dir: openshift-hack/images/os/ inputs: @@ -102,12 +106,12 @@ images: - context_dir: build/pause dockerfile_path: Dockerfile.Rhel inputs: - ocp_4.14_base: + ocp_4.16_base-rhel9: as: - - registry.ci.openshift.org/ocp/4.14:base - ocp_builder_rhel-8-golang-1.20-openshift-4.14: + - registry.ci.openshift.org/ocp/4.16:base-rhel9 + ocp_builder_rhel-9-golang-1.21-openshift-4.16: as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 to: pod promotion: to: diff --git a/ci-operator/config/openshift-priv/oauth-apiserver/openshift-priv-oauth-apiserver-release-4.15.yaml b/ci-operator/config/openshift-priv/oauth-apiserver/openshift-priv-oauth-apiserver-release-4.15.yaml index db5bab06d544..4155b0e53f60 100644 --- a/ci-operator/config/openshift-priv/oauth-apiserver/openshift-priv-oauth-apiserver-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/oauth-apiserver/openshift-priv-oauth-apiserver-release-4.15.yaml @@ -1,7 +1,7 @@ base_images: ocp_4.15_base-rhel9: - name: "4.15" - namespace: ocp + name: 4.15-priv + namespace: ocp-private tag: base-rhel9 ocp_builder_rhel-9-golang-1.20-openshift-4.15: name: builder