Skip to content
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

OCPBUGS-23999: Set owner for default ingress configmap #1000

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

vrutkovs
Copy link
Member

@vrutkovs vrutkovs commented Nov 21, 2023

This adds annotation which identifies the component used to file issues with this certificate. The annotation is verified by the test, so that all certificates would be registered and have owners assigned. More metadata would be added later.

See openshift/enhancements#1502 for proposed workflow with TLS registry

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 21, 2023
Copy link
Contributor

openshift-ci bot commented Nov 21, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@vrutkovs
Copy link
Member Author

/test e2e-aws-ovn

1 similar comment
@vrutkovs
Copy link
Member Author

/test e2e-aws-ovn

@vrutkovs
Copy link
Member Author

/test e2e-aws-ovn

@vrutkovs vrutkovs marked this pull request as ready for review November 23, 2023 14:59
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 23, 2023
@Miciah
Copy link
Contributor

Miciah commented Nov 27, 2023

@vrutkovs, this PR needs to be rebased since #990 merged. Also, the PR needs a Jira issue. Do you intend to get this change in OpenShift 4.15?

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 27, 2023
Comment on lines +23 to +26
Annotations: map[string]string{
annotations.OpenShiftComponent: "Networking / router",
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll need to update updateRouterCAConfigMap and deleteRouterCAConfigMap if you want the operator to add this annotation on upgrade.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated routerCAConfigMapsEqual to return false when annotations are not set or do not match the desired. This will trigger Update call in updateRouterCAConfigMap

Comment on lines +129 to +139
Annotations: map[string]string{
annotations.OpenShiftComponent: "Networking / router",
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll need to add update logic to ensureRouterCASecret if you want the operator to add this annotation on upgrade.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think its required, if !reflect.DeepEqual in ensureRouterCASecret would start an update if annotations mismatch

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 28, 2023
@vrutkovs vrutkovs changed the title Set owner for default ingress configmap OCPBUGS-23999: Set owner for default ingress configmap Nov 28, 2023
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Nov 28, 2023
@openshift-ci-robot
Copy link
Contributor

@vrutkovs: This pull request references Jira Issue OCPBUGS-23999, 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.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @lihongan

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

In response to this:

This adds annotation which identifies the component used to file issues with this certificate. The annotation is verified by the test, so that all certificates would be registered and have owners assigned. More metadata would be added later.

See openshift/enhancements#1502 for proposed workflow with TLS registry

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 openshift-ci bot requested a review from lihongan November 28, 2023 10:17
@lihongan
Copy link
Contributor

cc @melvinjoseph86

@vrutkovs
Copy link
Member Author

/test e2e-gcp-operator

@candita
Copy link
Contributor

candita commented Nov 29, 2023

Since you've started this...
/assign @Miciah

@melvinjoseph86
Copy link

melvinjoseph@mjoseph-mac Downloads % oc get clusterversion
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
version 4.15.0-0.ci.test-2023-12-01-120802-ci-ln-9rgxv9b-latest True False 89m Cluster version is 4.15.0-0.ci.test-2023-12-01-120802-ci-ln-9rgxv9b-latest

melvinjoseph@mjoseph-mac Downloads % oc get secret -n openshift-ingress-operator router-ca -o yaml | yq -y '.metadata.annotations'
openshift.io/owning-component: Networking / router

Marking this bug as verified using pre-image verification process

@melvinjoseph86
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Dec 1, 2023
@openshift-ci-robot
Copy link
Contributor

@vrutkovs: This pull request references Jira Issue OCPBUGS-23999, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @melvinjoseph86

In response to this:

This adds annotation which identifies the component used to file issues with this certificate. The annotation is verified by the test, so that all certificates would be registered and have owners assigned. More metadata would be added later.

See openshift/enhancements#1502 for proposed workflow with TLS registry

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.

@melvinjoseph86
Copy link

/test e2e-gcp-operator

@melvinjoseph86
Copy link

/retest-required

@openshift-bot
Copy link
Contributor

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Mar 13, 2024
@openshift-bot
Copy link
Contributor

Stale issues rot after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

@openshift-ci openshift-ci bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Apr 12, 2024
@Miciah
Copy link
Contributor

Miciah commented Apr 12, 2024

/remove-lifecycle rotten

@openshift-ci openshift-ci bot removed the lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. label Apr 12, 2024
@candita
Copy link
Contributor

candita commented May 15, 2024

@vrutkovs should we close this one, or will you pursue the changes that Miciah mentioned?

Copy link
Contributor

openshift-ci bot commented May 16, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from miciah. For more information see the Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files:

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

@vrutkovs
Copy link
Member Author

Verified that annotations are being set on clean install and in the upgrade job:

"metadata": {
                "annotations": {
                    "openshift.io/owning-component": "Networking / router"
                },
                "creationTimestamp": "2024-05-16T07:07:04Z",
                "name": "default-ingress-cert",
                "namespace": "openshift-config-managed",
                "resourceVersion": "7828",
                "uid": "04ae0ff8-064a-43fd-9ebf-012b8c3f093f"
            }

@gcs278
Copy link
Contributor

gcs278 commented May 16, 2024

FYI: Need #1054 to fixed operator E2E which is permafailing.

@vrutkovs
Copy link
Member Author

/retest

Copy link
Contributor

openshift-ci bot commented May 17, 2024

@vrutkovs: 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-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants