MCO-1282: Remove all code related to the Image Registry workaround Config Map #5093

CourtCourt521 · 2025-05-29T20:17:34Z

- What I did

Removed all code and related alerts for the Image Registry Workaround (PR#4514 and PR#4139) due to NodeDisruptionPolicy going GA.

- How to verify it

// Apply imagecontentsourcepolicy

apiVersion: operator.openshift.io/v1alpha1
kind: ImageContentSourcePolicy
metadata:
  name: quay-mirror
spec:
  repositoryDigestMirrors:
  - mirrors:
    - my-quay.io.mirror
    source: quay.io
    
cruhm@cruhm-thinkpadp16vgen1:~$ vim imagecontent.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc create -f imagecontent.yaml 
imagecontentsourcepolicy.operator.openshift.io/quay-mirror created

// Apply override config map

apiVersion: v1
kind: ConfigMap
metadata:
  name: image-registry-override-drain
  namespace: openshift-machine-config-operator
  
cruhm@cruhm-thinkpadp16vgen1:~$ vim override.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc apply -f override.yaml 
configmap/image-registry-override-drain created

// Wait for the initial MCP rollover to finish. Check to make sure that the MCODrainOverrideConfigMapAlert exists and no longer fires

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$ oc get configmap prometheus-k8s-rulefiles-0 -o yaml | grep MCODrainOverrideConfigMapAlert

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$

// Delete the ImageContentSourcePolicy. You should see the MCP rollover again even with the override file present.

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   True      False      False      3              3                   3                     0                      65m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   True      False      False      3              3                   3                     0                      65m

$ oc delete ImageContentSourcePolicy quay-mirror

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp 
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   False     True       False      3              0                   0                     0                      66m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   False     True       False      3              0                   0                     0                      66m

- Description for the changelog

Remove all code related to the Image Registry workaround Config Map

openshift-ci-robot · 2025-05-29T20:17:39Z

@CourtCourt521: This pull request references MCO-1282 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

In response to this:

- What I did

Removed all code and related alerts for the Image Registry Workaround due to NodeDisruptionPolicy going GA.

- How to verify it

WIP

- Description for the changelog
Remove all code related to the Image Registry workaround Config Map

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci · 2025-05-29T20:17:41Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

CourtCourt521 · 2025-05-30T21:24:11Z

TESTING

// Before applying imagecontent and workaround

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$ oc get mcp
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-1cd832161bba7432ba209f4f88f2ccb2   True      False      False      3              3                   3                     0                      61m
worker   rendered-worker-0d2fc42c24be368229abfd9b1d42f132   True      False      False      3              3                   3                     0                      61m

// Apply imagecontentsourcepolicy

apiVersion: operator.openshift.io/v1alpha1
kind: ImageContentSourcePolicy
metadata:
  name: quay-mirror
spec:
  repositoryDigestMirrors:
  - mirrors:
    - my-quay.io.mirror
    source: quay.io
    
cruhm@cruhm-thinkpadp16vgen1:~$ vim imagecontent.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc create -f imagecontent.yaml 
imagecontentsourcepolicy.operator.openshift.io/quay-mirror created

// Apply override config map

apiVersion: v1
kind: ConfigMap
metadata:
  name: image-registry-override-drain
  namespace: openshift-machine-config-operator
  
cruhm@cruhm-thinkpadp16vgen1:~$ vim override.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc apply -f override.yaml 
configmap/image-registry-override-drain created

// Remove imagecontentsource policy and we should still see it reboot

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   True      False      False      3              3                   3                     0                      65m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   True      False      False      3              3                   3                     0                      65m

$ oc delete ImageContentSourcePolicy quay-mirror

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp 
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   False     True       False      3              0                   0                     0                      66m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   False     True       False      3              0                   0                     0                      66m


NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   False     True	 False      3              0                   0                     0                      68m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   False     True	 False      3              1                   1                     0                      68m

NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   False     True	 False      3              1                   1                     0                      70m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   False     True	 False      3              2                   2                     0                      70m

NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-1cd832161bba7432ba209f4f88f2ccb2   True      False	 False      3              3                   3                     0                      75m
worker   rendered-worker-0d2fc42c24be368229abfd9b1d42f132   True      False	 False      3              3                   3                     0                      75m

// See that the override configmap is still present

cruhm@cruhm-thinkpadp16vgen1:~$ oc get configmap -n openshift-machine-config-operator
NAME                             DATA   AGE
coreos-bootimages                4      80m
image-registry-override-drain    0      12m
kube-rbac-proxy                  1      80m
kube-root-ca.crt                 1      80m
kubeconfig-data                  1      71m
machine-config-operator-images   1      80m
machine-config-osimageurl        4      80m
machine-config-server-ca         1      80m
openshift-service-ca.crt         1      80m

CourtCourt521 · 2025-06-03T18:01:57Z

// MCODrainOverrideConfigMapAlert alert is removed and can no longer fire.

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$ oc get configmap prometheus-k8s-rulefiles-0 -o yaml | grep MCODrainOverrideConfigMapAlert

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$

openshift-ci-robot · 2025-06-03T22:01:14Z

@CourtCourt521: This pull request references MCO-1282 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

In response to this:

- What I did

Removed all code and related alerts for the Image Registry Workaround due to NodeDisruptionPolicy going GA.

- How to verify it

// Apply imagecontentsourcepolicy

apiVersion: operator.openshift.io/v1alpha1
kind: ImageContentSourcePolicy
metadata:
 name: quay-mirror
spec:
 repositoryDigestMirrors:
 - mirrors:
   - my-quay.io.mirror
   source: quay.io
   
cruhm@cruhm-thinkpadp16vgen1:~$ vim imagecontent.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc create -f imagecontent.yaml 
imagecontentsourcepolicy.operator.openshift.io/quay-mirror created

// Apply override config map

apiVersion: v1
kind: ConfigMap
metadata:
 name: image-registry-override-drain
 namespace: openshift-machine-config-operator
 
cruhm@cruhm-thinkpadp16vgen1:~$ vim override.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc apply -f override.yaml 
configmap/image-registry-override-drain created

// Wait for the initial MCP rollover to finish. Check to make sure that the MCODrainOverrideConfigMapAlert exists and no longer fires

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$ oc get configmap prometheus-k8s-rulefiles-0 -o yaml | grep MCODrainOverrideConfigMapAlert

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$

// Delete the ImageContentSourcePolicy. You should see the MCP rollover again even with the override file present.

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   True      False      False      3              3                   3                     0                      65m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   True      False      False      3              3                   3                     0                      65m

$ oc delete ImageContentSourcePolicy quay-mirror

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp 
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   False     True       False      3              0                   0                     0                      66m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   False     True       False      3              0                   0                     0                      66m

- Description for the changelog

Remove all code related to the Image Registry workaround Config Map

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-06-03T22:01:39Z

@CourtCourt521: This pull request references MCO-1282 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

In response to this:

- What I did

Removed all code and related alerts for the Image Registry Workaround due to NodeDisruptionPolicy going GA.

- How to verify it

// Apply imagecontentsourcepolicy

apiVersion: operator.openshift.io/v1alpha1
kind: ImageContentSourcePolicy
metadata:
 name: quay-mirror
spec:
 repositoryDigestMirrors:
 - mirrors:
   - my-quay.io.mirror
   source: quay.io
   
cruhm@cruhm-thinkpadp16vgen1:~$ vim imagecontent.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc create -f imagecontent.yaml 
imagecontentsourcepolicy.operator.openshift.io/quay-mirror created

// Apply override config map

apiVersion: v1
kind: ConfigMap
metadata:
 name: image-registry-override-drain
 namespace: openshift-machine-config-operator
 
cruhm@cruhm-thinkpadp16vgen1:~$ vim override.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc apply -f override.yaml 
configmap/image-registry-override-drain created

// Wait for the initial MCP rollover to finish. Check to make sure that the MCODrainOverrideConfigMapAlert exists and no longer fires

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$ oc get configmap prometheus-k8s-rulefiles-0 -o yaml | grep MCODrainOverrideConfigMapAlert

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$

// Delete the ImageContentSourcePolicy. You should see the MCP rollover again even with the override file present.

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   True      False      False      3              3                   3                     0                      65m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   True      False      False      3              3                   3                     0                      65m

$ oc delete ImageContentSourcePolicy quay-mirror

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp 
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   False     True       False      3              0                   0                     0                      66m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   False     True       False      3              0                   0                     0                      66m

- Description for the changelog

Remove all code related to the Image Registry workaround Config Map

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-06-04T16:52:31Z

@CourtCourt521: This pull request references MCO-1282 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

In response to this:

- What I did

Removed all code and related alerts for the Image Registry Workaround (PR#4514 and PR#4139) due to NodeDisruptionPolicy going GA.

- How to verify it

// Apply imagecontentsourcepolicy

apiVersion: operator.openshift.io/v1alpha1
kind: ImageContentSourcePolicy
metadata:
 name: quay-mirror
spec:
 repositoryDigestMirrors:
 - mirrors:
   - my-quay.io.mirror
   source: quay.io
   
cruhm@cruhm-thinkpadp16vgen1:~$ vim imagecontent.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc create -f imagecontent.yaml 
imagecontentsourcepolicy.operator.openshift.io/quay-mirror created

// Apply override config map

apiVersion: v1
kind: ConfigMap
metadata:
 name: image-registry-override-drain
 namespace: openshift-machine-config-operator
 
cruhm@cruhm-thinkpadp16vgen1:~$ vim override.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc apply -f override.yaml 
configmap/image-registry-override-drain created

// Wait for the initial MCP rollover to finish. Check to make sure that the MCODrainOverrideConfigMapAlert exists and no longer fires

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$ oc get configmap prometheus-k8s-rulefiles-0 -o yaml | grep MCODrainOverrideConfigMapAlert

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$

// Delete the ImageContentSourcePolicy. You should see the MCP rollover again even with the override file present.

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   True      False      False      3              3                   3                     0                      65m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   True      False      False      3              3                   3                     0                      65m

$ oc delete ImageContentSourcePolicy quay-mirror

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp 
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   False     True       False      3              0                   0                     0                      66m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   False     True       False      3              0                   0                     0                      66m

- Description for the changelog

Remove all code related to the Image Registry workaround Config Map

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-06-04T16:56:14Z

@CourtCourt521: This pull request references MCO-1282 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

In response to this:

- What I did

Removed all code and related alerts for the Image Registry Workaround (PR#4514 and PR#4139) due to NodeDisruptionPolicy going GA.

- How to verify it

// Apply imagecontentsourcepolicy

apiVersion: operator.openshift.io/v1alpha1
kind: ImageContentSourcePolicy
metadata:
 name: quay-mirror
spec:
 repositoryDigestMirrors:
 - mirrors:
   - my-quay.io.mirror
   source: quay.io
   
cruhm@cruhm-thinkpadp16vgen1:~$ vim imagecontent.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc create -f imagecontent.yaml 
imagecontentsourcepolicy.operator.openshift.io/quay-mirror created

// Apply override config map

apiVersion: v1
kind: ConfigMap
metadata:
 name: image-registry-override-drain
 namespace: openshift-machine-config-operator
 
cruhm@cruhm-thinkpadp16vgen1:~$ vim override.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc apply -f override.yaml 
configmap/image-registry-override-drain created

// Wait for the initial MCP rollover to finish. Check to make sure that the MCODrainOverrideConfigMapAlert exists and no longer fires

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$ oc get configmap prometheus-k8s-rulefiles-0 -o yaml | grep MCODrainOverrideConfigMapAlert

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$

// Delete the ImageContentSourcePolicy. You should see the MCP rollover again even with the override file present.

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   True      False      False      3              3                   3                     0                      65m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   True      False      False      3              3                   3                     0                      65m

$ oc delete ImageContentSourcePolicy quay-mirror

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp 
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   False     True       False      3              0                   0                     0                      66m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   False     True       False      3              0                   0                     0                      66m

- Description for the changelog

Remove all code related to the Image Registry workaround Config Map

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-06-04T16:57:56Z

@CourtCourt521: This pull request references MCO-1282 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

In response to this:

- What I did

Removed all code and related alerts for the Image Registry Workaround (PR#4514 and PR#4139) due to NodeDisruptionPolicy going GA.

- How to verify it

// Apply imagecontentsourcepolicy

apiVersion: operator.openshift.io/v1alpha1
kind: ImageContentSourcePolicy
metadata:
 name: quay-mirror
spec:
 repositoryDigestMirrors:
 - mirrors:
   - my-quay.io.mirror
   source: quay.io
   
cruhm@cruhm-thinkpadp16vgen1:~$ vim imagecontent.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc create -f imagecontent.yaml 
imagecontentsourcepolicy.operator.openshift.io/quay-mirror created

// Apply override config map

apiVersion: v1
kind: ConfigMap
metadata:
 name: image-registry-override-drain
 namespace: openshift-machine-config-operator
 
cruhm@cruhm-thinkpadp16vgen1:~$ vim override.yaml
cruhm@cruhm-thinkpadp16vgen1:~$ oc apply -f override.yaml 
configmap/image-registry-override-drain created

// Wait for the initial MCP rollover to finish. Check to make sure that the MCODrainOverrideConfigMapAlert exists and no longer fires

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$ oc get configmap prometheus-k8s-rulefiles-0 -o yaml | grep MCODrainOverrideConfigMapAlert

cruhm@cruhm-thinkpadp16vgen1:~/frr/jshivers/frr$

// Delete the ImageContentSourcePolicy. You should see the MCP rollover again even with the override file present.

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   True      False      False      3              3                   3                     0                      65m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   True      False      False      3              3                   3                     0                      65m

$ oc delete ImageContentSourcePolicy quay-mirror

cruhm@cruhm-thinkpadp16vgen1:~$ oc get mcp 
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-aa75b71b868b370bb85e66fe0d82d293   False     True       False      3              0                   0                     0                      66m
worker   rendered-worker-d9cd5ae52d8e497b19fc8f39532486ff   False     True       False      3              0                   0                     0                      66m

- Description for the changelog

Remove all code related to the Image Registry workaround Config Map

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

yuqi-zhang

Generally seems fine to me. There is an argument to add in some more information, either:

change the alert in 4.19 to explicitly say it will be removed in 4.20
add an admin ack
remove the alert but make the existence of the configmap a fatal failure

But I feel like since this was only a "support-exception" backdoor, it's probably fine to remove and let the user figure it out?

/lgtm
/hold

for qe verification if needed

yuqi-zhang · 2025-06-13T00:26:08Z

Also needs a rebase

djoshy · 2025-06-23T16:26:04Z

/lgtm

openshift-ci · 2025-06-23T16:26:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CourtCourt521, djoshy, yuqi-zhang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [djoshy,yuqi-zhang]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

djoshy · 2025-06-23T16:37:11Z

/unhold

Discussed with @sergiordlr , no pre merge testing is required

openshift-ci-robot · 2025-06-23T17:40:52Z

/retest-required

Remaining retests: 0 against base HEAD 0fd8575 and 2 for PR HEAD 32f9767 in total

CourtCourt521 · 2025-06-23T22:45:07Z

/retest-required

openshift-ci · 2025-06-24T01:11:16Z

@CourtCourt521: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/okd-scos-e2e-aws-ovn	`32f9767`	link	false	`/test okd-scos-e2e-aws-ovn`
ci/prow/e2e-azure-ovn-upgrade-out-of-change	`32f9767`	link	false	`/test e2e-azure-ovn-upgrade-out-of-change`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-bot · 2025-06-24T03:35:57Z

[ART PR BUILD NOTIFIER]

Distgit: ose-machine-config-operator
This PR has been included in build ose-machine-config-operator-container-v4.20.0-202506240313.p0.g2499d89.assembly.stream.el9.
All builds following this will include this PR.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 29, 2025

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 29, 2025

CourtCourt521 marked this pull request as ready for review June 3, 2025 22:02

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 3, 2025

openshift-ci bot requested review from dkhater-redhat and isabella-janssen June 3, 2025 22:03

yuqi-zhang approved these changes Jun 12, 2025

View reviewed changes

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 12, 2025

openshift-ci bot assigned yuqi-zhang Jun 12, 2025

openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 12, 2025

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 12, 2025

Remove all code related to the Image Registry workaround Config Map

32f9767

CourtCourt521 force-pushed the ImageRegistryOverride branch from 0d80248 to 32f9767 Compare June 23, 2025 16:24

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 23, 2025

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 23, 2025

openshift-ci bot assigned djoshy Jun 23, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 23, 2025

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 23, 2025

openshift-merge-bot bot merged commit 2499d89 into openshift:main Jun 24, 2025
17 of 19 checks passed

MCO-1282: Remove all code related to the Image Registry workaround Config Map #5093

MCO-1282: Remove all code related to the Image Registry workaround Config Map #5093

Conversation

CourtCourt521 commented May 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented May 29, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented May 29, 2025

Uh oh!

CourtCourt521 commented May 30, 2025

TESTING

Uh oh!

CourtCourt521 commented Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jun 3, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jun 3, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jun 4, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jun 4, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jun 4, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yuqi-zhang left a comment

Choose a reason for hiding this comment

Uh oh!

yuqi-zhang commented Jun 13, 2025

Uh oh!

djoshy commented Jun 23, 2025

Uh oh!

openshift-ci bot commented Jun 23, 2025

Uh oh!

djoshy commented Jun 23, 2025

Uh oh!

openshift-ci-robot commented Jun 23, 2025

Uh oh!

CourtCourt521 commented Jun 23, 2025

Uh oh!

openshift-ci bot commented Jun 24, 2025

Uh oh!

Uh oh!

openshift-bot commented Jun 24, 2025

Uh oh!

Uh oh!

CourtCourt521 commented May 29, 2025 •

edited

Loading

openshift-ci-robot commented May 29, 2025 •

edited by openshift-ci bot

Loading

CourtCourt521 commented Jun 3, 2025 •

edited

Loading

openshift-ci-robot commented Jun 3, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jun 3, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jun 4, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jun 4, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jun 4, 2025 •

edited by openshift-ci bot

Loading