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-8466: Add operand pod label customization #112

Merged
merged 3 commits into from Apr 24, 2023

Conversation

swghosh
Copy link
Member

@swghosh swghosh commented Apr 3, 2023

  • API add overrideLabels field to DeploymentConfig of cert-manager controller, cainjector, webhook operands
  • custom labels to be be added to through deployment hook

Signed-off-by: Swarup Ghosh swghosh@redhat.com

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 3, 2023
@openshift-ci-robot
Copy link

@swghosh: This pull request references Jira Issue OCPBUGS-8466, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

  • API add overrideLabels field to DeploymentConfig of cert-manager controller, cainjector, webhook operands
  • custom labels to be be added to through deployment hook

Signed-off-by: Swarup Ghosh swghosh@redhat.com

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 review from s-urbaniak and stlaz April 3, 2023 19:40
Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
@swghosh swghosh force-pushed the ocpbugs-8466 branch 2 times, most recently from e2221d5 to 966c6f3 Compare April 4, 2023 10:22
@swghosh
Copy link
Member Author

swghosh commented Apr 4, 2023

/cc @TrilokGeer @xingxingxia

@swghosh swghosh force-pushed the ocpbugs-8466 branch 2 times, most recently from bf369d6 to 36432a2 Compare April 4, 2023 12:31
Copy link
Contributor

@thejasn thejasn left a comment

Choose a reason for hiding this comment

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

Since the logic present here merges the existing labels with the new provided labels, I think we want to some validation before merging. Possibly only allowing labels from certmanager.io?

@thejasn
Copy link
Contributor

thejasn commented Apr 12, 2023

/assign

@swghosh swghosh force-pushed the ocpbugs-8466 branch 3 times, most recently from eabd911 to 55377b1 Compare April 18, 2023 09:07
@swghosh
Copy link
Member Author

swghosh commented Apr 18, 2023

Since the logic present here merges the existing labels with the new provided labels, I think we want to some validation before merging.

@thejasn
Added a validation that filters out conflicting labels present in deployment.Spec.Selector.MatchLabels to avoid deployment pods being mismatched.

@swghosh
Copy link
Member Author

swghosh commented Apr 19, 2023

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 19, 2023
@openshift-ci-robot
Copy link

@swghosh: This pull request references Jira Issue OCPBUGS-8466, 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)

Requesting review from QA contact:
/cc @xingxingxia

In response to this:

/jira refresh

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.

Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
@swghosh
Copy link
Member Author

swghosh commented Apr 20, 2023

Since the logic present here merges the existing labels with the new provided labels, I think we want to some validation before merging. Possibly only allowing labels from certmanager.io?

@thejasn
added the withPodLabelsValidateHook() so you could PTAL.

The hook is to ensure we validate and allow only podLabels that should be supported. For now, I've added azure.workload.identity/use label (xref: https://cert-manager.io/docs/configuration/acme/dns01/azuredns/#reconfigure-cert-manager, for Azure Workload Identity support) and we can update the list with other labels on need basis as discussed previously.

@thejasn
Copy link
Contributor

thejasn commented Apr 20, 2023

/lgtm
/hold for pre-merge testing

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Apr 20, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: swghosh, thejasn

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

The pull request process is described 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 20, 2023
@xingxingxia
Copy link
Contributor

/label qe-approved
Would like to do post-merge test : ) since other work (including OCP Auth) items need me :)

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Apr 23, 2023
@swghosh
Copy link
Member Author

swghosh commented Apr 24, 2023

/remove-hold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 24, 2023
@swghosh
Copy link
Member Author

swghosh commented Apr 24, 2023

/cc @xenolinux for docs-approved
/cc @davemulford for px-approved

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 24, 2023

@swghosh: GitHub didn't allow me to request PR reviews from the following users: for.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @xenolinux for docs-approved
/cc @davemulford for px-approved

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.

@xenolinux
Copy link

/label docs-approved

@openshift-ci openshift-ci bot added the docs-approved Signifies that Docs has signed off on this PR label Apr 24, 2023
@davemulford
Copy link

/label px-approved

@openshift-ci openshift-ci bot added the px-approved Signifies that Product Support has signed off on this PR label Apr 24, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 24, 2023

@swghosh: 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 openshift-ci bot merged commit 724865f into openshift:master Apr 24, 2023
7 checks passed
@openshift-ci-robot
Copy link

@swghosh: Jira Issue OCPBUGS-8466: All pull requests linked via external trackers have merged:

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

In response to this:

  • API add overrideLabels field to DeploymentConfig of cert-manager controller, cainjector, webhook operands
  • custom labels to be be added to through deployment hook

Signed-off-by: Swarup Ghosh swghosh@redhat.com

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. docs-approved Signifies that Docs has signed off on this PR jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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. lgtm Indicates that a PR is ready to be merged. px-approved Signifies that Product Support has signed off on this PR 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

6 participants