OCPBUGS-11882: Annotate HCP pods with the safe-to-evict-local-volume CA annotation

[jparrill]

Which issue(s) this PR fixes:
Fixes #OCPBUGS-11882

Depend on:

• OCPBUGS-11882: Added safe-to-evict annotation to aws-ebs-csi-driver-controller pods aws-ebs-csi-driver-operator#231
• OCPBUGS-11882: Added safe-to-evict annotation to ovnkube-master and multus admission controller components cluster-network-operator#1822
• OCPBUGS-11882: Added safe-to-evict-local-volume annotation from bound-sa-token to ebs-controller aws-ebs-csi-driver-operator#232
• OCPBUGS-11882: Added another volume to safe-to-evict-local-volume annotation cluster-network-operator#1830

This is a second approach from #2597. This makes more sense.

Checklist

• Subject and description added to both, commit and PR.
• Relevant issues have been referenced.
• This change includes e2e and unit tests.

[openshift-ci-robot]

@jparrill: This pull request references Jira Issue OCPBUGS-11882, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.0) matches configured target version for branch (4.14.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

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

In response to this:

Which issue(s) this PR fixes:
Fixes #OCPBUGS-11882

Depend on:

• OCPBUGS-11882: Added safe-to-evict annotation to aws-ebs-csi-driver-controller pods aws-ebs-csi-driver-operator#231
• OCPBUGS-11882: Added safe-to-evict annotation to ovnkube-master and multus admission controller components cluster-network-operator#1822

This is a second approach from #2597. This makes more sense.

Checklist

• Subject and description added to both, commit and PR.
• Relevant issues have been referenced.
• This change includes e2e and unit tests.

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/test-infra repository.

[netlify]

✅ Deploy Preview for hypershift-docs ready!

Name	Link
🔨 Latest commit	e119410
🔍 Latest deploy log	https://app.netlify.com/sites/hypershift-docs/deploys/647dae82f44897000811c718
😎 Deploy Preview	https://deploy-preview-2647--hypershift-docs.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site settings.

[jparrill]

/area control-plane-operator

[muraee]

/lgtm

[jparrill]

/retest-required

[openshift-ci-robot]

@jparrill: This pull request references Jira Issue OCPBUGS-11882, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.0) matches configured target version for branch (4.14.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

Which issue(s) this PR fixes:
Fixes #OCPBUGS-11882

Depend on:

• OCPBUGS-11882: Added safe-to-evict annotation to aws-ebs-csi-driver-controller pods aws-ebs-csi-driver-operator#231
• OCPBUGS-11882: Added safe-to-evict annotation to ovnkube-master and multus admission controller components cluster-network-operator#1822
• OCPBUGS-11882: Added safe-to-evict-local-volume annotation from bound-sa-token to ebs-controller aws-ebs-csi-driver-operator#232
• OCPBUGS-11882: Added another volume to safe-to-evict-local-volume annotation cluster-network-operator#1830

This is a second approach from #2597. This makes more sense.

Checklist

• Subject and description added to both, commit and PR.
• Relevant issues have been referenced.
• This change includes e2e and unit tests.

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/test-infra repository.

[jparrill]

/retest e2e-aws

[openshift-ci]

@jparrill: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

• /test e2e-aws
• /test images
• /test unit
• /test verify

The following commands are available to trigger optional jobs:

• /test e2e-aws-4-12
• /test e2e-aws-4-13
• /test e2e-aws-metrics
• /test e2e-conformance
• /test e2e-ibmcloud-iks
• /test e2e-ibmcloud-roks
• /test e2e-kubevirt-aws-ovn

Use /test all to run the following jobs that were automatically triggered:

• pull-ci-openshift-hypershift-main-e2e-aws
• pull-ci-openshift-hypershift-main-e2e-kubevirt-aws-ovn
• pull-ci-openshift-hypershift-main-images
• pull-ci-openshift-hypershift-main-unit
• pull-ci-openshift-hypershift-main-verify

In response to this:

/retest e2e-aws

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/test-infra repository.

[jparrill]

/test e2e-aws

[csrwng]

/lgtm

[openshift-ci]

@jparrill: all tests passed!

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/test-infra repository. I understand the commands that are listed here.

[openshift-ci-robot]

@jparrill: Jira Issue OCPBUGS-11882: All pull requests linked via external trackers have merged:

• openshift/cluster-network-operator#1822
• openshift/aws-ebs-csi-driver-operator#231
• openshift/hypershift#2647
• openshift/aws-ebs-csi-driver-operator#232
• openshift/cluster-network-operator#1830

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

In response to this:

Which issue(s) this PR fixes:
Fixes #OCPBUGS-11882

Depend on:

• OCPBUGS-11882: Added safe-to-evict annotation to aws-ebs-csi-driver-controller pods aws-ebs-csi-driver-operator#231
• OCPBUGS-11882: Added safe-to-evict annotation to ovnkube-master and multus admission controller components cluster-network-operator#1822
• OCPBUGS-11882: Added safe-to-evict-local-volume annotation from bound-sa-token to ebs-controller aws-ebs-csi-driver-operator#232
• OCPBUGS-11882: Added another volume to safe-to-evict-local-volume annotation cluster-network-operator#1830

This is a second approach from #2597. This makes more sense.

Checklist

• Subject and description added to both, commit and PR.
• Relevant issues have been referenced.
• This change includes e2e and unit tests.

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/test-infra repository.

[jparrill]

/cherry-pick release-4.13

[openshift-cherrypick-robot]

@jparrill: #2647 failed to apply on top of branch "release-4.13":

Applying: OCPBUGS-11882: CPO now annotates HCP pods with safe-to-evict CA annotation
Using index info to reconstruct a base tree...
M	hypershift-operator/controllers/nodepool/kubevirt/kubevirt.go
M	hypershift-operator/controllers/nodepool/kubevirt/kubevirt_test.go
M	support/config/deployment.go
M	test/e2e/util/fixture.go
M	test/e2e/util/util.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/util/util.go
Auto-merging test/e2e/util/fixture.go
Auto-merging support/config/deployment.go
Auto-merging hypershift-operator/controllers/nodepool/kubevirt/kubevirt_test.go
CONFLICT (content): Merge conflict in hypershift-operator/controllers/nodepool/kubevirt/kubevirt_test.go
Auto-merging hypershift-operator/controllers/nodepool/kubevirt/kubevirt.go
CONFLICT (content): Merge conflict in hypershift-operator/controllers/nodepool/kubevirt/kubevirt.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-11882: CPO now annotates HCP pods with safe-to-evict CA annotation
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.13

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/test-infra repository.