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

Set annotations on teleport-kube-agent StatefulSet #46393

Merged
merged 2 commits into from
Sep 9, 2024

Conversation

strideynet
Copy link
Contributor

Buddies #45687

Originally contributed by @seankhliao

changelog: The teleport-kube-agent chart now correctly propagates configured annotations when deploying a StatefulSet.

@@ -13,6 +13,10 @@ metadata:
{{- if .Values.extraLabels.deployment }}
{{- toYaml .Values.extraLabels.deployment | nindent 4 }}
{{- end }}
{{- if .Values.annotations.deployment }}
annotations:
{{- toYaml .Values.annotations.deployment | nindent 4 }}
Copy link
Contributor

Choose a reason for hiding this comment

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

can we use separate annotations for the statefulset?
the deployment is a legacy thing we are trying to get rid of

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hrm, I see that but I think there's a general trend of the "deployment" values being used within this template (e.g extraLabels). It seems like it would be more odd for this to be inconsistent with that. We probably ought to do another PR at somepoint which just shifts all of these values to using those explicitly stated as for the "statefulset".

Copy link
Contributor Author

@strideynet strideynet Sep 9, 2024

Choose a reason for hiding this comment

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

Also, our documentation for the values file already states today that it will be applied to the StatefulSet, so if anything, we have a bug today in that it is not.

  # annotations.deployment(object) -- contains the Kubernetes annotations
  # put on the `Deployment` or `StatefulSet` resource created by the chart.
  deployment: {}

Copy link
Contributor

Choose a reason for hiding this comment

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

Then it's my fault

@strideynet strideynet added this pull request to the merge queue Sep 9, 2024
Merged via the queue into master with commit 80877f8 Sep 9, 2024
39 checks passed
@strideynet strideynet deleted the strideynet/buddy-45687 branch September 9, 2024 18:19
@public-teleport-github-review-bot

@strideynet See the table below for backport results.

Branch Result
branch/v14 Failed
branch/v15 Failed
branch/v16 Failed

strideynet added a commit that referenced this pull request Sep 10, 2024
* set annotations on teleport-kube-agent statefulset

* empty commit to trigger ci

---------

Co-authored-by: Sean Liao <sean+git@liao.dev>
strideynet added a commit that referenced this pull request Sep 10, 2024
* set annotations on teleport-kube-agent statefulset

* empty commit to trigger ci

---------

Co-authored-by: Sean Liao <sean+git@liao.dev>
strideynet added a commit that referenced this pull request Sep 10, 2024
* set annotations on teleport-kube-agent statefulset

* empty commit to trigger ci

---------

Co-authored-by: Sean Liao <sean+git@liao.dev>
github-merge-queue bot pushed a commit that referenced this pull request Sep 10, 2024
* set annotations on teleport-kube-agent statefulset

* empty commit to trigger ci

---------

Co-authored-by: Sean Liao <sean+git@liao.dev>
github-merge-queue bot pushed a commit that referenced this pull request Sep 10, 2024
* set annotations on teleport-kube-agent statefulset

* empty commit to trigger ci

---------

Co-authored-by: Sean Liao <sean+git@liao.dev>
github-merge-queue bot pushed a commit that referenced this pull request Sep 10, 2024
* set annotations on teleport-kube-agent statefulset

* empty commit to trigger ci

---------

Co-authored-by: Sean Liao <sean+git@liao.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants