fix(pvc): split PVC configuration between Deployments #224
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,26 @@ | ||
| {{- if ((.Values.storage.pvc).enabled) }} | ||
| apiVersion: v1 | ||
| kind: PersistentVolumeClaim | ||
| metadata: | ||
| name: {{ include "cryostat.fullname" . }}-storage | ||
| {{- $labels := include "cryostat.labels" $ | nindent 4 }} | ||
| labels: {{ $labels }} | ||
| {{- with .Values.storage.pvc.annotations }} | ||
| annotations: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| {{- with .Values.storage.pvc.accessModes }} | ||
| accessModes: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| resources: | ||
| requests: | ||
| storage: {{ .Values.storage.pvc.storage }} | ||
| {{- if kindIs "string" .Values.storage.pvc.storageClassName }} | ||
| storageClassName: {{ .Values.storage.pvc.storageClassName | quote }} | ||
| {{- end }} | ||
| {{- with .Values.storage.pvc.selector }} | ||
| selector: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ templates: | |
| tests: | ||
| - it: should create a PersistentVolumeClaim with correct settings | ||
| set: | ||
| db.pvc: | ||
| enabled: true | ||
| storage: "10Gi" | ||
| accessModes: | ||
|
|
@@ -50,7 +50,7 @@ tests: | |
|
|
||
| - it: should not create a PersistentVolumeClaim when PVC is disabled | ||
| set: | ||
| db.pvc: | ||
| enabled: false | ||
| asserts: | ||
| - hasDocuments: | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ templates: | |
| tests: | ||
| - it: should create a PersistentVolumeClaim with correct settings | ||
| set: | ||
| storage.pvc: | ||
| enabled: true | ||
| storage: "10Gi" | ||
| accessModes: | ||
|
|
@@ -50,7 +50,7 @@ tests: | |
|
|
||
| - it: should not create a PersistentVolumeClaim when PVC is disabled | ||
| set: | ||
| storage.pvc: | ||
| enabled: false | ||
| asserts: | ||
| - hasDocuments: | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -374,31 +374,6 @@ | |
| "db": { | ||
| "type": "object", | ||
| "properties": { | ||
| "image": { | ||
| "type": "object", | ||
| "properties": { | ||
|
|
@@ -453,12 +428,7 @@ | |
| } | ||
| } | ||
| } | ||
| }, | ||
| "securityContext": { | ||
| "type": "object", | ||
| "properties": { | ||
|
|
@@ -484,6 +454,42 @@ | |
| } | ||
| } | ||
| }, | ||
| "pvc": { | ||
| "type": "object", | ||
| "properties": { | ||
| "enabled": { | ||
| "type": "boolean", | ||
| "description": "Specify whether to use persistentVolumeClaim (true) or EmptyDir storage (false). This is recommended to be enabled, but the storage size and selector should be chosen carefully first.", | ||
| "default": false | ||
| }, | ||
| "storage": { | ||
| "type": "string", | ||
| "description": "Storage size to request for the persistentVolumeClaim", | ||
| "default": "500Mi" | ||
| }, | ||
| "accessModes": { | ||
| "type": "array", | ||
| "description": "Access mode for the persistentVolumeClaim. See: [Access Modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims)", | ||
| "default": [ | ||
| "ReadWriteOnce" | ||
| ], | ||
| "items": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "storageClassName": { | ||
| "type": "string", | ||
| "description": "The name of the StorageClass for the persistentVolumeClaim. See: [Class](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims)", | ||
| "default": "", | ||
| "nullable": true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "storage": { | ||
| "type": "object", | ||
| "properties": { | ||
| "storageSecretName": { | ||
| "type": "string", | ||
| "description": "Name of the secret containing the object storage secret access key. This secret must contain a STORAGE_ACCESS_KEY secret which is the object storage secret access key. It must not be updated across chart upgrades, or else the connection between Cryostat components and object storage will not be able to initialize. It is recommended that the secret should be marked as immutable to avoid accidental changes to secret's data. More details: https://kubernetes.io/docs/concepts/configuration/secret/#secret-immutable", | ||
|
|
@@ -519,6 +525,31 @@ | |
| } | ||
| } | ||
| }, | ||
| "securityContext": { | ||
| "type": "object", | ||
| "properties": { | ||
| "capabilities": { | ||
| "type": "object", | ||
| "properties": { | ||
| "drop": { | ||
| "type": "array", | ||
| "description": "", | ||
| "default": [ | ||
| "ALL" | ||
| ], | ||
| "items": { | ||
| "type": "string" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "allowPrivilegeEscalation": { | ||
| "type": "boolean", | ||
| "description": "", | ||
| "default": false | ||
| } | ||
| } | ||
| }, | ||
| "service": { | ||
| "type": "object", | ||
| "properties": { | ||
|
|
@@ -553,6 +584,37 @@ | |
| } | ||
| } | ||
| } | ||
| }, | ||
| "pvc": { | ||
| "type": "object", | ||
| "properties": { | ||
| "enabled": { | ||
| "type": "boolean", | ||
| "description": "Specify whether to use persistentVolumeClaim (true) or EmptyDir storage (false). This is recommended to be enabled, but the storage size and selector should be chosen carefully first.", | ||
| "default": false | ||
| }, | ||
| "storage": { | ||
| "type": "string", | ||
| "description": "Storage size to request for the persistentVolumeClaim", | ||
| "default": "500Mi" | ||
| }, | ||
| "accessModes": { | ||
| "type": "array", | ||
| "description": "Access mode for the persistentVolumeClaim. See: [Access Modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims)", | ||
| "default": [ | ||
| "ReadWriteOnce" | ||
| ], | ||
| "items": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "storageClassName": { | ||
| "type": "string", | ||
| "description": "The name of the StorageClass for the persistentVolumeClaim. See: [Class](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims)", | ||
| "default": "", | ||
| "nullable": true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
@@ -1012,31 +1074,6 @@ | |
| "description": "Tolerations for the Cryostat Pod. See: [Tolerations](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#scheduling)", | ||
| "default": [], | ||
| "items": {} | ||
| } | ||
| } | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -145,6 +145,20 @@ db: | |
| cpu: 25m | ||
| ## @param db.resources.requests.memory Memory resource request for the database container. | ||
| memory: 64Mi | ||
| pvc: | ||
| ## @param db.pvc.enabled Specify whether to use persistentVolumeClaim (true) or EmptyDir storage (false). This is recommended to be enabled, but the storage size and selector should be chosen carefully first. | ||
| enabled: false | ||
| ## @param db.pvc.annotations [object] Annotations to add to the persistentVolumeClaim | ||
| annotations: {} | ||
| ## @param db.pvc.storage Storage size to request for the persistentVolumeClaim | ||
| storage: 500Mi | ||
| ## @param db.pvc.accessModes Access mode for the persistentVolumeClaim. See: [Access Modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims) | ||
| accessModes: | ||
| - ReadWriteOnce | ||
| ## @param db.pvc.selector [object] Selector for the persistentVolumeClaim. See: [Selector](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims) | ||
| selector: {} | ||
| ## @param db.pvc.storageClassName [string, nullable] The name of the StorageClass for the persistentVolumeClaim. See: [Class](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims) | ||
| storageClassName: "" | ||
| ## @param db.securityContext [object] Security Context for the database container. Defaults to meet "restricted" [Pod Security Standard](https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted). See: [SecurityContext](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context-1) | ||
| securityContext: | ||
| ## @skip db.securityContext.allowPrivilegeEscalation | ||
|
|
@@ -180,6 +194,20 @@ storage: | |
| cpu: 50m | ||
| ## @param storage.resources.requests.memory Memory resource request for the object storage container. | ||
| memory: 256Mi | ||
| pvc: | ||
| ## @param storage.pvc.enabled Specify whether to use persistentVolumeClaim (true) or EmptyDir storage (false). This is recommended to be enabled, but the storage size and selector should be chosen carefully first. | ||
| enabled: false | ||
| ## @param storage.pvc.annotations [object] Annotations to add to the persistentVolumeClaim | ||
| annotations: {} | ||
| ## @param storage.pvc.storage Storage size to request for the persistentVolumeClaim | ||
| storage: 500Mi | ||
| ## @param storage.pvc.accessModes Access mode for the persistentVolumeClaim. See: [Access Modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims) | ||
| accessModes: | ||
| - ReadWriteOnce | ||
| ## @param storage.pvc.selector [object] Selector for the persistentVolumeClaim. See: [Selector](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims) | ||
| selector: {} | ||
| ## @param storage.pvc.storageClassName [string, nullable] The name of the StorageClass for the persistentVolumeClaim. See: [Class](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims) | ||
|
There was a problem hiding this comment. nit: I think we should the URL should include section point. For example: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class |
||
| storageClassName: "" | ||
|
There was a problem hiding this comment. I think these https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class-1 |
||
| ## @param storage.securityContext [object] Security Context for the storage container. Defaults to meet "restricted" [Pod Security Standard](https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted). See: [SecurityContext](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context-1) | ||
| securityContext: | ||
| ## @skip storage.securityContext.allowPrivilegeEscalation | ||
|
|
@@ -370,18 +398,3 @@ tolerations: [] | |
|
|
||
| ## @param affinity [object] Affinity for the Cryostat Pod. See: [Affinity](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#scheduling) | ||
| affinity: {} | ||
Oops, something went wrong.
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.
I think
.db.resourcesrefers to container resource requirements :DThere 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.
Ah right, thanks. I initially nested it under
resources, but then it would be annoying to set PVC settings and CPU/memory separately so I moved it back up a level. I'll change this when I'm back at my computer (probably Monday).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.
Sounds good! Happy Black Friday weekends^^