Skip to content

Helm Chart: Add annotations to the service account in the Helm chart #3065

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

Merged
merged 10 commits into from
Oct 21, 2022

Conversation

0m1xa
Copy link
Contributor

@0m1xa 0m1xa commented Sep 20, 2022

Add annotations to pass with helm chart values.

Proposed changes

Describe the use case and detail of the change. If this PR addresses an issue on GitHub, make sure to include a link to that issue here in this description (not in the title of the PR).
The main idea is to have the ability to provide annotations to the service account.
It may be useful in many cases.
For example, according to this documentation, the service account should have the proper annotation when using the ingress controller with AWS Marketplace.
Before this PR it was not possible to specify this annotation with the helm chart.

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto main
  • I will ensure my PR is targeting the main branch and pulling from my branch from my own fork

Add annotations to pass with helm chart values.
@github-actions github-actions bot added the documentation Pull requests/issues for documentation label Sep 20, 2022
Copy link
Contributor

@jasonwilliams14 jasonwilliams14 left a comment

Choose a reason for hiding this comment

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

Please see comments.

[~] Revert Chart.yaml
[~] Fix formatting in README.md
[-] Delete unnecessary `controller.includeYear` from values.yaml. This parameter doesn't use anymore. Tested on 2.3.0 and 2.3.1
@0m1xa
Copy link
Contributor Author

0m1xa commented Sep 21, 2022

@jasonwilliams14
Please see another update. I mentioned that values.yml uses the unnecessary parameter includeYear, preventing PODs from successfully starting.
I've tested it with 2.3.0 and 2.3.1

@lucacome
Copy link

@0m1xa if you test it with edge it shouldn't complain about includeYear

Revert  includeYear: false
@lucacome lucacome requested review from a team, lucacome, ciarams87 and jjngx September 27, 2022 04:30
@lucacome lucacome self-assigned this Sep 27, 2022
@lucacome lucacome added this to the v2.4.0 milestone Sep 27, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #3065 (b9f2b53) into main (bf67929) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #3065      +/-   ##
==========================================
- Coverage   52.29%   52.28%   -0.01%     
==========================================
  Files          58       58              
  Lines       15995    16006      +11     
==========================================
+ Hits         8364     8369       +5     
- Misses       7352     7358       +6     
  Partials      279      279              
Impacted Files Coverage Δ
internal/k8s/controller.go 11.10% <0.00%> (-0.02%) ⬇️
cmd/nginx-ingress/main.go 0.00% <0.00%> (ø)
cmd/nginx-ingress/flags.go 34.42% <0.00%> (ø)
internal/configs/config_params.go 76.74% <0.00%> (ø)
internal/configs/version2/http.go 0.00% <0.00%> (ø)
internal/configs/version1/config.go 0.00% <0.00%> (ø)
internal/k8s/configuration.go 95.39% <0.00%> (+<0.01%) ⬆️
internal/configs/virtualserver.go 95.22% <0.00%> (+<0.01%) ⬆️
internal/configs/transportserver.go 93.81% <0.00%> (+0.03%) ⬆️
internal/configs/configmaps.go 20.37% <0.00%> (+0.16%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@lucacome lucacome modified the milestones: v2.4.0, v2.5.0 Oct 1, 2022
0m1xa and others added 4 commits October 20, 2022 10:02
Co-authored-by: Luca Comellini <luca.com@gmail.com>
Co-authored-by: Luca Comellini <luca.com@gmail.com>
Co-authored-by: Luca Comellini <luca.com@gmail.com>
Copy link
Contributor

@jasonwilliams14 jasonwilliams14 left a comment

Choose a reason for hiding this comment

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

Looks good.

@lucacome lucacome enabled auto-merge (squash) October 21, 2022 22:12
@lucacome lucacome merged commit bcef6c8 into nginx:main Oct 21, 2022
coolbry95 pushed a commit to coolbry95/kubernetes-ingress that referenced this pull request Nov 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Pull requests/issues for documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants