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

Adding annotations support to helm chart configmaps #5178

Merged
merged 2 commits into from
Feb 26, 2020
Merged

Adding annotations support to helm chart configmaps #5178

merged 2 commits into from
Feb 26, 2020

Conversation

gregsidelinger
Copy link
Contributor

Signed-off-by: Greg Sidelinger [email protected]

What this PR does / why we need it:

We are using harness.io for deployments and they actually rename configmaps by default to allow for multiple versions of the app to be deployed at a time. In order to disable this feature I need to be able to add an annotation on the configmap as documented here. This PR adds support for annotations on the custom config, tcp and ucp configmaps as their names are passed in via command line switches.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Which issue/s this PR fixes

How Has This Been Tested?

I tested the chart updates locally.

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

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

Welcome @gregsidelinger!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @gregsidelinger. Thanks for your PR.

I'm waiting for a kubernetes 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/test-infra 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 Feb 26, 2020
@aledbf
Copy link
Member

aledbf commented Feb 26, 2020

/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 Feb 26, 2020
@aledbf
Copy link
Member

aledbf commented Feb 26, 2020

ping @ChiefAlexander

@codecov-io
Copy link

codecov-io commented Feb 26, 2020

Codecov Report

Merging #5178 into master will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5178      +/-   ##
==========================================
+ Coverage   58.61%   58.64%   +0.02%     
==========================================
  Files          88       88              
  Lines        6872     6872              
==========================================
+ Hits         4028     4030       +2     
+ Misses       2402     2401       -1     
+ Partials      442      441       -1
Impacted Files Coverage Δ
internal/ingress/metric/collectors/process.go 90.62% <0%> (+2.08%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2ca93f7...a942b4e. Read the comment docs.

@aledbf
Copy link
Member

aledbf commented Feb 26, 2020

@gregsidelinger thank you for the PR. We are still in the process of migrating the helm chart into the repository. For that reason, approval/merging of this PR could take some days.
Also, we plan to release a helm chart after this TODO list is complete

@gregsidelinger
Copy link
Contributor Author

@aledbf I'm going to assume all of the tests that failed are from the in flight move based on what I saw and can be re-ran once they are fixed. Let me know if there is anything needed from me or if the new settings should be moved to other locations in the values file.

@aledbf
Copy link
Member

aledbf commented Feb 26, 2020

I'm going to assume all of the tests that failed are from the in flight move based on what I saw and can be re-ran once they are fixed.

That's correct. Once I fixed the CI jobs I'll let you know if a change is required.

@aledbf
Copy link
Member

aledbf commented Feb 26, 2020

/retest

3 similar comments
@aledbf
Copy link
Member

aledbf commented Feb 26, 2020

/retest

@aledbf
Copy link
Member

aledbf commented Feb 26, 2020

/retest

@aledbf
Copy link
Member

aledbf commented Feb 26, 2020

/retest

Copy link
Contributor

@ChiefAlexander ChiefAlexander left a comment

Choose a reason for hiding this comment

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

This looks good to me. Thanks for doing the first PR to the chart here!

@aledbf
Copy link
Member

aledbf commented Feb 26, 2020

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 26, 2020
@aledbf
Copy link
Member

aledbf commented Feb 26, 2020

@gregsidelinger thanks!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, gregsidelinger

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 Feb 26, 2020
@aledbf
Copy link
Member

aledbf commented Feb 26, 2020

/retest

@k8s-ci-robot k8s-ci-robot merged commit a7fa4cd into kubernetes:master Feb 26, 2020
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.

5 participants