Skip to content
This repository was archived by the owner on Sep 21, 2020. It is now read-only.

Conversation

@amatas
Copy link
Contributor

@amatas amatas commented Sep 20, 2018

The gpii-ops/couchdb-docker#2 is also needed. Although the CouchDB container is already built and tested.

I updated the chart from the incubator and added the code needed to provide the "affinity" feature from Sergey's PR: helm/charts#7224

Since we don't have the commit history of upstream, I checked out the repository and see the differences with upstream, applying them in our branch.

@mrtyler
Copy link
Contributor

mrtyler commented Sep 20, 2018

I see changes to the couchdb chart that look like they come from upstream, but I see no reference to merging from upstream, what commit(s) were merged, or any other information that might help the next time someone wants to merge changes from upstream.

@amatas
Copy link
Contributor Author

amatas commented Sep 20, 2018

I've updated the description of the PR and also the jira issue. I didn't merge the commits from upstream since we don't have the git history in this repository. The only way I found to have the changes was comparing the code of the latest version of the CouchDB helm chart from upstream with our local helm chart.

@mrtyler
Copy link
Contributor

mrtyler commented Sep 20, 2018

LGTM

Thanks, Alfredo. Longer term, we'll probably want a more mature release process for our Helm charts (e.g. forking the upstream charts repo directly, dedicated CI that produces a versioned chart artifact, gpii-infra consumes that artifact rather than having the chart bundled inside). Until then, documentation like this is often a life saver for the next merge.

@natarajaya
Copy link
Contributor

LGTM

@stepanstipl
Copy link
Contributor

Looks good

@amatas amatas merged commit a2ae267 into gpii-ops:master Sep 21, 2018
@amatas amatas deleted the GPII-3387 branch July 9, 2019 16:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants