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

Cerebro service annotations, image update and configuration overrides#6595

Merged
k8s-ci-robot merged 5 commits intohelm:masterfrom
scality:cerebro-labels
Jul 15, 2018
Merged

Cerebro service annotations, image update and configuration overrides#6595
k8s-ci-robot merged 5 commits intohelm:masterfrom
scality:cerebro-labels

Conversation

@NicolasT
Copy link
Copy Markdown
Contributor

This PR updates the stable/cerebro chart to

  • Allow to set annotations on the Service
  • Update the default Docker image to use the official upstream one
  • Allow to set various application configuration values through values.yaml
  • Use out-of-container storage (emptyDir) for the application database

Note to reviewers:

  • Unlike the original Docker image, the official one doesn't run as root, hence the initContainer
  • Version bumped according to SEMVER with every commit for consistency, so 0.1.1 -> 0.2.0 -> 0.2.1 -> 0.3.0

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 11, 2018
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 11, 2018
@NicolasT
Copy link
Copy Markdown
Contributor Author

/assign @prydonius
/assign @unguiculus
/assign @timstoop

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Where did 0.2 go to?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I tried to explain in the PR comment. See e.g. 0dd516d#diff-0fcab9ba30f2d528e9326bf1299ef520R9

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Basically wanted to make sure every commit (~ version) introduced by this PR has a correct Chart version attached to it.

@desaintmartin
Copy link
Copy Markdown
Collaborator

LGTM

Running it right now without issue, I was about to write it myself. Good timing, thanks.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this should probably be removed if using another image

Copy link
Copy Markdown
Contributor Author

@NicolasT NicolasT Jul 13, 2018

Choose a reason for hiding this comment

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

Good point, will do (also in README).

NicolasT added 3 commits July 13, 2018 18:19
With this PR, one can configure Cerebro through Helm *values*, which is
primarily useful to add predefined Elasticsearch clusters (`hosts`).

Setting `auth` options is currently not supported.

Also, the Cerebro database file is kept in an `emptyDir` instead of
storing it inside the container.

Note: the `secret` value is changed at every (re)deployment, which may
impact cookies and CSRF tokens validated by Cerebro.
@NicolasT
Copy link
Copy Markdown
Contributor Author

Updated to use the 'new' Docker image source repository in Chart.yaml, and document the new 'values' in README.md.

@unguiculus
Copy link
Copy Markdown
Member

/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 Jul 15, 2018
@unguiculus
Copy link
Copy Markdown
Member

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: NicolasT, unguiculus

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Jul 15, 2018
@k8s-ci-robot k8s-ci-robot merged commit 0111ba4 into helm:master Jul 15, 2018
@NicolasT NicolasT deleted the cerebro-labels branch July 15, 2018 19:25
NicolasT added a commit to scality/charts that referenced this pull request Jul 15, 2018
NicolasT added a commit to scality/metalk8s that referenced this pull request Jul 15, 2018
Some recent changes in the Cerebro chart allow to configure the
application, e.g. to set a pre-configured Elasticsearch cluster.

See: helm/charts#6595
See: helm/charts@0111ba4
NicolasT added a commit to scality/metalk8s that referenced this pull request Jul 16, 2018
Some recent changes in the Cerebro chart allow to configure the
application, e.g. to set a pre-configured Elasticsearch cluster.

See: helm/charts#6595
See: helm/charts@0111ba4
k8s-ci-robot pushed a commit that referenced this pull request Jul 16, 2018
NicolasT added a commit to scality/metalk8s that referenced this pull request Jul 17, 2018
Some recent changes in the Cerebro chart allow to configure the
application, e.g. to set a pre-configured Elasticsearch cluster.

See: helm/charts#6595
See: helm/charts@0111ba4
mhamilton723 pushed a commit to mhamilton723/charts that referenced this pull request Jul 24, 2018
…helm#6595)

* stable/cerebro: Add service annotations support

* stable/cerebro: Use 'official' Docker image

Use https://hub.docker.com/r/lmenezes/cerebro/ instead of
https://hub.docker.com/r/yannart/cerebro/

* stable/cerebro: Set application config through values

With this PR, one can configure Cerebro through Helm *values*, which is
primarily useful to add predefined Elasticsearch clusters (`hosts`).

Setting `auth` options is currently not supported.

Also, the Cerebro database file is kept in an `emptyDir` instead of
storing it inside the container.

Note: the `secret` value is changed at every (re)deployment, which may
impact cookies and CSRF tokens validated by Cerebro.

* Update values.yaml

* Update Chart.yaml
mhamilton723 pushed a commit to mhamilton723/charts that referenced this pull request Jul 24, 2018
aba182 pushed a commit to aba182/charts that referenced this pull request Sep 7, 2018
See: 0111ba4
See: helm@0111ba4
See: helm#6595
See: helm#6595
Signed-off-by: aba182 <ajwilhel@gmail.com>
@johnmarcou
Copy link
Copy Markdown

johnmarcou commented Sep 21, 2018

Hello!

I might have found a little typo in the helm chart.
When I am specifying a config.hosts, I can found a , in the json config.

Here the command:
helm upgrade --install my-cerebro stable/cerebro --set ingress.enabled=true --set ingress.hosts.0=cerebro.asci.synchrotron.org.au --set config.hosts.0.host=http://my-release-elasticsearch-client:9200 --set config.hosts.0.name=kube-logging

The resulting K8s config manifest:

secret = "[redacted]"
basePath = "/"
pidfile.path = /dev/null
rest.history.size = 50
data.path = "/var/db/cerebro/cerebro.db"
es = {
  gzip = true
}
auth = {
}
hosts = [
  ,
  {
    host = "http://my-release-elasticsearch-client:9200"
    name = "kube-logging"
  }
]

https://github.com/helm/charts/blob/master/stable/cerebro/templates/configmap.yaml#L31

This one should be after the item, only if there is multiple hosts, I guess?

Thx

Jnig pushed a commit to Jnig/charts that referenced this pull request Nov 13, 2018
…helm#6595)

* stable/cerebro: Add service annotations support

* stable/cerebro: Use 'official' Docker image

Use https://hub.docker.com/r/lmenezes/cerebro/ instead of
https://hub.docker.com/r/yannart/cerebro/

* stable/cerebro: Set application config through values

With this PR, one can configure Cerebro through Helm *values*, which is
primarily useful to add predefined Elasticsearch clusters (`hosts`).

Setting `auth` options is currently not supported.

Also, the Cerebro database file is kept in an `emptyDir` instead of
storing it inside the container.

Note: the `secret` value is changed at every (re)deployment, which may
impact cookies and CSRF tokens validated by Cerebro.

* Update values.yaml

* Update Chart.yaml

Signed-off-by: Jakob Niggel <info@jakobniggel.de>
Jnig pushed a commit to Jnig/charts that referenced this pull request Nov 13, 2018
See: 0111ba4
See: helm@0111ba4
See: helm#6595
See: helm#6595
Signed-off-by: Jakob Niggel <info@jakobniggel.de>
gsemet pushed a commit to gsemet/charts that referenced this pull request Nov 13, 2018
…helm#6595)

* stable/cerebro: Add service annotations support

* stable/cerebro: Use 'official' Docker image

Use https://hub.docker.com/r/lmenezes/cerebro/ instead of
https://hub.docker.com/r/yannart/cerebro/

* stable/cerebro: Set application config through values

With this PR, one can configure Cerebro through Helm *values*, which is
primarily useful to add predefined Elasticsearch clusters (`hosts`).

Setting `auth` options is currently not supported.

Also, the Cerebro database file is kept in an `emptyDir` instead of
storing it inside the container.

Note: the `secret` value is changed at every (re)deployment, which may
impact cookies and CSRF tokens validated by Cerebro.

* Update values.yaml

* Update Chart.yaml
gsemet pushed a commit to gsemet/charts that referenced this pull request Nov 13, 2018
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants