diff --git a/charts/kubezero-storage/README.md b/charts/kubezero-storage/README.md index 8797fd9..0df167e 100644 --- a/charts/kubezero-storage/README.md +++ b/charts/kubezero-storage/README.md @@ -1,6 +1,6 @@ # kubezero-storage -![Version: 0.8.2](https://img.shields.io/badge/Version-0.8.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.8.3](https://img.shields.io/badge/Version-0.8.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero umbrella chart for all things storage incl. AWS EBS/EFS, openEBS-lvm, gemini @@ -14,32 +14,30 @@ KubeZero umbrella chart for all things storage incl. AWS EBS/EFS, openEBS-lvm, g ## Requirements -Kubernetes: `>= 1.25.0` +Kubernetes: `>= 1.26.0` | Repository | Name | Version | |------------|------|---------| -| | aws-ebs-csi-driver | 2.18.0 | -| | aws-efs-csi-driver | 2.4.1 | -| | gemini | 2.0.0 | -| | lvm-localpv | 1.0.1 | | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://k8up-io.github.io/k8up | k8up | 4.2.0 | +| https://charts.fairwinds.com/stable | gemini | 2.1.3 | +| https://k8up-io.github.io/k8up | k8up | 4.4.1 | +| https://kubernetes-sigs.github.io/aws-ebs-csi-driver | aws-ebs-csi-driver | 2.22.0 | +| https://kubernetes-sigs.github.io/aws-efs-csi-driver | aws-efs-csi-driver | 2.4.9 | +| https://openebs.github.io/lvm-localpv | lvm-localpv | 1.2.0 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | aws-ebs-csi-driver.controller.defaultFsType | string | `"xfs"` | | -| aws-ebs-csi-driver.controller.logLevel | int | `2` | | +| aws-ebs-csi-driver.controller.loggingFormat | string | `"json"` | | | aws-ebs-csi-driver.controller.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | | aws-ebs-csi-driver.controller.replicaCount | int | `1` | | | aws-ebs-csi-driver.controller.resources.limits.memory | string | `"40Mi"` | | | aws-ebs-csi-driver.controller.resources.requests.cpu | string | `"10m"` | | | aws-ebs-csi-driver.controller.resources.requests.memory | string | `"24Mi"` | | | aws-ebs-csi-driver.controller.tolerations[0].effect | string | `"NoSchedule"` | | -| aws-ebs-csi-driver.controller.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | -| aws-ebs-csi-driver.controller.tolerations[1].effect | string | `"NoSchedule"` | | -| aws-ebs-csi-driver.controller.tolerations[1].key | string | `"node-role.kubernetes.io/control-plane"` | | +| aws-ebs-csi-driver.controller.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | | aws-ebs-csi-driver.controller.volumeMounts[0].mountPath | string | `"/var/run/secrets/sts.amazonaws.com/serviceaccount/"` | | | aws-ebs-csi-driver.controller.volumeMounts[0].name | string | `"aws-token"` | | | aws-ebs-csi-driver.controller.volumeMounts[0].readOnly | bool | `true` | | @@ -48,6 +46,7 @@ Kubernetes: `>= 1.25.0` | aws-ebs-csi-driver.controller.volumes[0].projected.sources[0].serviceAccountToken.expirationSeconds | int | `86400` | | | aws-ebs-csi-driver.controller.volumes[0].projected.sources[0].serviceAccountToken.path | string | `"token"` | | | aws-ebs-csi-driver.enabled | bool | `false` | | +| aws-ebs-csi-driver.node.loggingFormat | string | `"json"` | | | aws-ebs-csi-driver.node.resources.limits.memory | string | `"32Mi"` | | | aws-ebs-csi-driver.node.resources.requests.cpu | string | `"10m"` | | | aws-ebs-csi-driver.node.resources.requests.memory | string | `"16Mi"` | | @@ -78,9 +77,7 @@ Kubernetes: `>= 1.25.0` | aws-efs-csi-driver.controller.logLevel | int | `2` | | | aws-efs-csi-driver.controller.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | | aws-efs-csi-driver.controller.tolerations[0].effect | string | `"NoSchedule"` | | -| aws-efs-csi-driver.controller.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | -| aws-efs-csi-driver.controller.tolerations[1].effect | string | `"NoSchedule"` | | -| aws-efs-csi-driver.controller.tolerations[1].key | string | `"node-role.kubernetes.io/control-plane"` | | +| aws-efs-csi-driver.controller.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | | aws-efs-csi-driver.enabled | bool | `false` | | | aws-efs-csi-driver.node.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key | string | `"node.kubernetes.io/csi.efs.fs"` | | | aws-efs-csi-driver.node.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator | string | `"Exists"` | | @@ -98,6 +95,7 @@ Kubernetes: `>= 1.25.0` | aws-efs-csi-driver.node.tolerations[2].key | string | `"aws.amazon.com/neuron"` | | | aws-efs-csi-driver.node.tolerations[2].operator | string | `"Exists"` | | | aws-efs-csi-driver.replicaCount | int | `1` | | +| crd.volumeSnapshot | bool | `true` | | | gemini.enabled | bool | `false` | | | gemini.resources.limits.cpu | string | `"400m"` | | | gemini.resources.limits.memory | string | `"128Mi"` | | @@ -112,17 +110,13 @@ Kubernetes: `>= 1.25.0` | k8up.resources.requests.cpu | string | `"20m"` | | | k8up.resources.requests.memory | string | `"32Mi"` | | | k8up.tolerations[0].effect | string | `"NoSchedule"` | | -| k8up.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | -| k8up.tolerations[1].effect | string | `"NoSchedule"` | | -| k8up.tolerations[1].key | string | `"node-role.kubernetes.io/control-plane"` | | +| k8up.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | | lvm-localpv.analytics.enabled | bool | `false` | | | lvm-localpv.enabled | bool | `false` | | | lvm-localpv.lvmController.logLevel | int | `2` | | | lvm-localpv.lvmController.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | | lvm-localpv.lvmController.tolerations[0].effect | string | `"NoSchedule"` | | -| lvm-localpv.lvmController.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | -| lvm-localpv.lvmController.tolerations[1].effect | string | `"NoSchedule"` | | -| lvm-localpv.lvmController.tolerations[1].key | string | `"node-role.kubernetes.io/control-plane"` | | +| lvm-localpv.lvmController.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | | lvm-localpv.lvmNode.logLevel | int | `2` | | | lvm-localpv.lvmNode.nodeSelector."node.kubernetes.io/lvm" | string | `"openebs"` | | | lvm-localpv.lvmNode.tolerations[0].effect | string | `"NoSchedule"` | | @@ -140,9 +134,7 @@ Kubernetes: `>= 1.25.0` | snapshotController.resources.requests.cpu | string | `"20m"` | | | snapshotController.resources.requests.memory | string | `"16Mi"` | | | snapshotController.tolerations[0].effect | string | `"NoSchedule"` | | -| snapshotController.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | -| snapshotController.tolerations[1].effect | string | `"NoSchedule"` | | -| snapshotController.tolerations[1].key | string | `"node-role.kubernetes.io/control-plane"` | | +| snapshotController.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | # Snapshotter - https://kubernetes-csi.github.io/docs/snapshot-controller.html#deployment diff --git a/charts/kubezero-storage/charts/gemini/templates/deployment.yaml b/charts/kubezero-storage/charts/gemini/templates/deployment.yaml index b636114..2fa513d 100644 --- a/charts/kubezero-storage/charts/gemini/templates/deployment.yaml +++ b/charts/kubezero-storage/charts/gemini/templates/deployment.yaml @@ -31,8 +31,6 @@ spec: nodeSelector: node-role.kubernetes.io/control-plane: "" tolerations: - - effect: NoSchedule - key: node-role.kubernetes.io/master - effect: NoSchedule key: node-role.kubernetes.io/control-plane containers: diff --git a/charts/kubezero-storage/gemini.patch b/charts/kubezero-storage/gemini.patch index f29eacc..17bcb63 100644 --- a/charts/kubezero-storage/gemini.patch +++ b/charts/kubezero-storage/gemini.patch @@ -1,7 +1,7 @@ diff -rtubN charts/gemini/templates/deployment.yaml charts/gemini.zdt/templates/deployment.yaml --- charts/gemini/templates/deployment.yaml 2021-04-19 12:00:43.605005861 +0200 +++ charts/gemini.zdt/templates/deployment.yaml 2021-04-19 12:00:08.365005781 +0200 -@@ -19,6 +19,13 @@ +@@ -19,6 +19,11 @@ {{- else }} serviceAccountName: {{ .Values.rbac.serviceAccountName }} {{- end }} @@ -9,8 +9,6 @@ diff -rtubN charts/gemini/templates/deployment.yaml charts/gemini.zdt/templates/ + node-role.kubernetes.io/control-plane: "" + tolerations: + - effect: NoSchedule -+ key: node-role.kubernetes.io/master -+ - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - command: diff --git a/charts/kubezero-storage/values.yaml b/charts/kubezero-storage/values.yaml index 2af00bf..6e03238 100644 --- a/charts/kubezero-storage/values.yaml +++ b/charts/kubezero-storage/values.yaml @@ -7,8 +7,6 @@ snapshotController: logLevel: 2 tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - key: node-role.kubernetes.io/control-plane effect: NoSchedule nodeSelector: @@ -37,8 +35,6 @@ lvm-localpv: lvmController: logLevel: 2 tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - key: node-role.kubernetes.io/control-plane effect: NoSchedule nodeSelector: @@ -74,8 +70,6 @@ k8up: #cpu: 400m tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - key: node-role.kubernetes.io/control-plane effect: NoSchedule nodeSelector: @@ -109,8 +103,6 @@ aws-ebs-csi-driver: nodeSelector: node-role.kubernetes.io/control-plane: "" tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - key: node-role.kubernetes.io/control-plane effect: NoSchedule @@ -198,8 +190,6 @@ aws-efs-csi-driver: logLevel: 2 tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - key: node-role.kubernetes.io/control-plane effect: NoSchedule nodeSelector: