[release-4.19] OCPBUGS-68362: Add APIServer to HybridOverlay config

[openshift-cherrypick-robot]

This is an automated cherry-pick of #3608

/assign jrvaldes

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-66266 has been cloned as Jira Issue OCPBUGS-68362. Will retitle bug to link to clone.
/retitle [release-4.19] OCPBUGS-68362: Add APIServer to HybridOverlay config

Details

In response to this:

This is an automated cherry-pick of #3608

/assign jrvaldes

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]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-68362, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.19.z) matches configured target version for branch (4.19.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-66266 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-66266 targets the "4.20.z" version, which is one of the valid target versions: 4.20.0, 4.20.z
• bug has dependents

Requesting review from QA contact:
/cc @rrasouli

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #3608

/assign jrvaldes

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.

[sebsoto]

/approve

[sebsoto]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, sebsoto

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [sebsoto]

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

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 6402389 and 2 for PR HEAD 6af0569 in total

[jrvaldes]

/test aws-e2e-operator

2025/12/15 20:24:42 4m0.00889708s time is required to configure 1 nodes
    secrets_test.go:182: 
        	Error Trace:	/go/src/github.com/openshift/windows-machine-config-operator/test/e2e/secrets_test.go:182
        	Error:      	Received unexpected error:
        	            	failed to verify condition type Upgradeable has state True: timed out waiting for the condition
        	Test:       	TestWMCO/reconfigure/Change_private_key
        	Messages:   	operator Upgradeable condition not in proper state

[jrvaldes]

aws-e2e-operator failing due to AWS instance metadata issues routes

opened by

• [release-4.19] Do not fail metadata endpoint check in AWS #3648

[jrvaldes]

aws-e2e-operator failed at node deletion at cleanup, there is sufficient CI coverage for the changes introduced in this PR.

https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_windows-machine-config-operator/3646/pull-ci-openshift-windows-machine-config-operator-release-4.19-aws-e2e-operator/2000679461015523328#1:build-log.txt%3A924

[jrvaldes]

/override ci/prow/aws-e2e-operator

to move forward with the backport for QE testing

[openshift-ci]

@jrvaldes: Overrode contexts on behalf of jrvaldes: ci/prow/aws-e2e-operator

Details

In response to this:

/override ci/prow/aws-e2e-operator

to move forward with the backport for QE testing

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.

[openshift-ci]

@openshift-cherrypick-robot: The following test 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/aws-e2e-operator	6af0569	link	true	/test aws-e2e-operator

Full PR test history. Your PR dashboard.

Details

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-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-68362: All pull requests linked via external trackers have merged:

• openshift/windows-machine-config-operator#3646

Jira Issue OCPBUGS-68362 has been moved to the MODIFIED state.

Details

In response to this:

This is an automated cherry-pick of #3608

/assign jrvaldes

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.

[jrvaldes]

/cherry-pick release-4.18

[openshift-cherrypick-robot]

@jrvaldes: #3646 failed to apply on top of branch "release-4.18":

Applying: Add APIServer to HybridOverlay config
Using index info to reconstruct a base tree...
M	bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
M	config/rbac/role.yaml
M	controllers/configmap_controller.go
M	pkg/nodeconfig/nodeconfig.go
M	pkg/services/services.go
M	pkg/windows/windows.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/windows/windows.go
Auto-merging pkg/services/services.go
Auto-merging pkg/nodeconfig/nodeconfig.go
CONFLICT (content): Merge conflict in pkg/nodeconfig/nodeconfig.go
Auto-merging controllers/configmap_controller.go
CONFLICT (content): Merge conflict in controllers/configmap_controller.go
Auto-merging config/rbac/role.yaml
Auto-merging bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add APIServer to HybridOverlay config

Details

In response to this:

/cherry-pick release-4.18

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.

[jrvaldes]

/cherry-pick release-4.18

[openshift-cherrypick-robot]

@jrvaldes: #3646 failed to apply on top of branch "release-4.18":

Applying: Add APIServer to HybridOverlay config
Using index info to reconstruct a base tree...
M	bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
M	config/rbac/role.yaml
M	controllers/configmap_controller.go
M	pkg/nodeconfig/nodeconfig.go
M	pkg/services/services.go
M	pkg/windows/windows.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/windows/windows.go
Auto-merging pkg/services/services.go
Auto-merging pkg/nodeconfig/nodeconfig.go
CONFLICT (content): Merge conflict in pkg/nodeconfig/nodeconfig.go
Auto-merging controllers/configmap_controller.go
CONFLICT (content): Merge conflict in controllers/configmap_controller.go
Auto-merging config/rbac/role.yaml
Auto-merging bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Add APIServer to HybridOverlay config

Details

In response to this:

/cherry-pick release-4.18

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.