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

Added option for custom environment variables for PostgreSQL. #7589

Merged
merged 1 commit into from
Oct 16, 2018
Merged

Added option for custom environment variables for PostgreSQL. #7589

merged 1 commit into from
Oct 16, 2018

Conversation

bokysan
Copy link
Contributor

@bokysan bokysan commented Sep 6, 2018

This commit enables the user to specify additional environment
variables in the stable/postgres chart.

What this PR does / why we need it:
This is especially important for custom Postgres images which might have different environment variables for different options or for enabling additional features.

Special notes for your reviewer:
Nothing special here, really, the same pattern for adding variables is also used in other charts.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 6, 2018
@cpanato
Copy link
Member

cpanato commented Sep 6, 2018

@bokysan please bump the chart version

@ey-bot ey-bot added the Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). label Sep 6, 2018
@bokysan
Copy link
Contributor Author

bokysan commented Sep 6, 2018

Version bumped.

@ey-bot ey-bot added the Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). label Sep 6, 2018
@ey-bot ey-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). labels Sep 7, 2018
@@ -3,7 +3,7 @@ image: "postgres"
## postgres image version
## ref: https://hub.docker.com/r/library/postgres/tags/
##
imageTag: "9.6.2"
imageTag: "10.5"
Copy link
Collaborator

Choose a reason for hiding this comment

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

You are changing the postgres version here, which seems out of the scope of this PR.

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 agree. But then again so should changing the verison of the helm chart.

Happy to revert, but frankly:

  • I'm not sure anymore what should be the scope and what not
  • I have tested the chart with this new version and does work OK.

I'd kindly ask that this PR finally gets merged, since it works and it's an improvement given current situation either way.

Copy link
Collaborator

Choose a reason for hiding this comment

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

It would be healthier to separate concerns and do two differents PRs. A lot of people are cherry-picking commits and may see their postgres version change without realizing (no hint from commit message).

Although I am happy with both changes. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What if we just change the commit message then?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm personally against this, but let's see other people's point of view. It is easy to do two different PRs for different concerns.

@bokysan
Copy link
Contributor Author

bokysan commented Sep 18, 2018

Hello gentlemen,

There were some comments from @cpanato, which were resolved. We had a discussion about raising a postgres version with @desaintmartin, which I would leave as is (and maybe fix the commit message).

What do we do about this pull request now? Any possibility of merging it?

@cpanato
Copy link
Member

cpanato commented Sep 18, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 18, 2018
@cpanato
Copy link
Member

cpanato commented Sep 18, 2018

/lgtm cancel

@k8s-ci-robot k8s-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Sep 18, 2018
@cpanato
Copy link
Member

cpanato commented Sep 18, 2018

@bokysan talking with @desaintmartin the bump the Postgres version will be good in another PR. it is just my opinion as re-thinking this bump. Since this is a bump to a major version of Postgres maybe will be good to have in another pr

@ey-bot ey-bot added the Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). label Sep 19, 2018
@bokysan
Copy link
Contributor Author

bokysan commented Sep 19, 2018

I have rolled back the PostgreSQL version upgrade change.

I'll open a separate PR once this one gets merged.

@cpanato
Copy link
Member

cpanato commented Sep 27, 2018

@bokysan rebase and lets try to get this merged!

@bokysan
Copy link
Contributor Author

bokysan commented Oct 2, 2018

@bokysan rebase and lets try to get this merged!

I'm sorry, I don't follow -- this has been rebased into one commit from the start and with every change we did. Everything is in commit 19b6e55751a2c12fce08f9a3be9820211ab0f19d. Do you need me to do anything else?

@cpanato
Copy link
Member

cpanato commented Oct 2, 2018

@bokysan you need to rebase and then bump the chart version

@ey-bot ey-bot removed the Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). label Oct 2, 2018
@bokysan
Copy link
Contributor Author

bokysan commented Oct 2, 2018

@bokysan you need to rebase

I've rebased everything onto charts:master.

and then bump the chart version

Version has already been bumped to 1.0.0 since Sep 6, 2018 at your request on that day.

@desaintmartin
Copy link
Collaborator

Hm, I think you merged some branch into some another.

@ey-bot ey-bot added the Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). label Oct 3, 2018
@bokysan
Copy link
Contributor Author

bokysan commented Oct 3, 2018

Hi,

@desaintmartin, @cpanato. I've reverted the rebase onto master. As we apparently don't understand each other, could you kindly spell it out for me (or direct me to a web page) what exactly you need me to do to get this merged?

Thank you,
B

@desaintmartin
Copy link
Collaborator

You should do a "rebase", i.e
git fetch upstream && git rebase upstream/master && git push -f origin master, upstream being this repository and origin your fork.
https://git-scm.com/book/en/v2/Git-Branching-Rebasing
The goal is for your branch to be up-to-date AND to have only your changes in this PR, nothing else.

@cpanato
Copy link
Member

cpanato commented Oct 4, 2018

yeah, you should do a rebase, usually I add the -i to make interactive git rebase -i upstream/master

@bokysan
Copy link
Contributor Author

bokysan commented Oct 8, 2018

Ok, done. I don't know how I was able to pull all the changes in the last time.

@cpanato
Copy link
Member

cpanato commented Oct 8, 2018

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 8, 2018
This commit enables the user to specify additional environment
variables in the postgres chart.

This is especially important for custom Postgres images which might
have different environment variables for different options or for
enabling additional features.

Furthermore versions have been updated:
- Chart version has been set to 1.0.0, as this is a stable chart

Signed-off-by: Bojan Čekrlić <[email protected]>
@mattfarina
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 16, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bokysan, mattfarina

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 Oct 16, 2018
@k8s-ci-robot k8s-ci-robot merged commit 65403e8 into helm:master Oct 16, 2018
darioblanco pushed a commit to minddocdev/charts that referenced this pull request Oct 22, 2018
)

This commit enables the user to specify additional environment
variables in the postgres chart.

This is especially important for custom Postgres images which might
have different environment variables for different options or for
enabling additional features.

Furthermore versions have been updated:
- Chart version has been set to 1.0.0, as this is a stable chart

Signed-off-by: Bojan Čekrlić <[email protected]>
emas80 pushed a commit to faceit/charts that referenced this pull request Oct 24, 2018
)

This commit enables the user to specify additional environment
variables in the postgres chart.

This is especially important for custom Postgres images which might
have different environment variables for different options or for
enabling additional features.

Furthermore versions have been updated:
- Chart version has been set to 1.0.0, as this is a stable chart

Signed-off-by: Bojan Čekrlić <[email protected]>
Jnig pushed a commit to Jnig/charts that referenced this pull request Nov 13, 2018
)

This commit enables the user to specify additional environment
variables in the postgres chart.

This is especially important for custom Postgres images which might
have different environment variables for different options or for
enabling additional features.

Furthermore versions have been updated:
- Chart version has been set to 1.0.0, as this is a stable chart

Signed-off-by: Bojan Čekrlić <[email protected]>
Signed-off-by: Jakob Niggel <[email protected]>
wgiddens pushed a commit to wgiddens/charts that referenced this pull request Jan 18, 2019
)

This commit enables the user to specify additional environment
variables in the postgres chart.

This is especially important for custom Postgres images which might
have different environment variables for different options or for
enabling additional features.

Furthermore versions have been updated:
- Chart version has been set to 1.0.0, as this is a stable chart

Signed-off-by: Bojan Čekrlić <[email protected]>
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants