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

Prometheus: default to alpha dynamic PV annotation #235

Merged
merged 2 commits into from
Nov 21, 2016
Merged

Prometheus: default to alpha dynamic PV annotation #235

merged 2 commits into from
Nov 21, 2016

Conversation

mgoodness
Copy link
Contributor

Addresses #227, based on input from #116.

Alpha dynamic provisioner only looks for annotation, not value. To enable the beta provisioner, operator provides .Values.{alertmanager|server}.persistentVolume.storageClass.

Addresses #227
Alpha dynamic provisioner only looks for annotation, not value. To
enable the beta provisioner, operator provides
`.Values.{alertmanager|server}.persistentVolume.storageClass`.
@k8s-ci-robot
Copy link
Contributor

Can a kubernetes member verify that this patch is reasonable to test? If so, please reply with "@k8s-bot ok to test" on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands will still work. Regular contributors should join the org to skip this step.

If you have questions or suggestions related to this bot's behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 19, 2016
@mgoodness
Copy link
Contributor Author

mgoodness commented Nov 19, 2016

I'll update docs if/when this is deemed an acceptable approach.

@mgoodness mgoodness changed the title Default to alpha dynamic PV annotation [WIP] Prometheus: default to alpha dynamic PV annotation [WIP] Nov 19, 2016
Copy link
Member

@prydonius prydonius left a comment

Choose a reason for hiding this comment

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

Thanks @mgoodness, I think this is the approach we should take in other charts.

{{- if .Values.alertmanager.persistentVolume.storageClass -}}
volume.beta.kubernetes.io/storage-class: {{ .Values.alertmanager.persistentVolume.storageClass }}
{{ else }}
volume.alpha.kubernetes.io/storage-class: ''
Copy link
Member

Choose a reason for hiding this comment

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

According to http://kubernetes.io/docs/user-guide/persistent-volumes/#writing-portable-configuration we should set it to default (although I don't think it actually makes a difference)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let me add that real quick.

@prydonius
Copy link
Member

@k8s-bot ok to test

@mgoodness mgoodness changed the title Prometheus: default to alpha dynamic PV annotation [WIP] Prometheus: default to alpha dynamic PV annotation Nov 21, 2016
@mgoodness
Copy link
Contributor Author

Also added documentation for the new storageClass values. No longer WIP.

@prydonius
Copy link
Member

lgtm! Thanks a lot @mgoodness!!

@prydonius prydonius merged commit 19f85b0 into helm:master Nov 21, 2016
@mgoodness mgoodness deleted the prometheus branch November 21, 2016 23:50
AmandaCameron added a commit to AmandaCameron/charts that referenced this pull request Jan 16, 2017
This changes all the various pvc.yaml files to use tha pattern shown in helm#235
This also includes a simple sed -i replacement to comment out the storageClass values in the various values.yaml
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants