This repository has been archived by the owner on Feb 22, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 16.8k
prometheus: switch to Kubernetes 1.6 storage class specification #1332
Merged
mgoodness
merged 2 commits into
helm:master
from
bryanlarsen:prometheus-storage-class-1-6
Aug 1, 2017
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -84,10 +84,13 @@ alertmanager: | |
size: 2Gi | ||
|
||
## alertmanager data Persistent Volume Storage Class | ||
## If defined, volume.beta.kubernetes.io/storage-class: <storageClass> | ||
## Default: volume.alpha.kubernetes.io/storage-class: default | ||
## If defined, storageClassName: <storageClass> | ||
## If set to "-", storageClassName: "", which disables dynamic provisioning | ||
## If undefined (the default) or set to null, no storageClassName spec is | ||
## set, choosing the default provisioner. (gp2 on AWS, standard on | ||
## GKE, AWS & OpenStack) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Perhaps also a note about providing the old annotations for clusters <1.6? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @seanknox's comment indicated a deprecation of v1.5 support. |
||
## | ||
storageClass: "" | ||
# storageClass: "-" | ||
|
||
## Subdirectory of alertmanager data Persistent Volume to mount | ||
## Useful if the volume's root directory is not empty | ||
|
@@ -360,10 +363,13 @@ server: | |
size: 8Gi | ||
|
||
## Prometheus server data Persistent Volume Storage Class | ||
## If defined, volume.beta.kubernetes.io/storage-class: <storageClass> | ||
## Default: volume.alpha.kubernetes.io/storage-class: default | ||
## If defined, storageClassName: <storageClass> | ||
## If set to "-", storageClassName: "", which disables dynamic provisioning | ||
## If undefined (the default) or set to null, no storageClassName spec is | ||
## set, choosing the default provisioner. (gp2 on AWS, standard on | ||
## GKE, AWS & OpenStack) | ||
## | ||
storageClass: "" | ||
# storageClass: "-" | ||
|
||
## Subdirectory of Prometheus server data Persistent Volume to mount | ||
## Useful if the volume's root directory is not empty | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems like a reasonable approach. Provides the necessary options for 1.6+, and users can still use on <1.6 by leaving
storageClass
unset and providing the annotation.Ping @unguiculus @viglesiasce @lachie83 @prydonius @seanknox @linki @sameersbn @foxish: is this a/the pattern we want to adopt repo-wide?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK with me. Plus, now that v1.7 is out, we should formally deprecate v1.5 support and focus on v1.6 and v1.7.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK with me too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1