From 1dcfae9f0c154d16c60b8cabca4e8b44ff74bf99 Mon Sep 17 00:00:00 2001 From: dis Date: Thu, 10 Apr 2025 12:27:50 +0530 Subject: [PATCH 1/4] TEST: Reproduce OCPBUGS-23514 for CVO --- install/0000_80_machine-config_04_deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/0000_80_machine-config_04_deployment.yaml b/install/0000_80_machine-config_04_deployment.yaml index 42bddaa8de..ca7ad427a9 100644 --- a/install/0000_80_machine-config_04_deployment.yaml +++ b/install/0000_80_machine-config_04_deployment.yaml @@ -30,7 +30,7 @@ spec: args: - "start" - "--images-json=/etc/mco/images/images.json" - - "--payload-version=0.0.1-snapshot" + - "--payload-version=4.19.0-ec.2" - "--operator-image=placeholder.url.oc.will.replace.this.org/placeholdernamespace:machine-config-operator" resources: requests: @@ -38,7 +38,7 @@ spec: memory: 50Mi env: - name: RELEASE_VERSION - value: "0.0.1-snapshot" + value: "4.19.0-ec.2" terminationMessagePolicy: FallbackToLogsOnError volumeMounts: - name: images From dbb593b736670c3a39d24a75b10ec9493d382871 Mon Sep 17 00:00:00 2001 From: dis Date: Fri, 11 Apr 2025 08:18:02 +0530 Subject: [PATCH 2/4] update for cm image as well --- install/0000_80_machine-config_02_images.configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/0000_80_machine-config_02_images.configmap.yaml b/install/0000_80_machine-config_02_images.configmap.yaml index 8f9c67db1a..eb9858557f 100644 --- a/install/0000_80_machine-config_02_images.configmap.yaml +++ b/install/0000_80_machine-config_02_images.configmap.yaml @@ -10,7 +10,7 @@ metadata: data: images.json: > { - "releaseVersion": "0.0.1-snapshot", + "releaseVersion": "4.19.0-ec.2", "machineConfigOperator": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:machine-config-operator", "infraImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:pod", "keepalivedImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:keepalived-ipfailover", From 231c86a22ed2e14df4563ea74c204054da095be0 Mon Sep 17 00:00:00 2001 From: dis Date: Fri, 11 Apr 2025 15:22:57 +0530 Subject: [PATCH 3/4] update all entries under install --- install/0000_80_machine-config_05_osimageurl.yaml | 2 +- install/0000_80_machine-config_06_clusteroperator.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/0000_80_machine-config_05_osimageurl.yaml b/install/0000_80_machine-config_05_osimageurl.yaml index 255bf9658c..0c4a55cde3 100644 --- a/install/0000_80_machine-config_05_osimageurl.yaml +++ b/install/0000_80_machine-config_05_osimageurl.yaml @@ -8,7 +8,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" data: - releaseVersion: 0.0.1-snapshot + releaseVersion: 4.19.0-ec.2 # This (will eventually) replace the below when https://github.com/openshift/enhancements/pull/1032 # progresses towards the default. baseOSContainerImage: "placeholder.url.oc.will.replace.this.org/placeholdernamespace:rhel-coreos" diff --git a/install/0000_80_machine-config_06_clusteroperator.yaml b/install/0000_80_machine-config_06_clusteroperator.yaml index 6871b69f70..f4a675ce87 100644 --- a/install/0000_80_machine-config_06_clusteroperator.yaml +++ b/install/0000_80_machine-config_06_clusteroperator.yaml @@ -10,7 +10,7 @@ spec: {} status: versions: - name: operator - version: "0.0.1-snapshot" + version: "4.19.0-ec.2" - name: operator-image version: placeholder.url.oc.will.replace.this.org/placeholdernamespace:machine-config-operator relatedObjects: From 52b0f5194a892de59b8a9a4362f4b2f3df4e0999 Mon Sep 17 00:00:00 2001 From: dis Date: Fri, 11 Apr 2025 16:02:31 +0530 Subject: [PATCH 4/4] revert in CO manifest --- install/0000_80_machine-config_06_clusteroperator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/0000_80_machine-config_06_clusteroperator.yaml b/install/0000_80_machine-config_06_clusteroperator.yaml index f4a675ce87..6871b69f70 100644 --- a/install/0000_80_machine-config_06_clusteroperator.yaml +++ b/install/0000_80_machine-config_06_clusteroperator.yaml @@ -10,7 +10,7 @@ spec: {} status: versions: - name: operator - version: "4.19.0-ec.2" + version: "0.0.1-snapshot" - name: operator-image version: placeholder.url.oc.will.replace.this.org/placeholdernamespace:machine-config-operator relatedObjects: