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

Helm custom labels (#369) #370

Merged
merged 6 commits into from
Jun 17, 2021
Merged

Helm custom labels (#369) #370

merged 6 commits into from
Jun 17, 2021

Conversation

ludovic-pourrat
Copy link
Contributor

Provide the support for global custom labels.

Provide the support for global custom labels.
@ludovic-pourrat ludovic-pourrat requested a review from a team as a code owner June 10, 2021 09:57
@CLAassistant
Copy link

CLAassistant commented Jun 10, 2021

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@mflendrich mflendrich left a comment

Choose a reason for hiding this comment

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

Just a few small fixes.

charts/kong/README.md Outdated Show resolved Hide resolved
charts/kong/README.md Outdated Show resolved Hide resolved
charts/kong/ci/custom-labels.yaml Outdated Show resolved Hide resolved
charts/kong/values.yaml Outdated Show resolved Hide resolved
ludovic-pourrat and others added 4 commits June 10, 2021 13:26
Co-authored-by: Michał Flendrich <m.flendrich@gmail.com>
Update according feedback.
@ludovic-pourrat
Copy link
Contributor Author

@mflendrich I got one another issue to fix, so what is the process for merging this PR ?

Thanks !

@rainest
Copy link
Contributor

rainest commented Jun 16, 2021

@ludovic-pourrat there's currently some conflict between it and current next that blocks the merge. You'll want to update your copy of next with upstream changes, merge next into your branch, fix conflicts that occur during the merge, and then push the result.

@ludovic-pourrat
Copy link
Contributor Author

@rainest fork up-to-date mow.

Thanks.

Copy link
Contributor

@ccfishk ccfishk left a comment

Choose a reason for hiding this comment

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

post one comment


```yaml
extraLabels:
acme.com/some-key: some-value
Copy link
Contributor

Choose a reason for hiding this comment

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

would suggest using format
acme.com/some-key: "{{.value}}"

@rainest rainest merged commit 9ef9e44 into Kong:next Jun 17, 2021
@rainest
Copy link
Contributor

rainest commented Jun 17, 2021

Ah the damn Github UI was complaining about rebase merge mode only. That should probably have some UI indicator that a squash merge won't cause conflicts :| no matter.

Thank you for your contribution. Please fill out the following form to claim your contributor swag:
https://github.com/Kong/kong/blob/master/CONTRIBUTING.md#contributor-t-shirt.

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.

None yet

5 participants