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

✨ feat: (helm/v1alpha1): Allow extra pod labels to be configured #4373

Merged
merged 1 commit into from
Nov 24, 2024

Conversation

monteiro-renato
Copy link
Contributor

The use case I have in mind is for example Azure WI configuration.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 22, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @monteiro-renato. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 22, 2024
{{ "{{- range $key, $value := .Values.controllerManager.pod.labels }}" }}
{{ "{{ $key }}" }}: {{ "{{ $value }}" }}
{{ "{{- end }}" }}
{{ "{{- end }}" }}
Copy link
Member

Choose a reason for hiding this comment

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

See:

# Labels to add to all resources and selectors.
#labels:
#- includeSelectors: true
# pairs:
# someName: someValue

I think we need to replicate the behaviour
We need to check this file
and ensure that we do in the chart the same what we would to do with kustomize

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think the use-case is a bit different.
This PR is an attempt to have something similar to:

# This patch adds an Azure Workload Identity required label to the pod
- op: add
  path: /spec/template/metadata/labels
  value:
    azure.workload.identity/use: "true"

Since you mentioned that file however, I did notice what is likely an unintended behavior while testing kubebuilder with kustomize. If you run:

cd /tmp && \
mkdir kbtestdir && \
cd kbtestdir && \
git init && \
kubebuilder init --domain tutorial.kubebuilder.io --repo tutorial.kubebuilder.io/project && \
make build-installer && \
git add . && \
kubebuilder create api --group batch --version v1 --kind CronJob --controller --resource  && \
git add . && \
make build-installer

and then check the changes, you will notice that the ClusterRole in the config/rbac/role.yaml file had it's labels removed. The generated CRD in the config/crd/bases/ is also generated without labels. For this use case I think it makes sense to use kustomize to make sure even the generated resources get the labels added.

Copy link
Member

@camilamacedo86 camilamacedo86 Nov 22, 2024

Choose a reason for hiding this comment

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

But above the option to add labels is commented. (

# Labels to add to all resources and selectors.
#labels:
#- includeSelectors: true
# pairs:
# someName: someValue
)

I think you should not do the patch.
You should use the option in the customization, right?
So, it would not add new labels to the result of build-installer.
I am not sure if I follow, sorry.

But if you see that is a bug/or you would expected another behaviour
Can you please open an issue with the steps, what you have seen and what you expected?
So, we can fix that as well.

Copy link
Member

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

Hi @monteiro-renato

Lets move forward with this one.
It is an alpha version anyway we can break things if we need after
But we need to have an issue to see how we work with

https://github.com/kubernetes-sigs/kubebuilder/pull/4373/files#r1853825165

@camilamacedo86
Copy link
Member

/lgtm
/approved
/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 24, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 24, 2024
Copy link
Member

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, monteiro-renato

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 24, 2024
@k8s-ci-robot k8s-ci-robot merged commit 8ec703e into kubernetes-sigs:master Nov 24, 2024
22 checks passed
@monteiro-renato monteiro-renato deleted the patch-8 branch November 24, 2024 14:51
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants