NO-JIRA: rebase on main #320
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We were not setting IdentityRef.Kind when down-converting an object with no previous version annotation, which results in a validation error.
🐛 Fix down-conversion of IdentityRef
openshift-ci-robot
added
the
jira/valid-reference
|
@EmilienM: This pull request explicitly references no jira issue. DetailsIn response to this:
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-merge-robot
added
the
needs-rebase
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
openshift-merge-robot
removed
the
needs-rebase
Member
Author
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
In addition to vendor directories, we can ignore things that do not end up in the product. Co-Authored-By: Martin André <[email protected]>
This is required for it to be included in the release payload. CAPO is actually deployed by cluster-capi-operator, but is not directly referenced by cluster-capi-operator. cluster-capi-operator instead consumes a ConfigMap deployed by CAPO. CAPO must be included in the release payload in order for cluster-capi-operator to be able to consume this ConfigMap.
Also fix lint issues hightlighted by these tests.
This is step 1 of 3 in the dance necessary to add e2e tests. Next up, the job definition itself (in 'openshift/release'). Signed-off-by: Stephen Finucane <[email protected]>
These are heavily based on the tests for other platforms, which are currently included in the cluster-capi-operator tree [1] but which will eventually be moved out to the openshift forks of the respective CAPI implementations. The key difference from these is that (a) we don't create a cluster (since we have the infracluster controller for this) and (b) we obviously use OpenStack-specific semantics. [1] https://github.com/openshift/cluster-capi-operator/tree/release-4.15/e2e Co-Authored-By: Emilien Macchi <[email protected]> Co-Authored-By: Stephen Finucane <[email protected]>
As in openshift/cluster-version-operator@48fe9f2669 (install: Drop single-node-developer profile, 2021-11-05, openshift/cluster-version-operator#685). There's an enhancement proposal for this profile [1], and the Code Ready Containers folks took a run at using it in [2] before backing off in [3]. I don't have any problems with having a specific CRC profile, but if we end up going that way, we'll need a lot more manifests with the annotation (e.g. we'll probably also want the CVO manifests to include this annotation, or there won't be anything consuming the admin-ack ConfigMaps ;). This commit drops the annotation from this repository to avoid distracting folks with dead code. [1]: https://github.com/openshift/enhancements/blob/2911c46bf7d2f22eb1ab81739b4f9c2603fd0c07/enhancements/single-node/developer-cluster-profile.md [2]: crc-org/snc#338 [3]: crc-org/snc#373 (comment)
openshift/machine-api-operator@9c20871740 (annotate cloud credentials request, 2023-11-14, openshift/machine-api-operator#1174) added this capability to the machine-API analog of this manifest. And openshift/cluster-capi-operator@e305541274 (annotate credentials request manifests, 2023-11-13, openshift/cluster-capi-operator#143) annotated some cluster-API CredentialsRequests used for other providers. This commit catches cluster-API OpenStack up with those other changes. There is a risk that tech-preview clusters updating into this change will have the CloudCredential capability implicitly enabled. But because TechPreviewNoUpgrade blocks minor updates, and we don't intend to backport this to 4.14.z, that exposure is confined to unsuported prerelease clusters.
Signed-off-by: Stephen Finucane <[email protected]>
.. to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/openstack-cluster-api-controllers.yml
Member
Author
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
Member
Author
mdbooth
suggested changes
Jul 29, 2024
mdbooth
left a comment
mdbooth
left a comment
There was a problem hiding this comment.
We should never rebase on main, right? We should rebase on a release branch.
Member
|
This needs a 👍 for removing the |
Member
|
What @mdbooth said. This should be based on v0.10, which is the latest upstream release. |
openshift-ci
bot
added
the
do-not-merge/hold
|
@EmilienM: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
Member
Author
|
/close |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Manual rebase since the bot failed with a conflict.