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

Supporting custom labels/annotations on deployment/pod #105

Merged
merged 6 commits into from
Jun 20, 2023

Conversation

jkroepke
Copy link
Contributor

@jkroepke jkroepke commented Jan 30, 2023

Signed-off-by: Jan-Otto Kröpke joe@cloudeteer.de

Overview

Added the ability to define custom annotations on deployment/pods

Tools like https://github.com/stakater/Reloader depends on that.

What this PR does / why we need it

Special notes for your reviewer

Checklist

  • Change log updated in Chart.yaml (see the contributing guide for details)
  • Chart version bumped in Chart.yaml (see the contributing guide for details)
  • Documentation regenerated by running make docs

@sagikazarmark
Copy link
Member

@jkroepke this needs rebase as well

Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>
@jkroepke jkroepke force-pushed the custom-annotations branch 3 times, most recently from e56324c to 4597e91 Compare April 8, 2023 08:21
@jkroepke
Copy link
Contributor Author

jkroepke commented Apr 8, 2023

@sagikazarmark rebased.

@jkroepke
Copy link
Contributor Author

@sagikazarmark can you please take a look here again?

@jkroepke
Copy link
Contributor Author

@sagikazarmark A friendly reminder.

@jkroepke
Copy link
Contributor Author

@sagikazarmark I would appreciate a review here, please let me know, if I can assist here.

@@ -107,8 +107,15 @@ rbac:
# If disabled, the operator is responsible for creating the necessary resources (ClusterRole and RoleBinding or CRD's)
createClusterScoped: true

# -- Annotations to be added to deployment.
annotations: {}
Copy link
Member

Choose a reason for hiding this comment

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

How about deploymentAnnotations and deploymentLabels?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good call, changed.

charts/dex/values.yaml Show resolved Hide resolved
jkroepke and others added 4 commits June 20, 2023 13:10
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>
Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>
Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>
@jkroepke
Copy link
Contributor Author

@sagikazarmark I address all your points.

Copy link
Member

@sagikazarmark sagikazarmark left a comment

Choose a reason for hiding this comment

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

A few more nits. Other than those, it's good to go.

charts/dex/ci/label-annotations-values.yaml Outdated Show resolved Hide resolved
charts/dex/ci/label-annotations-values.yaml Outdated Show resolved Hide resolved
charts/dex/values.yaml Show resolved Hide resolved
charts/dex/values.yaml Show resolved Hide resolved
Co-authored-by: Márk Sági-Kazár <sagikazarmark@users.noreply.github.com>
Signed-off-by: Jan-Otto Kröpke <github@jkroepke.de>
@jkroepke
Copy link
Contributor Author

@sagikazarmark Applied, thanks for review!

@sagikazarmark
Copy link
Member

Thanks @jkroepke !

@sagikazarmark sagikazarmark merged commit 772cab5 into dexidp:master Jun 20, 2023
10 checks passed
@jkroepke jkroepke deleted the custom-annotations branch June 20, 2023 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants