From f0585c67818cfe9fe2b68bfe9cb4581f520bb0a8 Mon Sep 17 00:00:00 2001 From: Zenghui Shi Date: Fri, 17 Mar 2023 11:31:42 +0800 Subject: [PATCH] Update ovn-kubernetes to rhel9 based image Signed-off-by: Zenghui Shi --- assets/components/ovn/master/daemonset.yaml | 8 ++++---- assets/components/ovn/node/daemonset.yaml | 2 +- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- scripts/auto-rebase/rebase.sh | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/assets/components/ovn/master/daemonset.yaml b/assets/components/ovn/master/daemonset.yaml index df8858802e..ed0675fe29 100644 --- a/assets/components/ovn/master/daemonset.yaml +++ b/assets/components/ovn/master/daemonset.yaml @@ -44,7 +44,7 @@ spec: containers: # ovn-northd: convert network objects in nbdb to flows in sbdb - name: northd - image: {{ .ReleaseImage.ovn_kubernetes_microshift }} + image: {{ .ReleaseImage.ovn_kubernetes_microshift_rhel_9 }} command: - /bin/bash - -c @@ -97,7 +97,7 @@ spec: # nbdb: the northbound, or logical network object DB. In raft mode - name: nbdb - image: {{ .ReleaseImage.ovn_kubernetes_microshift }} + image: {{ .ReleaseImage.ovn_kubernetes_microshift_rhel_9 }} command: - /bin/bash - -c @@ -223,7 +223,7 @@ spec: # sbdb: The southbound, or flow DB. In raft mode - name: sbdb - image: {{ .ReleaseImage.ovn_kubernetes_microshift }} + image: {{ .ReleaseImage.ovn_kubernetes_microshift_rhel_9 }} command: - /bin/bash - -c @@ -315,7 +315,7 @@ spec: # ovnkube master: convert kubernetes objects in to nbdb logical network components - name: ovnkube-master - image: {{ .ReleaseImage.ovn_kubernetes_microshift }} + image: {{ .ReleaseImage.ovn_kubernetes_microshift_rhel_9 }} command: - /bin/bash - -c diff --git a/assets/components/ovn/node/daemonset.yaml b/assets/components/ovn/node/daemonset.yaml index 7e7cf95137..3b7862df36 100644 --- a/assets/components/ovn/node/daemonset.yaml +++ b/assets/components/ovn/node/daemonset.yaml @@ -40,7 +40,7 @@ spec: containers: # ovn-controller: programs the vswitch with flows from the sbdb - name: ovn-controller - image: {{ .ReleaseImage.ovn_kubernetes_microshift }} + image: {{ .ReleaseImage.ovn_kubernetes_microshift_rhel_9 }} command: - /bin/bash - -c diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 15819cd324..09ce9239fe 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02d85404d7e0040487cf5a1741a68cb287e67805cf62687601c7dced17af3039", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07d87fe9cf8bc03412ceaf1312873ee0eac1f9c95bca5f731db5e5d540392c0d", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad6a1b1a01f928dad3ed9b1d1288c4d5e665868c1713ca54c64ff21ebe4fb8ca", + "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad6a1b1a01f928dad3ed9b1d1288c4d5e665868c1713ca54c64ff21ebe4fb8ca", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:356f2fa7e4f7bb22a1a5a9797a2eee57ec31a4b28d7d9802b89174b009fda1f1", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31c6c8d0d309d32b13cfcc18eb7236762e2ba7fcb71ed539eec2200e6630ba39", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index d845881a9f..3920b29316 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:adcdbff7f3bf4c5b27557d9b74401be60a771d691f723857da8fe34fcb016f21", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3a21964b446ad1febcdb5e8469938a42a6036baa529cc24b670b839b4c2edc7", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ab6561dbe5a00a9b96e1c29818d8376c8e871e6757875c9cf7f48e333425065", + "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ab6561dbe5a00a9b96e1c29818d8376c8e871e6757875c9cf7f48e333425065", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98ab12770309ac075fbfa617028d5ba800294309b8ec64f9ab9a2170cb90e17a", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1638cbed9207a1cc2f84af5e0c4f70f47140028c7d0154fbdc9d594dedf29062", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", diff --git a/scripts/auto-rebase/rebase.sh b/scripts/auto-rebase/rebase.sh index d6a468e4e1..1db61f9e68 100755 --- a/scripts/auto-rebase/rebase.sh +++ b/scripts/auto-rebase/rebase.sh @@ -641,13 +641,13 @@ update_images() { "${REPOROOT}/packaging/crio.conf.d/microshift_${goarch}.conf" done - # 2023-03-02: Freeze ovn-kubernetes-microshift to avoid using image "double metrics registration panic" issue + # 2023-03-02: Freeze ovn-kubernetes-microshift-rhel-9 to avoid using image "double metrics registration panic" issue # TODO: Remove when issue is fixed - jq -e '.images."ovn-kubernetes-microshift" = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ab6561dbe5a00a9b96e1c29818d8376c8e871e6757875c9cf7f48e333425065"' \ + jq -e '.images."ovn-kubernetes-microshift-rhel-9" = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ab6561dbe5a00a9b96e1c29818d8376c8e871e6757875c9cf7f48e333425065"' \ "${REPOROOT}/assets/release/release-x86_64.json" > "${REPOROOT}/assets/release/release-x86_64.json.tmp" mv "${REPOROOT}/assets/release/release-x86_64.json.tmp" "${REPOROOT}/assets/release/release-x86_64.json" - jq -e '.images."ovn-kubernetes-microshift" = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad6a1b1a01f928dad3ed9b1d1288c4d5e665868c1713ca54c64ff21ebe4fb8ca"' \ + jq -e '.images."ovn-kubernetes-microshift-rhel-9" = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad6a1b1a01f928dad3ed9b1d1288c4d5e665868c1713ca54c64ff21ebe4fb8ca"' \ "${REPOROOT}/assets/release/release-aarch64.json" > "${REPOROOT}/assets/release/release-aarch64.json.tmp" mv "${REPOROOT}/assets/release/release-aarch64.json.tmp" "${REPOROOT}/assets/release/release-aarch64.json"