-
Notifications
You must be signed in to change notification settings - Fork 219
NE-1317: manifests - add ingress capability annotation #950
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
NE-1317: manifests - add ingress capability annotation #950
Conversation
|
@alebedev87: This pull request references NE-1317 which is a valid 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 kubernetes/test-infra repository. |
|
Analysis of
Interesting the absence of C-I-O CRDs, however they were called as skipped in the other log message: |
|
Some other jobs failed in the similar to As expected |
|
The According to the user defined ingress controller's installer EP:
|
Makefile
Outdated
| .PHONY: crd | ||
| crd: | ||
| hack/update-generated-crd.sh | ||
| #hack/update-generated-crd.sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this needed for just the 00-custom-resource-definition.yaml and 00-custom-resource-definition-internal.yaml manifests? Would it make more sense to add the capability.openshift.io/name: Ingress annotation in openshift/api?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it would. This PR was created according to how to implement a new capability to check the CI presubmit behavior when Ingress capability is unknown. That's why I had to comment this line to not get the overrides from the api repository.
The rest of the manifests still make sense, so the PR will live on, just this comment will have to be removed once the api repository is updated.
|
/assign |
Excellent!
This surprises me. Which CI job does this yaml file come from?
I thought the installer only applied the IngressController CRD if it was necessary for install-time customizations. In particular, the IngressController CRD is needed for private clusters: https://github.com/openshift/installer/blob/4455542d6aa8842876016010f24d04f5eb02e7bd/pkg/asset/manifests/ingress.go#L138-L160 |
From the must-gather of the
Yes, that's what I found too. Does |
Once the API PR is merged, the ingresscontroller CRD will have the ingress capability annotation. Therefore this repository's |
e295e74 to
3db1f96
Compare
|
Issues go stale after 90d of inactivity. Mark the issue as fresh by commenting If this issue is safe to close now please do so with /lifecycle stale |
|
/remove-lifecycle stale |
|
Issues go stale after 90d of inactivity. Mark the issue as fresh by commenting If this issue is safe to close now please do so with /lifecycle stale |
|
/remove-lifecycle stale |
Miciah
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to rebase. Also, please add a little more detail to the commit message. For example, I suppose you need to bump openshift/api to get the annotation in vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml and vendor/github.com/openshift/api/operatoringress/v1/0000_50_dns-record.yaml, which get copied into manifests/, right?
|
@Miciah : yes, I need the API with the ingress capability. Once it's available I'll come back to this PR, there is no point in rebasing right now. |
|
@alebedev87: This pull request references NE-1317 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.16.0" version, but no target version was set. 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. |
|
/retest |
|
/test |
|
@alebedev87: The
The following commands are available to trigger optional jobs:
Use
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 kubernetes/test-infra repository. |
|
/retest |
1 similar comment
|
/retest |
| include.release.openshift.io/ibm-cloud-managed: "true" | ||
| include.release.openshift.io/self-managed-high-availability: "true" | ||
| include.release.openshift.io/single-node-developer: "true" | ||
| capability.openshift.io/name: Ingress |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This manifest already has capability.openshift.io/name: CloudCredential, so you'll need to add "+Ingress" to the existing value:
| capability.openshift.io/name: Ingress | |
| capability.openshift.io/name: CloudCredential+Ingress |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Somehow that got lost between all the rebases. Let me readd.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
| include.release.openshift.io/ibm-cloud-managed: "true" | ||
| include.release.openshift.io/self-managed-high-availability: "true" | ||
| include.release.openshift.io/single-node-developer: "true" | ||
| capability.openshift.io/name: Ingress |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Combine the annotation value with the existing annotation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
| include.release.openshift.io/ibm-cloud-managed: "true" | ||
| include.release.openshift.io/self-managed-high-availability: "true" | ||
| include.release.openshift.io/single-node-developer: "true" | ||
| capability.openshift.io/name: Ingress |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Combine the annotation value with the existing annotation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
manifests/00-cluster-role.yaml
Outdated
| include.release.openshift.io/ibm-cloud-managed: "true" | ||
| include.release.openshift.io/self-managed-high-availability: "true" | ||
| include.release.openshift.io/single-node-developer: "true" | ||
| capability.openshift.io/name: Ingress |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where annotations are already alphabetized by key, we might as well keep things in order.
| include.release.openshift.io/ibm-cloud-managed: "true" | |
| include.release.openshift.io/self-managed-high-availability: "true" | |
| include.release.openshift.io/single-node-developer: "true" | |
| capability.openshift.io/name: Ingress | |
| capability.openshift.io/name: Ingress | |
| include.release.openshift.io/ibm-cloud-managed: "true" | |
| include.release.openshift.io/self-managed-high-availability: "true" | |
| include.release.openshift.io/single-node-developer: "true" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ordered here and in the other manifests.
313a73a to
4ebeb77
Compare
|
Rebased after #1045 merge. |
|
/retest |
go.mod
Outdated
| go 1.21 | ||
|
|
||
| toolchain go1.21.5 | ||
| toolchain go1.21.7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you mean to include this change in your PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this will jump depending on the env for the creator of the PR. Removed it, jut to reduce the diff.
manifests/01-role-binding.yaml
Outdated
| include.release.openshift.io/ibm-cloud-managed: "true" | ||
| include.release.openshift.io/self-managed-high-availability: "true" | ||
| include.release.openshift.io/single-node-developer: "true" | ||
| capability.openshift.io/name: Ingress |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This list is still not in alphabetical order.
manifests/01-role.yaml
Outdated
| include.release.openshift.io/ibm-cloud-managed: "true" | ||
| include.release.openshift.io/self-managed-high-availability: "true" | ||
| include.release.openshift.io/single-node-developer: "true" | ||
| capability.openshift.io/name: Ingress |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please alphabetize.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
| value: | ||
| config.openshift.io/inject-proxy: ingress-operator | ||
| include.release.openshift.io/ibm-cloud-managed: "true" | ||
| capability.openshift.io/name: Ingress |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please alphabetize. (It looks like the patched file is alphabetized though.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
4ebeb77 to
9bf38aa
Compare
|
Thanks! |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Miciah The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@alebedev87: The following test 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/test-infra repository. I understand the commands that are listed here. |
|
[ART PR BUILD NOTIFIER] This PR has been included in build ose-cluster-ingress-operator-container-v4.16.0-202404200345.p0.gbca2dff.assembly.stream.el9 for distgit ose-cluster-ingress-operator. |
This PR adds the
Ingresscapability annotation to all the resources related to the cluster-ingress-operator: CRDS, Deployment, RBAC, CredentialsRequests.Enhancement Proposal: openshift/enhancements#1415.
PR which added the
Ingresscapability to the API: openshift/api#1724.