OCPBUGS-29519: manifests-gen: also add CustomNoUpgrade annotation value

[damdo]

Together with the TechPreviewNoUpgrade release.openshift.io/feature-set we also need to add CustomNoUpgrade as that is used in certain scenarios where CAPI provider ConfigMaps and CRDs are required.

[openshift-ci-robot]

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

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @sunzhaohua2

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

Details

In response to this:

Together with the TechPreviewNoUpgrade release.openshift.io/feature-set we also need to add CustomNoUpgrade as that is used in certain scenarios where CAPI provider ConfigMaps and CRDs are required.

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.

[damdo]

/tide refresh

[damdo]

No need to run e2e's as this changes the manifest generator and not runtime code.

/override ci/prow/e2e-aws-capi-techpreview ci/prow/e2e-aws-ovn ci/prow/e2e-aws-ovn-serial ci/prow/e2e-aws-ovn-techpreview ci/prow/e2e-azure-ovn-techpreview ci/prow/e2e-gcp-capi-techpreview ci/prow/e2e-gcp-ovn-techpreview ci/prow/e2e-openstack-capi-techpreview ci/prow/e2e-vsphere-capi-techpreview

[openshift-ci]

@damdo: Overrode contexts on behalf of damdo: ci/prow/e2e-aws-capi-techpreview, ci/prow/e2e-aws-ovn, ci/prow/e2e-aws-ovn-serial

Details

In response to this:

No need to run e2e's as this changes the manifest generator and not runtime code.

/override ci/prow/e2e-aws-capi-techpreview ci/prow/e2e-aws-ovn ci/prow/e2e-aws-ovn-serial
ci/prow/e2e-aws-ovn-techpreview ci/prow/e2e-azure-ovn-techpreview ci/prow/e2e-gcp-capi-techpreview ci/prow/e2e-gcp-ovn-techpreview ci/prow/e2e-openstack-capi-techpreview ci/prow/e2e-vsphere-capi-techpreview

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.

[openshift-ci]

@damdo: Overrode contexts on behalf of damdo: ci/prow/e2e-aws-capi-techpreview, ci/prow/e2e-aws-ovn, ci/prow/e2e-aws-ovn-serial, ci/prow/e2e-aws-ovn-techpreview, ci/prow/e2e-azure-ovn-techpreview, ci/prow/e2e-gcp-capi-techpreview, ci/prow/e2e-gcp-ovn-techpreview, ci/prow/e2e-openstack-capi-techpreview, ci/prow/e2e-vsphere-capi-techpreview

Details

In response to this:

No need to run e2e's as this changes the manifest generator and not runtime code.

/override ci/prow/e2e-aws-capi-techpreview ci/prow/e2e-aws-ovn ci/prow/e2e-aws-ovn-serial ci/prow/e2e-aws-ovn-techpreview ci/prow/e2e-azure-ovn-techpreview ci/prow/e2e-gcp-capi-techpreview ci/prow/e2e-gcp-ovn-techpreview ci/prow/e2e-openstack-capi-techpreview ci/prow/e2e-vsphere-capi-techpreview

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.

[JoelSpeed]

/approve
/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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 [JoelSpeed]

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]

@damdo: Jira Issue OCPBUGS-29519: Some pull requests linked via external trackers have merged:

• openshift/cluster-capi-operator#161

The following pull requests linked via external trackers have not merged:

• openshift/cluster-api#196 is open

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

Details

In response to this:

Together with the TechPreviewNoUpgrade release.openshift.io/feature-set we also need to add CustomNoUpgrade as that is used in certain scenarios where CAPI provider ConfigMaps and CRDs are required.

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]

@damdo: all tests passed!

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

[damdo]

/cherry-pick release-4.15

[openshift-cherrypick-robot]

@damdo: #161 failed to apply on top of branch "release-4.15":

Applying: manifests-gen: also add CustomNoUpgrade annotation value
Using index info to reconstruct a base tree...
M	manifests-gen/customizations.go
M	manifests-gen/providers.go
Falling back to patching base and 3-way merge...
Auto-merging manifests-gen/providers.go
Auto-merging manifests-gen/customizations.go
CONFLICT (content): Merge conflict in manifests-gen/customizations.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 manifests-gen: also add CustomNoUpgrade annotation value
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".

Details

In response to this:

/cherry-pick release-4.15

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.

[damdo]

Ah will need #160 to merge before being able to cherry-pick this one to release-4.15

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-capi-operator-container-v4.16.0-202402152340.p0.gd299b8b.assembly.stream.el9 for distgit ose-cluster-capi-operator.
All builds following this will include this PR.

[openshift-merge-robot]

Fix included in accepted release 4.16.0-0.nightly-2024-02-17-013806

[damdo]

/cherry-pick release-4.15

[openshift-cherrypick-robot]

@damdo: new pull request created: #166

Details

In response to this:

/cherry-pick release-4.15

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.