Skip to content
This repository was archived by the owner on Feb 22, 2022. It is now read-only.

[stable/postgresql] Support adding labels and annotations to pods. #11313

Merged
merged 1 commit into from
Feb 18, 2019
Merged

[stable/postgresql] Support adding labels and annotations to pods. #11313

merged 1 commit into from
Feb 18, 2019

Conversation

bradenwright
Copy link
Contributor

What this PR does / why we need it:

It allows the ability to add labels and annotations to the pods. This is need so I can disable Istio's sidecar proxy via an annotation.

Which issue this PR fixes

N/A

Special notes for your reviewer:

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • DCO signed
  • Chart Version bumped
  • Variables are documented in the README.md

@helm-bot helm-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). labels Feb 10, 2019
Copy link
Collaborator

@tompizmor tompizmor left a comment

Choose a reason for hiding this comment

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

Can you also apply the changes from values.yaml to values-production.yaml?

@tompizmor
Copy link
Collaborator

It seems there are also conflicts in the Chart.yaml file. Can you resolve them?

@helm-bot helm-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). labels Feb 18, 2019
@bradenwright
Copy link
Contributor Author

@tompizmor sorry missed the notification somehow, but should be all good now

@helm-bot helm-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 18, 2019
…rge conflict

Signed-off-by: Braden Wright <braden.m.wright@gmail.com>
@helm-bot helm-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 18, 2019
@tompizmor
Copy link
Collaborator

No worries!
/ok-to-test
/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bradenwright, tompizmor

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Feb 18, 2019
@k8s-ci-robot k8s-ci-robot merged commit 5fd24a8 into helm:master Feb 18, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). lgtm Indicates that a PR is ready to be merged. ok-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.

4 participants