From 222f3e50503bb99e2f85ba2c8ed140a76d43dd1f Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 8 Dec 2021 17:14:38 +0100 Subject: [PATCH] feat: migrate aws-efs and aws-ebs CSI into kubezero-storage --- charts/kubezero-aws-ebs-csi-driver/Chart.yaml | 26 - charts/kubezero-aws-ebs-csi-driver/README.md | 71 - .../README.md.gotmpl | 27 - .../charts/aws-ebs-csi-driver/.helmignore | 22 - .../charts/aws-ebs-csi-driver/CHANGELOG.md | 6 - .../charts/aws-ebs-csi-driver/Chart.yaml | 18 - .../crds/snapshot-controller-crds.yaml | 628 ---- .../aws-ebs-csi-driver/templates/NOTES.txt | 39 - .../aws-ebs-csi-driver/templates/_helpers.tpl | 82 - .../templates/clusterrole-attacher.yaml | 23 - .../templates/clusterrole-csi-node.yaml | 11 - .../templates/clusterrole-provisioner.yaml | 38 - .../templates/clusterrole-resizer.yaml | 31 - .../clusterrole-snapshot-controller.yaml | 32 - .../templates/clusterrole-snapshotter.yaml | 23 - .../clusterrolebinding-attacher.yaml | 15 - .../clusterrolebinding-csi-node.yaml | 15 - .../clusterrolebinding-provisioner.yaml | 15 - .../templates/clusterrolebinding-resizer.yaml | 15 - ...lusterrolebinding-snapshot-controller.yaml | 15 - .../clusterrolebinding-snapshotter.yaml | 15 - .../templates/controller.yaml | 266 -- .../templates/csidriver.yaml | 9 - .../templates/node-windows.yaml | 185 -- .../aws-ebs-csi-driver/templates/node.yaml | 164 - .../poddisruptionbudget-controller.yaml | 17 - ...ddisruptionbudget-snapshot-controller.yaml | 14 - ...le-snapshot-controller-leaderelection.yaml | 11 - ...ng-snapshot-controller-leaderelection.yaml | 15 - .../serviceaccount-csi-controller.yaml | 17 - .../templates/serviceaccount-csi-node.yaml | 12 - .../serviceaccount-snapshot-controller.yaml | 13 - .../templates/snapshot-controller.yaml | 68 - .../templates/storageclass.yaml | 15 - .../charts/aws-ebs-csi-driver/values.yaml | 179 - charts/kubezero-aws-ebs-csi-driver/patch | 87 - .../templates/snapshot-class.yaml | 12 - charts/kubezero-aws-ebs-csi-driver/update.sh | 11 - .../kubezero-aws-ebs-csi-driver/values.yaml | 61 - charts/kubezero-aws-ebs-csi-driver/zdt.patch | 75 - charts/kubezero-aws-efs-csi-driver/.gitignore | 1 - .../kubezero-aws-efs-csi-driver/.helmignore | 24 - charts/kubezero-aws-efs-csi-driver/Chart.yaml | 25 - charts/kubezero-aws-efs-csi-driver/README.md | 55 - .../README.md.gotmpl | 23 - .../charts/aws-efs-csi-driver/.helmignore | 22 - .../charts/aws-efs-csi-driver/CHANGELOG.md | 112 - .../charts/aws-efs-csi-driver/Chart.yaml | 18 - .../aws-efs-csi-driver/templates/NOTES.txt | 3 - .../aws-efs-csi-driver/templates/_helpers.tpl | 67 - .../templates/controller-deployment.yaml | 127 - .../templates/controller-serviceaccount.yaml | 62 - .../templates/csidriver.yaml | 10 - .../templates/node-daemonset.yaml | 157 - .../templates/storageclass.yaml | 26 - .../charts/aws-efs-csi-driver/values.yaml | 125 - charts/kubezero-aws-efs-csi-driver/update.sh | 8 - .../kubezero-aws-efs-csi-driver/values.yaml | 57 - charts/kubezero-aws-efs-csi-driver/zdt.patch | 62 - charts/kubezero-kiam/.helmignore | 23 - charts/kubezero-kiam/Chart.yaml | 22 - charts/kubezero-kiam/README.md | 104 - charts/kubezero-kiam/README.md.gotmpl | 45 - charts/kubezero-kiam/dashboards.yaml | 8 - .../kubezero-kiam/kiam-grafana-dashboard.json | 2933 ----------------- charts/kubezero-kiam/kiam_architecure.png | 3 - .../kubezero-kiam/templates/certificates.yaml | 36 - .../templates/grafana-dashboards.yaml | 15 - charts/kubezero-kiam/templates/sync-ns.yaml | 67 - charts/kubezero-kiam/update.sh | 5 - charts/kubezero-kiam/values.yaml | 84 - charts/kubezero-storage/Chart.yaml | 22 +- charts/kubezero-storage/README.md | 27 +- .../charts/aws-ebs-csi-driver/CHANGELOG.md | 17 + .../charts/aws-ebs-csi-driver/Chart.yaml | 4 +- .../aws-ebs-csi-driver/templates/_helpers.tpl | 8 +- .../templates/controller.yaml | 2 +- .../charts/aws-ebs-csi-driver/values.yaml | 4 + .../charts/aws-efs-csi-driver/CHANGELOG.md | 7 + .../charts/aws-efs-csi-driver/Chart.yaml | 4 +- .../templates/controller-deployment.yaml | 5 +- .../templates/controller-serviceaccount.yaml | 2 +- .../templates/node-daemonset.yaml | 4 +- .../charts/aws-efs-csi-driver/values.yaml | 4 +- .../charts/gemini/templates/deployment.yaml | 2 +- .../charts/lvm-localpv/.helmignore | 23 - .../charts/lvm-localpv/Chart.yaml | 23 - .../charts/lvm-localpv/README.md | 160 - .../charts/lvm-localpv/crds/lvmnode.yaml | 110 - .../charts/lvm-localpv/crds/lvmsnapshot.yaml | 109 - .../charts/lvm-localpv/crds/lvmvolume.yaml | 153 - .../crds/volumesnapshotclasses.yaml | 112 - .../crds/volumesnapshotcontents.yaml | 291 -- .../lvm-localpv/crds/volumesnapshots.yaml | 225 -- .../charts/lvm-localpv/templates/NOTES.txt | 5 - .../charts/lvm-localpv/templates/_helpers.tpl | 138 - .../lvm-localpv/templates/csidriver.yaml | 10 - .../lvm-localpv/templates/lvm-controller.yaml | 157 - .../templates/lvm-node-service.yaml | 18 - .../lvm-localpv/templates/lvm-node.yaml | 156 - .../lvm-localpv/templates/priority-class.yaml | 19 - .../charts/lvm-localpv/templates/psp.yaml | 24 - .../charts/lvm-localpv/templates/rbac.yaml | 197 -- .../charts/lvm-localpv/values.yaml | 169 - charts/kubezero-storage/efs.patch | 8 - charts/kubezero-storage/gemini.patch | 2 +- .../templates/efs_pvs.yaml | 4 +- charts/kubezero-storage/values.yaml | 29 +- charts/kubezero/Chart.yaml | 2 +- charts/kubezero/README.md | 12 +- .../templates/aws-ebs-csi-driver.yaml | 20 - .../templates/aws-efs-csi-driver.yaml | 22 - charts/kubezero/templates/storage.yaml | 28 + charts/kubezero/values.yaml | 11 +- 114 files changed, 133 insertions(+), 8943 deletions(-) delete mode 100644 charts/kubezero-aws-ebs-csi-driver/Chart.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/README.md delete mode 100644 charts/kubezero-aws-ebs-csi-driver/README.md.gotmpl delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/CHANGELOG.md delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/crds/snapshot-controller-crds.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/NOTES.txt delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/_helpers.tpl delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-attacher.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-csi-node.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-provisioner.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-resizer.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-snapshot-controller.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-snapshotter.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-attacher.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-csi-node.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-provisioner.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-resizer.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshot-controller.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshotter.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/controller.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/csidriver.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node-windows.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-controller.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-snapshot-controller.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/role-snapshot-controller-leaderelection.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/rolebinding-snapshot-controller-leaderelection.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-controller.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-node.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-snapshot-controller.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/storageclass.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/patch delete mode 100644 charts/kubezero-aws-ebs-csi-driver/templates/snapshot-class.yaml delete mode 100755 charts/kubezero-aws-ebs-csi-driver/update.sh delete mode 100644 charts/kubezero-aws-ebs-csi-driver/values.yaml delete mode 100644 charts/kubezero-aws-ebs-csi-driver/zdt.patch delete mode 100644 charts/kubezero-aws-efs-csi-driver/.gitignore delete mode 100644 charts/kubezero-aws-efs-csi-driver/.helmignore delete mode 100644 charts/kubezero-aws-efs-csi-driver/Chart.yaml delete mode 100644 charts/kubezero-aws-efs-csi-driver/README.md delete mode 100644 charts/kubezero-aws-efs-csi-driver/README.md.gotmpl delete mode 100644 charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/.helmignore delete mode 100644 charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/CHANGELOG.md delete mode 100644 charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/Chart.yaml delete mode 100644 charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/NOTES.txt delete mode 100644 charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/_helpers.tpl delete mode 100644 charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-deployment.yaml delete mode 100644 charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml delete mode 100644 charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/csidriver.yaml delete mode 100644 charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/node-daemonset.yaml delete mode 100644 charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/storageclass.yaml delete mode 100644 charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/values.yaml delete mode 100755 charts/kubezero-aws-efs-csi-driver/update.sh delete mode 100644 charts/kubezero-aws-efs-csi-driver/values.yaml delete mode 100644 charts/kubezero-aws-efs-csi-driver/zdt.patch delete mode 100644 charts/kubezero-kiam/.helmignore delete mode 100644 charts/kubezero-kiam/Chart.yaml delete mode 100644 charts/kubezero-kiam/README.md delete mode 100644 charts/kubezero-kiam/README.md.gotmpl delete mode 100644 charts/kubezero-kiam/dashboards.yaml delete mode 100644 charts/kubezero-kiam/kiam-grafana-dashboard.json delete mode 100644 charts/kubezero-kiam/kiam_architecure.png delete mode 100644 charts/kubezero-kiam/templates/certificates.yaml delete mode 100644 charts/kubezero-kiam/templates/grafana-dashboards.yaml delete mode 100644 charts/kubezero-kiam/templates/sync-ns.yaml delete mode 100755 charts/kubezero-kiam/update.sh delete mode 100644 charts/kubezero-kiam/values.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/.helmignore delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/Chart.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/README.md delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/crds/lvmnode.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/crds/lvmsnapshot.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/crds/lvmvolume.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshotclasses.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshotcontents.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshots.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/templates/NOTES.txt delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/templates/_helpers.tpl delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/templates/csidriver.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/templates/lvm-controller.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/templates/lvm-node-service.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/templates/lvm-node.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/templates/priority-class.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/templates/psp.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/templates/rbac.yaml delete mode 100644 charts/kubezero-storage/charts/lvm-localpv/values.yaml rename charts/{kubezero-aws-efs-csi-driver => kubezero-storage}/templates/efs_pvs.yaml (81%) delete mode 100644 charts/kubezero/templates/aws-ebs-csi-driver.yaml delete mode 100644 charts/kubezero/templates/aws-efs-csi-driver.yaml diff --git a/charts/kubezero-aws-ebs-csi-driver/Chart.yaml b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml deleted file mode 100644 index abd37e54..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/Chart.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v2 -name: kubezero-aws-ebs-csi-driver -description: KubeZero Umbrella Chart for aws-ebs-csi-driver -type: application -version: 0.6.4 -appVersion: 1.2.4 -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -sources: - - https://github.com/kubernetes-sigs/aws-ebs-csi-driver - - https://github.com/Zero-Down-Time/kubezero -keywords: - - kubezero - - aws - - ebs - - csi -maintainers: - - name: Quarky9 -dependencies: - - name: aws-ebs-csi-driver - version: 1.2.4 - # repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver - - name: kubezero-lib - version: ">= 0.1.3" - repository: https://cdn.zero-downtime.net/charts/ -kubeVersion: ">= 1.18.0" diff --git a/charts/kubezero-aws-ebs-csi-driver/README.md b/charts/kubezero-aws-ebs-csi-driver/README.md deleted file mode 100644 index da0daf1f..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/README.md +++ /dev/null @@ -1,71 +0,0 @@ -# kubezero-aws-ebs-csi-driver - -![Version: 0.6.4](https://img.shields.io/badge/Version-0.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.4](https://img.shields.io/badge/AppVersion-1.2.4-informational?style=flat-square) - -KubeZero Umbrella Chart for aws-ebs-csi-driver - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Quarky9 | | | - -## Source Code - -* -* - -## Requirements - -Kubernetes: `>= 1.18.0` - -| Repository | Name | Version | -|------------|------|---------| -| | aws-ebs-csi-driver | 1.2.4 | -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.3 | - -## IAM Role -If you use kiam or kube2iam and restrict access on nodes running this controller please adjust: -``` -podAnnotations: - iam.amazonaws.com/role: -``` - -## Storage Classes -By default it also creates the *ebs-sc-gp2-xfs* storage class for gp2, enrypted and XFS. -This class is by default also set as default storage class. - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| aws-ebs-csi-driver.controller.logLevel | int | `1` | | -| aws-ebs-csi-driver.controller.nodeSelector."node-role.kubernetes.io/master" | 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.enableVolumeSnapshot | bool | `true` | | -| aws-ebs-csi-driver.node.tolerations[0].effect | string | `"NoSchedule"` | | -| aws-ebs-csi-driver.node.tolerations[0].key | string | `"kubezero-workergroup"` | | -| aws-ebs-csi-driver.node.tolerations[0].operator | string | `"Exists"` | | -| aws-ebs-csi-driver.nodeSelector."node-role.kubernetes.io/master" | string | `""` | | -| aws-ebs-csi-driver.storageClasses[0].allowVolumeExpansion | bool | `true` | | -| aws-ebs-csi-driver.storageClasses[0].name | string | `"ebs-sc-gp2-xfs"` | | -| aws-ebs-csi-driver.storageClasses[0].parameters."csi.storage.k8s.io/fstype" | string | `"xfs"` | | -| aws-ebs-csi-driver.storageClasses[0].parameters.encrypted | string | `"true"` | | -| aws-ebs-csi-driver.storageClasses[0].parameters.type | string | `"gp2"` | | -| aws-ebs-csi-driver.storageClasses[0].volumeBindingMode | string | `"WaitForFirstConsumer"` | | -| aws-ebs-csi-driver.storageClasses[1].allowVolumeExpansion | bool | `true` | | -| aws-ebs-csi-driver.storageClasses[1].annotations."storageclass.kubernetes.io/is-default-class" | string | `"true"` | | -| aws-ebs-csi-driver.storageClasses[1].name | string | `"ebs-sc-gp3-xfs"` | | -| aws-ebs-csi-driver.storageClasses[1].parameters."csi.storage.k8s.io/fstype" | string | `"xfs"` | | -| aws-ebs-csi-driver.storageClasses[1].parameters.encrypted | string | `"true"` | | -| aws-ebs-csi-driver.storageClasses[1].parameters.type | string | `"gp3"` | | -| aws-ebs-csi-driver.storageClasses[1].volumeBindingMode | string | `"WaitForFirstConsumer"` | | -| aws-ebs-csi-driver.tolerations[0].effect | string | `"NoSchedule"` | | -| aws-ebs-csi-driver.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | diff --git a/charts/kubezero-aws-ebs-csi-driver/README.md.gotmpl b/charts/kubezero-aws-ebs-csi-driver/README.md.gotmpl deleted file mode 100644 index 84bc6f10..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/README.md.gotmpl +++ /dev/null @@ -1,27 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.deprecationWarning" . }} - -{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} - -{{ template "chart.description" . }} - -{{ template "chart.homepageLine" . }} - -{{ template "chart.maintainersSection" . }} - -{{ template "chart.sourcesSection" . }} - -{{ template "chart.requirementsSection" . }} - -## IAM Role -If you use kiam or kube2iam and restrict access on nodes running this controller please adjust: -``` -podAnnotations: - iam.amazonaws.com/role: -``` - -## Storage Classes -By default it also creates the *ebs-sc-gp2-xfs* storage class for gp2, enrypted and XFS. -This class is by default also set as default storage class. - -{{ template "chart.valuesSection" . }} diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore deleted file mode 100644 index 50af0317..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore +++ /dev/null @@ -1,22 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/CHANGELOG.md b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/CHANGELOG.md deleted file mode 100644 index b82cf863..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/CHANGELOG.md +++ /dev/null @@ -1,6 +0,0 @@ -# Helm chart - -# v1.2.4 -* Bump app/driver version to `v1.1.1` -* Install VolumeSnapshotClass, VolumeSnapshotContent, VolumeSnapshot CRDs if enableVolumeSnapshot is true -* Only run csi-snapshotter sidecar if enableVolumeSnapshot is true or if CRDs are already installed diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml deleted file mode 100644 index 80496eed..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -appVersion: 1.1.1 -description: A Helm chart for AWS EBS CSI Driver -home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver -keywords: -- aws -- ebs -- csi -kubeVersion: '>=1.17.0-0' -maintainers: -- email: chengpan@amazon.com - name: leakingtapan -- name: krmichel - url: https://github.com/krmichel -name: aws-ebs-csi-driver -sources: -- https://github.com/kubernetes-sigs/aws-ebs-csi-driver -version: 1.2.4 diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/crds/snapshot-controller-crds.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/crds/snapshot-controller-crds.yaml deleted file mode 100644 index 6ca2443d..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/crds/snapshot-controller-crds.yaml +++ /dev/null @@ -1,628 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.4.0 - api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/419" - creationTimestamp: null - name: volumesnapshotclasses.snapshot.storage.k8s.io -spec: - group: snapshot.storage.k8s.io - names: - kind: VolumeSnapshotClass - listKind: VolumeSnapshotClassList - plural: volumesnapshotclasses - singular: volumesnapshotclass - scope: Cluster - versions: - - additionalPrinterColumns: - - jsonPath: .driver - name: Driver - type: string - - description: Determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted. - jsonPath: .deletionPolicy - name: DeletionPolicy - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1 - schema: - openAPIV3Schema: - description: VolumeSnapshotClass specifies parameters that a underlying storage system uses when creating a volume snapshot. A specific VolumeSnapshotClass is used by specifying its name in a VolumeSnapshot object. VolumeSnapshotClasses are non-namespaced - properties: - apiVersion: - description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" - type: string - deletionPolicy: - description: deletionPolicy determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted. Supported values are "Retain" and "Delete". "Retain" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are kept. "Delete" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are deleted. Required. - enum: - - Delete - - Retain - type: string - driver: - description: driver is the name of the storage driver that handles this VolumeSnapshotClass. Required. - type: string - kind: - description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - type: string - parameters: - additionalProperties: - type: string - description: parameters is a key-value map with storage driver specific parameters for creating snapshots. These values are opaque to Kubernetes. - type: object - required: - - deletionPolicy - - driver - type: object - served: true - storage: false - subresources: {} - - additionalPrinterColumns: - - jsonPath: .driver - name: Driver - type: string - - description: Determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted. - jsonPath: .deletionPolicy - name: DeletionPolicy - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1beta1 - schema: - openAPIV3Schema: - description: VolumeSnapshotClass specifies parameters that a underlying storage system uses when creating a volume snapshot. A specific VolumeSnapshotClass is used by specifying its name in a VolumeSnapshot object. VolumeSnapshotClasses are non-namespaced - properties: - apiVersion: - description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" - type: string - deletionPolicy: - description: deletionPolicy determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted. Supported values are "Retain" and "Delete". "Retain" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are kept. "Delete" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are deleted. Required. - enum: - - Delete - - Retain - type: string - driver: - description: driver is the name of the storage driver that handles this VolumeSnapshotClass. Required. - type: string - kind: - description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - type: string - parameters: - additionalProperties: - type: string - description: parameters is a key-value map with storage driver specific parameters for creating snapshots. These values are opaque to Kubernetes. - type: object - required: - - deletionPolicy - - driver - type: object - served: true - storage: true - subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] - ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.4.0 - api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/419" - creationTimestamp: null - name: volumesnapshotcontents.snapshot.storage.k8s.io -spec: - group: snapshot.storage.k8s.io - names: - kind: VolumeSnapshotContent - listKind: VolumeSnapshotContentList - plural: volumesnapshotcontents - singular: volumesnapshotcontent - scope: Cluster - versions: - - additionalPrinterColumns: - - description: Indicates if the snapshot is ready to be used to restore a volume. - jsonPath: .status.readyToUse - name: ReadyToUse - type: boolean - - description: Represents the complete size of the snapshot in bytes - jsonPath: .status.restoreSize - name: RestoreSize - type: integer - - description: Determines whether this VolumeSnapshotContent and its physical snapshot on the underlying storage system should be deleted when its bound VolumeSnapshot is deleted. - jsonPath: .spec.deletionPolicy - name: DeletionPolicy - type: string - - description: Name of the CSI driver used to create the physical snapshot on the underlying storage system. - jsonPath: .spec.driver - name: Driver - type: string - - description: Name of the VolumeSnapshotClass to which this snapshot belongs. - jsonPath: .spec.volumeSnapshotClassName - name: VolumeSnapshotClass - type: string - - description: Name of the VolumeSnapshot object to which this VolumeSnapshotContent object is bound. - jsonPath: .spec.volumeSnapshotRef.name - name: VolumeSnapshot - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1 - schema: - openAPIV3Schema: - description: VolumeSnapshotContent represents the actual "on-disk" snapshot object in the underlying storage system - properties: - apiVersion: - description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" - type: string - kind: - description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - type: string - spec: - description: spec defines properties of a VolumeSnapshotContent created by the underlying storage system. Required. - properties: - deletionPolicy: - description: deletionPolicy determines whether this VolumeSnapshotContent and its physical snapshot on the underlying storage system should be deleted when its bound VolumeSnapshot is deleted. Supported values are "Retain" and "Delete". "Retain" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are kept. "Delete" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are deleted. For dynamically provisioned snapshots, this field will automatically be filled in by the CSI snapshotter sidecar with the "DeletionPolicy" field defined in the corresponding VolumeSnapshotClass. For pre-existing snapshots, users MUST specify this field when creating the VolumeSnapshotContent object. Required. - enum: - - Delete - - Retain - type: string - driver: - description: driver is the name of the CSI driver used to create the physical snapshot on the underlying storage system. This MUST be the same as the name returned by the CSI GetPluginName() call for that driver. Required. - type: string - source: - description: source specifies whether the snapshot is (or should be) dynamically provisioned or already exists, and just requires a Kubernetes object representation. This field is immutable after creation. Required. - properties: - snapshotHandle: - description: snapshotHandle specifies the CSI "snapshot_id" of a pre-existing snapshot on the underlying storage system for which a Kubernetes object representation was (or should be) created. This field is immutable. - type: string - volumeHandle: - description: volumeHandle specifies the CSI "volume_id" of the volume from which a snapshot should be dynamically taken from. This field is immutable. - type: string - type: object - oneOf: - - required: ["snapshotHandle"] - - required: ["volumeHandle"] - volumeSnapshotClassName: - description: name of the VolumeSnapshotClass from which this snapshot was (or will be) created. Note that after provisioning, the VolumeSnapshotClass may be deleted or recreated with different set of values, and as such, should not be referenced post-snapshot creation. - type: string - volumeSnapshotRef: - description: volumeSnapshotRef specifies the VolumeSnapshot object to which this VolumeSnapshotContent object is bound. VolumeSnapshot.Spec.VolumeSnapshotContentName field must reference to this VolumeSnapshotContent's name for the bidirectional binding to be valid. For a pre-existing VolumeSnapshotContent object, name and namespace of the VolumeSnapshot object MUST be provided for binding to happen. This field is immutable after creation. Required. - properties: - apiVersion: - description: API version of the referent. - type: string - fieldPath: - description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.' - type: string - kind: - description: "Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - type: string - name: - description: "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names" - type: string - namespace: - description: "Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/" - type: string - resourceVersion: - description: "Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency" - type: string - uid: - description: "UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids" - type: string - type: object - required: - - deletionPolicy - - driver - - source - - volumeSnapshotRef - type: object - status: - description: status represents the current information of a snapshot. - properties: - creationTime: - description: creationTime is the timestamp when the point-in-time snapshot is taken by the underlying storage system. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "creation_time" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "creation_time" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. If not specified, it indicates the creation time is unknown. The format of this field is a Unix nanoseconds time encoded as an int64. On Unix, the command `date +%s%N` returns the current time in nanoseconds since 1970-01-01 00:00:00 UTC. - format: int64 - type: integer - error: - description: error is the last observed error during snapshot creation, if any. Upon success after retry, this error field will be cleared. - properties: - message: - description: "message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information." - type: string - time: - description: time is the timestamp when the error was encountered. - format: date-time - type: string - type: object - readyToUse: - description: readyToUse indicates if a snapshot is ready to be used to restore a volume. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "ready_to_use" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "ready_to_use" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it, otherwise, this field will be set to "True". If not specified, it means the readiness of a snapshot is unknown. - type: boolean - restoreSize: - description: restoreSize represents the complete size of the snapshot in bytes. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "size_bytes" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "size_bytes" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. When restoring a volume from this snapshot, the size of the volume MUST NOT be smaller than the restoreSize if it is specified, otherwise the restoration will fail. If not specified, it indicates that the size is unknown. - format: int64 - minimum: 0 - type: integer - snapshotHandle: - description: snapshotHandle is the CSI "snapshot_id" of a snapshot on the underlying storage system. If not specified, it indicates that dynamic snapshot creation has either failed or it is still in progress. - type: string - type: object - required: - - spec - type: object - served: true - storage: false - subresources: - status: {} - - additionalPrinterColumns: - - description: Indicates if the snapshot is ready to be used to restore a volume. - jsonPath: .status.readyToUse - name: ReadyToUse - type: boolean - - description: Represents the complete size of the snapshot in bytes - jsonPath: .status.restoreSize - name: RestoreSize - type: integer - - description: Determines whether this VolumeSnapshotContent and its physical snapshot on the underlying storage system should be deleted when its bound VolumeSnapshot is deleted. - jsonPath: .spec.deletionPolicy - name: DeletionPolicy - type: string - - description: Name of the CSI driver used to create the physical snapshot on the underlying storage system. - jsonPath: .spec.driver - name: Driver - type: string - - description: Name of the VolumeSnapshotClass to which this snapshot belongs. - jsonPath: .spec.volumeSnapshotClassName - name: VolumeSnapshotClass - type: string - - description: Name of the VolumeSnapshot object to which this VolumeSnapshotContent object is bound. - jsonPath: .spec.volumeSnapshotRef.name - name: VolumeSnapshot - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1beta1 - schema: - openAPIV3Schema: - description: VolumeSnapshotContent represents the actual "on-disk" snapshot object in the underlying storage system - properties: - apiVersion: - description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" - type: string - kind: - description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - type: string - spec: - description: spec defines properties of a VolumeSnapshotContent created by the underlying storage system. Required. - properties: - deletionPolicy: - description: deletionPolicy determines whether this VolumeSnapshotContent and its physical snapshot on the underlying storage system should be deleted when its bound VolumeSnapshot is deleted. Supported values are "Retain" and "Delete". "Retain" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are kept. "Delete" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are deleted. For dynamically provisioned snapshots, this field will automatically be filled in by the CSI snapshotter sidecar with the "DeletionPolicy" field defined in the corresponding VolumeSnapshotClass. For pre-existing snapshots, users MUST specify this field when creating the VolumeSnapshotContent object. Required. - enum: - - Delete - - Retain - type: string - driver: - description: driver is the name of the CSI driver used to create the physical snapshot on the underlying storage system. This MUST be the same as the name returned by the CSI GetPluginName() call for that driver. Required. - type: string - source: - description: source specifies whether the snapshot is (or should be) dynamically provisioned or already exists, and just requires a Kubernetes object representation. This field is immutable after creation. Required. - properties: - snapshotHandle: - description: snapshotHandle specifies the CSI "snapshot_id" of a pre-existing snapshot on the underlying storage system for which a Kubernetes object representation was (or should be) created. This field is immutable. - type: string - volumeHandle: - description: volumeHandle specifies the CSI "volume_id" of the volume from which a snapshot should be dynamically taken from. This field is immutable. - type: string - type: object - volumeSnapshotClassName: - description: name of the VolumeSnapshotClass from which this snapshot was (or will be) created. Note that after provisioning, the VolumeSnapshotClass may be deleted or recreated with different set of values, and as such, should not be referenced post-snapshot creation. - type: string - volumeSnapshotRef: - description: volumeSnapshotRef specifies the VolumeSnapshot object to which this VolumeSnapshotContent object is bound. VolumeSnapshot.Spec.VolumeSnapshotContentName field must reference to this VolumeSnapshotContent's name for the bidirectional binding to be valid. For a pre-existing VolumeSnapshotContent object, name and namespace of the VolumeSnapshot object MUST be provided for binding to happen. This field is immutable after creation. Required. - properties: - apiVersion: - description: API version of the referent. - type: string - fieldPath: - description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.' - type: string - kind: - description: "Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - type: string - name: - description: "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names" - type: string - namespace: - description: "Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/" - type: string - resourceVersion: - description: "Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency" - type: string - uid: - description: "UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids" - type: string - type: object - required: - - deletionPolicy - - driver - - source - - volumeSnapshotRef - type: object - status: - description: status represents the current information of a snapshot. - properties: - creationTime: - description: creationTime is the timestamp when the point-in-time snapshot is taken by the underlying storage system. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "creation_time" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "creation_time" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. If not specified, it indicates the creation time is unknown. The format of this field is a Unix nanoseconds time encoded as an int64. On Unix, the command `date +%s%N` returns the current time in nanoseconds since 1970-01-01 00:00:00 UTC. - format: int64 - type: integer - error: - description: error is the last observed error during snapshot creation, if any. Upon success after retry, this error field will be cleared. - properties: - message: - description: "message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information." - type: string - time: - description: time is the timestamp when the error was encountered. - format: date-time - type: string - type: object - readyToUse: - description: readyToUse indicates if a snapshot is ready to be used to restore a volume. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "ready_to_use" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "ready_to_use" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it, otherwise, this field will be set to "True". If not specified, it means the readiness of a snapshot is unknown. - type: boolean - restoreSize: - description: restoreSize represents the complete size of the snapshot in bytes. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "size_bytes" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "size_bytes" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. When restoring a volume from this snapshot, the size of the volume MUST NOT be smaller than the restoreSize if it is specified, otherwise the restoration will fail. If not specified, it indicates that the size is unknown. - format: int64 - minimum: 0 - type: integer - snapshotHandle: - description: snapshotHandle is the CSI "snapshot_id" of a snapshot on the underlying storage system. If not specified, it indicates that dynamic snapshot creation has either failed or it is still in progress. - type: string - type: object - required: - - spec - type: object - served: true - storage: true - subresources: - status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] - ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.4.0 - api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/419" - creationTimestamp: null - name: volumesnapshots.snapshot.storage.k8s.io -spec: - group: snapshot.storage.k8s.io - names: - kind: VolumeSnapshot - listKind: VolumeSnapshotList - plural: volumesnapshots - singular: volumesnapshot - scope: Namespaced - versions: - - additionalPrinterColumns: - - description: Indicates if the snapshot is ready to be used to restore a volume. - jsonPath: .status.readyToUse - name: ReadyToUse - type: boolean - - description: If a new snapshot needs to be created, this contains the name of the source PVC from which this snapshot was (or will be) created. - jsonPath: .spec.source.persistentVolumeClaimName - name: SourcePVC - type: string - - description: If a snapshot already exists, this contains the name of the existing VolumeSnapshotContent object representing the existing snapshot. - jsonPath: .spec.source.volumeSnapshotContentName - name: SourceSnapshotContent - type: string - - description: Represents the minimum size of volume required to rehydrate from this snapshot. - jsonPath: .status.restoreSize - name: RestoreSize - type: string - - description: The name of the VolumeSnapshotClass requested by the VolumeSnapshot. - jsonPath: .spec.volumeSnapshotClassName - name: SnapshotClass - type: string - - description: Name of the VolumeSnapshotContent object to which the VolumeSnapshot object intends to bind to. Please note that verification of binding actually requires checking both VolumeSnapshot and VolumeSnapshotContent to ensure both are pointing at each other. Binding MUST be verified prior to usage of this object. - jsonPath: .status.boundVolumeSnapshotContentName - name: SnapshotContent - type: string - - description: Timestamp when the point-in-time snapshot was taken by the underlying storage system. - jsonPath: .status.creationTime - name: CreationTime - type: date - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1 - schema: - openAPIV3Schema: - description: VolumeSnapshot is a user's request for either creating a point-in-time snapshot of a persistent volume, or binding to a pre-existing snapshot. - properties: - apiVersion: - description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" - type: string - kind: - description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - type: string - spec: - description: "spec defines the desired characteristics of a snapshot requested by a user. More info: https://kubernetes.io/docs/concepts/storage/volume-snapshots#volumesnapshots Required." - properties: - source: - description: source specifies where a snapshot will be created from. This field is immutable after creation. Required. - properties: - persistentVolumeClaimName: - description: persistentVolumeClaimName specifies the name of the PersistentVolumeClaim object representing the volume from which a snapshot should be created. This PVC is assumed to be in the same namespace as the VolumeSnapshot object. This field should be set if the snapshot does not exists, and needs to be created. This field is immutable. - type: string - volumeSnapshotContentName: - description: volumeSnapshotContentName specifies the name of a pre-existing VolumeSnapshotContent object representing an existing volume snapshot. This field should be set if the snapshot already exists and only needs a representation in Kubernetes. This field is immutable. - type: string - type: object - oneOf: - - required: ["persistentVolumeClaimName"] - - required: ["volumeSnapshotContentName"] - volumeSnapshotClassName: - description: "VolumeSnapshotClassName is the name of the VolumeSnapshotClass requested by the VolumeSnapshot. VolumeSnapshotClassName may be left nil to indicate that the default SnapshotClass should be used. A given cluster may have multiple default Volume SnapshotClasses: one default per CSI Driver. If a VolumeSnapshot does not specify a SnapshotClass, VolumeSnapshotSource will be checked to figure out what the associated CSI Driver is, and the default VolumeSnapshotClass associated with that CSI Driver will be used. If more than one VolumeSnapshotClass exist for a given CSI Driver and more than one have been marked as default, CreateSnapshot will fail and generate an event. Empty string is not allowed for this field." - type: string - required: - - source - type: object - status: - description: status represents the current information of a snapshot. Consumers must verify binding between VolumeSnapshot and VolumeSnapshotContent objects is successful (by validating that both VolumeSnapshot and VolumeSnapshotContent point at each other) before using this object. - properties: - boundVolumeSnapshotContentName: - description: "boundVolumeSnapshotContentName is the name of the VolumeSnapshotContent object to which this VolumeSnapshot object intends to bind to. If not specified, it indicates that the VolumeSnapshot object has not been successfully bound to a VolumeSnapshotContent object yet. NOTE: To avoid possible security issues, consumers must verify binding between VolumeSnapshot and VolumeSnapshotContent objects is successful (by validating that both VolumeSnapshot and VolumeSnapshotContent point at each other) before using this object." - type: string - creationTime: - description: creationTime is the timestamp when the point-in-time snapshot is taken by the underlying storage system. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "creation_time" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "creation_time" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. If not specified, it may indicate that the creation time of the snapshot is unknown. - format: date-time - type: string - error: - description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurrs during the snapshot creation. Upon success, this error field will be cleared. - properties: - message: - description: "message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information." - type: string - time: - description: time is the timestamp when the error was encountered. - format: date-time - type: string - type: object - readyToUse: - description: readyToUse indicates if the snapshot is ready to be used to restore a volume. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "ready_to_use" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "ready_to_use" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it, otherwise, this field will be set to "True". If not specified, it means the readiness of a snapshot is unknown. - type: boolean - restoreSize: - type: string - description: restoreSize represents the minimum size of volume required to create a volume from this snapshot. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "size_bytes" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "size_bytes" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. When restoring a volume from this snapshot, the size of the volume MUST NOT be smaller than the restoreSize if it is specified, otherwise the restoration will fail. If not specified, it indicates that the size is unknown. - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - required: - - spec - type: object - served: true - storage: false - subresources: - status: {} - - additionalPrinterColumns: - - description: Indicates if the snapshot is ready to be used to restore a volume. - jsonPath: .status.readyToUse - name: ReadyToUse - type: boolean - - description: If a new snapshot needs to be created, this contains the name of the source PVC from which this snapshot was (or will be) created. - jsonPath: .spec.source.persistentVolumeClaimName - name: SourcePVC - type: string - - description: If a snapshot already exists, this contains the name of the existing VolumeSnapshotContent object representing the existing snapshot. - jsonPath: .spec.source.volumeSnapshotContentName - name: SourceSnapshotContent - type: string - - description: Represents the minimum size of volume required to rehydrate from this snapshot. - jsonPath: .status.restoreSize - name: RestoreSize - type: string - - description: The name of the VolumeSnapshotClass requested by the VolumeSnapshot. - jsonPath: .spec.volumeSnapshotClassName - name: SnapshotClass - type: string - - description: Name of the VolumeSnapshotContent object to which the VolumeSnapshot object intends to bind to. Please note that verification of binding actually requires checking both VolumeSnapshot and VolumeSnapshotContent to ensure both are pointing at each other. Binding MUST be verified prior to usage of this object. - jsonPath: .status.boundVolumeSnapshotContentName - name: SnapshotContent - type: string - - description: Timestamp when the point-in-time snapshot was taken by the underlying storage system. - jsonPath: .status.creationTime - name: CreationTime - type: date - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1beta1 - schema: - openAPIV3Schema: - description: VolumeSnapshot is a user's request for either creating a point-in-time snapshot of a persistent volume, or binding to a pre-existing snapshot. - properties: - apiVersion: - description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" - type: string - kind: - description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - type: string - spec: - description: "spec defines the desired characteristics of a snapshot requested by a user. More info: https://kubernetes.io/docs/concepts/storage/volume-snapshots#volumesnapshots Required." - properties: - source: - description: source specifies where a snapshot will be created from. This field is immutable after creation. Required. - properties: - persistentVolumeClaimName: - description: persistentVolumeClaimName specifies the name of the PersistentVolumeClaim object representing the volume from which a snapshot should be created. This PVC is assumed to be in the same namespace as the VolumeSnapshot object. This field should be set if the snapshot does not exists, and needs to be created. This field is immutable. - type: string - volumeSnapshotContentName: - description: volumeSnapshotContentName specifies the name of a pre-existing VolumeSnapshotContent object representing an existing volume snapshot. This field should be set if the snapshot already exists and only needs a representation in Kubernetes. This field is immutable. - type: string - type: object - volumeSnapshotClassName: - description: "VolumeSnapshotClassName is the name of the VolumeSnapshotClass requested by the VolumeSnapshot. VolumeSnapshotClassName may be left nil to indicate that the default SnapshotClass should be used. A given cluster may have multiple default Volume SnapshotClasses: one default per CSI Driver. If a VolumeSnapshot does not specify a SnapshotClass, VolumeSnapshotSource will be checked to figure out what the associated CSI Driver is, and the default VolumeSnapshotClass associated with that CSI Driver will be used. If more than one VolumeSnapshotClass exist for a given CSI Driver and more than one have been marked as default, CreateSnapshot will fail and generate an event. Empty string is not allowed for this field." - type: string - required: - - source - type: object - status: - description: status represents the current information of a snapshot. Consumers must verify binding between VolumeSnapshot and VolumeSnapshotContent objects is successful (by validating that both VolumeSnapshot and VolumeSnapshotContent point at each other) before using this object. - properties: - boundVolumeSnapshotContentName: - description: "boundVolumeSnapshotContentName is the name of the VolumeSnapshotContent object to which this VolumeSnapshot object intends to bind to. If not specified, it indicates that the VolumeSnapshot object has not been successfully bound to a VolumeSnapshotContent object yet. NOTE: To avoid possible security issues, consumers must verify binding between VolumeSnapshot and VolumeSnapshotContent objects is successful (by validating that both VolumeSnapshot and VolumeSnapshotContent point at each other) before using this object." - type: string - creationTime: - description: creationTime is the timestamp when the point-in-time snapshot is taken by the underlying storage system. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "creation_time" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "creation_time" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. If not specified, it may indicate that the creation time of the snapshot is unknown. - format: date-time - type: string - error: - description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurrs during the snapshot creation. Upon success, this error field will be cleared. - properties: - message: - description: "message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information." - type: string - time: - description: time is the timestamp when the error was encountered. - format: date-time - type: string - type: object - readyToUse: - description: readyToUse indicates if the snapshot is ready to be used to restore a volume. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "ready_to_use" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "ready_to_use" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it, otherwise, this field will be set to "True". If not specified, it means the readiness of a snapshot is unknown. - type: boolean - restoreSize: - type: string - description: restoreSize represents the minimum size of volume required to create a volume from this snapshot. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "size_bytes" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "size_bytes" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. When restoring a volume from this snapshot, the size of the volume MUST NOT be smaller than the restoreSize if it is specified, otherwise the restoration will fail. If not specified, it indicates that the size is unknown. - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - required: - - spec - type: object - served: true - storage: true - subresources: - status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/NOTES.txt b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/NOTES.txt deleted file mode 100644 index 8f6d02ee..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/NOTES.txt +++ /dev/null @@ -1,39 +0,0 @@ -To verify that aws-ebs-csi-driver has started, run: - - kubectl get pod -n {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "aws-ebs-csi-driver.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" - - -WARNING: The following values have been deprecated in favor of moving them into the controller or node groups. They will be removed in a subsequent release. - -affinity: -extraCreateMetadata: -extraVolumeTags: -k8sTagClusterId: -nodeSelector: -podAnnotations: -priorityClassName: -region: -replicaCount: -resources: -tolerations: -topologySpreadConstraints: -volumeAttachLimit: - -are moving to - -controller: - affinity: - extraCreateMetadata: - extraVolumeTags: - k8sTagClusterId: - nodeSelector: - podAnnotations: - priorityClassName: - region: - replicaCount: - resources: - tolerations: - topologySpreadConstraints: - -node: - volumeAttachLimit: diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/_helpers.tpl b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/_helpers.tpl deleted file mode 100644 index ddf7b614..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/_helpers.tpl +++ /dev/null @@ -1,82 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "aws-ebs-csi-driver.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "aws-ebs-csi-driver.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "aws-ebs-csi-driver.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "aws-ebs-csi-driver.labels" -}} -{{ include "aws-ebs-csi-driver.selectorLabels" . }} -{{- if ne .Release.Name "kustomize" }} -helm.sh/chart: {{ include "aws-ebs-csi-driver.chart" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} -{{- end -}} - -{{/* -Common selector labels -*/}} -{{- define "aws-ebs-csi-driver.selectorLabels" -}} -app.kubernetes.io/name: {{ include "aws-ebs-csi-driver.name" . }} -{{- if ne .Release.Name "kustomize" }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} -{{- end -}} - -{{/* -Convert the `--extra-volume-tags` command line arg from a map. -*/}} -{{- define "aws-ebs-csi-driver.extra-volume-tags" -}} -{{- $evt := default .Values.extraVolumeTags .Values.controller.extraVolumeTags }} -{{- $result := dict "pairs" (list) -}} -{{- range $key, $value := $evt -}} -{{- $noop := printf "%s=%s" $key $value | append $result.pairs | set $result "pairs" -}} -{{- end -}} -{{- if gt (len $result.pairs) 0 -}} -{{- printf "%s=%s" "- --extra-volume-tags" (join "," $result.pairs) -}} -{{- end -}} -{{- end -}} - -{{/* -Handle http proxy env vars -*/}} -{{- define "aws-ebs-csi-driver.http-proxy" -}} -- name: HTTP_PROXY - value: {{ .Values.proxy.http_proxy | quote }} -- name: HTTPS_PROXY - value: {{ .Values.proxy.http_proxy | quote }} -- name: NO_PROXY - value: {{ .Values.proxy.no_proxy | quote }} -{{- end -}} diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-attacher.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-attacher.yaml deleted file mode 100644 index 816fdf66..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-attacher.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-external-attacher-role - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -rules: - - apiGroups: [ "" ] - resources: [ "persistentvolumes" ] - verbs: [ "get", "list", "watch", "update", "patch" ] - - apiGroups: [ "" ] - resources: [ "nodes" ] - verbs: [ "get", "list", "watch" ] - - apiGroups: [ "csi.storage.k8s.io" ] - resources: [ "csinodeinfos" ] - verbs: [ "get", "list", "watch" ] - - apiGroups: [ "storage.k8s.io" ] - resources: [ "volumeattachments" ] - verbs: [ "get", "list", "watch", "update", "patch" ] - - apiGroups: [ "storage.k8s.io" ] - resources: [ "volumeattachments/status" ] - verbs: [ "patch" ] diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-csi-node.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-csi-node.yaml deleted file mode 100644 index 3ca368ef..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-csi-node.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-csi-node-role - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -rules: - - apiGroups: [""] - resources: ["nodes"] - verbs: ["get"] diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-provisioner.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-provisioner.yaml deleted file mode 100644 index 0fb7ded0..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-provisioner.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-external-provisioner-role - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -rules: - - apiGroups: [ "" ] - resources: [ "persistentvolumes" ] - verbs: [ "get", "list", "watch", "create", "delete" ] - - apiGroups: [ "" ] - resources: [ "persistentvolumeclaims" ] - verbs: [ "get", "list", "watch", "update" ] - - apiGroups: [ "storage.k8s.io" ] - resources: [ "storageclasses" ] - verbs: [ "get", "list", "watch" ] - - apiGroups: [ "" ] - resources: [ "events" ] - verbs: [ "list", "watch", "create", "update", "patch" ] - - apiGroups: [ "snapshot.storage.k8s.io" ] - resources: [ "volumesnapshots" ] - verbs: [ "get", "list" ] - - apiGroups: [ "snapshot.storage.k8s.io" ] - resources: [ "volumesnapshotcontents" ] - verbs: [ "get", "list" ] - - apiGroups: [ "storage.k8s.io" ] - resources: [ "csinodes" ] - verbs: [ "get", "list", "watch" ] - - apiGroups: [ "" ] - resources: [ "nodes" ] - verbs: [ "get", "list", "watch" ] - - apiGroups: [ "coordination.k8s.io" ] - resources: [ "leases" ] - verbs: [ "get", "watch", "list", "delete", "update", "create" ] - - apiGroups: [ "storage.k8s.io" ] - resources: [ "volumeattachments" ] - verbs: [ "get", "list", "watch" ] diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-resizer.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-resizer.yaml deleted file mode 100644 index 065f3aba..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-resizer.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-external-resizer-role - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -rules: - # The following rule should be uncommented for plugins that require secrets - # for provisioning. - # - apiGroups: [""] - # resources: ["secrets"] - # verbs: ["get", "list", "watch"] - - apiGroups: [ "" ] - resources: [ "persistentvolumes" ] - verbs: [ "get", "list", "watch", "update", "patch" ] - - apiGroups: [ "" ] - resources: [ "persistentvolumeclaims" ] - verbs: [ "get", "list", "watch" ] - - apiGroups: [ "" ] - resources: [ "persistentvolumeclaims/status" ] - verbs: [ "update", "patch" ] - - apiGroups: [ "storage.k8s.io" ] - resources: [ "storageclasses" ] - verbs: [ "get", "list", "watch" ] - - apiGroups: [ "" ] - resources: [ "events" ] - verbs: [ "list", "watch", "create", "update", "patch" ] - - apiGroups: [ "" ] - resources: [ "pods" ] - verbs: [ "get", "list", "watch" ] diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-snapshot-controller.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-snapshot-controller.yaml deleted file mode 100644 index b5b79788..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-snapshot-controller.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-snapshot-controller-role - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -rules: - - apiGroups: [ "" ] - resources: [ "persistentvolumes" ] - verbs: [ "get", "list", "watch" ] - - apiGroups: [ "" ] - resources: [ "persistentvolumeclaims" ] - verbs: [ "get", "list", "watch", "update" ] - - apiGroups: [ "storage.k8s.io" ] - resources: [ "storageclasses" ] - verbs: [ "get", "list", "watch" ] - - apiGroups: [ "" ] - resources: [ "events" ] - verbs: [ "list", "watch", "create", "update", "patch" ] - - apiGroups: [ "snapshot.storage.k8s.io" ] - resources: [ "volumesnapshotclasses" ] - verbs: [ "get", "list", "watch" ] - - apiGroups: [ "snapshot.storage.k8s.io" ] - resources: [ "volumesnapshotcontents" ] - verbs: [ "create", "get", "list", "watch", "update", "delete" ] - - apiGroups: [ "snapshot.storage.k8s.io" ] - resources: [ "volumesnapshots" ] - verbs: [ "get", "list", "watch", "update" ] - - apiGroups: [ "snapshot.storage.k8s.io" ] - resources: [ "volumesnapshots/status" ] - verbs: [ "update" ] diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-snapshotter.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-snapshotter.yaml deleted file mode 100644 index 5fada8b4..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrole-snapshotter.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-external-snapshotter-role - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -rules: - - apiGroups: [ "" ] - resources: [ "events" ] - verbs: [ "list", "watch", "create", "update", "patch" ] - - apiGroups: [ "" ] - resources: [ "secrets" ] - verbs: [ "get", "list" ] - - apiGroups: [ "snapshot.storage.k8s.io" ] - resources: [ "volumesnapshotclasses" ] - verbs: [ "get", "list", "watch" ] - - apiGroups: [ "snapshot.storage.k8s.io" ] - resources: [ "volumesnapshotcontents" ] - verbs: [ "create", "get", "list", "watch", "update", "delete" ] - - apiGroups: [ "snapshot.storage.k8s.io" ] - resources: [ "volumesnapshotcontents/status" ] - verbs: [ "update" ] diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-attacher.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-attacher.yaml deleted file mode 100644 index c75cb9b1..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-attacher.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-csi-attacher-binding - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ .Values.serviceAccount.controller.name }} - namespace: {{ .Release.Namespace }} -roleRef: - kind: ClusterRole - name: ebs-external-attacher-role - apiGroup: rbac.authorization.k8s.io diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-csi-node.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-csi-node.yaml deleted file mode 100644 index 63d843e5..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-csi-node.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-csi-node-getter-binding - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ .Values.serviceAccount.node.name }} - namespace: {{ .Release.Namespace }} -roleRef: - kind: ClusterRole - name: ebs-csi-node-role - apiGroup: rbac.authorization.k8s.io diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-provisioner.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-provisioner.yaml deleted file mode 100644 index 4a9174b7..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-provisioner.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-csi-provisioner-binding - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ .Values.serviceAccount.controller.name }} - namespace: {{ .Release.Namespace }} -roleRef: - kind: ClusterRole - name: ebs-external-provisioner-role - apiGroup: rbac.authorization.k8s.io diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-resizer.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-resizer.yaml deleted file mode 100644 index 768e5891..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-resizer.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-csi-resizer-binding - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ .Values.serviceAccount.controller.name }} - namespace: {{ .Release.Namespace }} -roleRef: - kind: ClusterRole - name: ebs-external-resizer-role - apiGroup: rbac.authorization.k8s.io diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshot-controller.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshot-controller.yaml deleted file mode 100644 index 55a634fb..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshot-controller.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-csi-snapshot-controller-binding - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ .Values.serviceAccount.snapshot.name }} - namespace: {{ .Release.Namespace }} -roleRef: - kind: ClusterRole - name: ebs-snapshot-controller-role - apiGroup: rbac.authorization.k8s.io diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshotter.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshotter.yaml deleted file mode 100644 index e9f36246..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshotter.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-csi-snapshotter-binding - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ .Values.serviceAccount.controller.name }} - namespace: {{ .Release.Namespace }} -roleRef: - kind: ClusterRole - name: ebs-external-snapshotter-role - apiGroup: rbac.authorization.k8s.io diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/controller.yaml deleted file mode 100644 index 69349024..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/controller.yaml +++ /dev/null @@ -1,266 +0,0 @@ -# Controller Service -kind: Deployment -apiVersion: apps/v1 -metadata: - name: ebs-csi-controller - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -spec: - replicas: {{ default .Values.replicaCount .Values.controller.replicaCount }} - selector: - matchLabels: - app: ebs-csi-controller - {{- include "aws-ebs-csi-driver.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - app: ebs-csi-controller - {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }} - {{- if .Values.controller.podLabels }} - {{- toYaml .Values.controller.podLabels | nindent 8 }} - {{- end }} - {{- if .Values.controller.podAnnotations }} - annotations: - {{- toYaml .Values.controller.podAnnotations | nindent 8 }} - {{- else if .Values.podAnnotations}} - annotations: - {{- toYaml .Values.podAnnotations | nindent 8 }} - {{- end }} - spec: - nodeSelector: - kubernetes.io/os: linux - {{- with default .Values.nodeSelector .Values.controller.nodeSelector }} - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ .Values.serviceAccount.controller.name }} - priorityClassName: {{ default .Values.priorityClassName .Values.controller.priorityClassName }} - {{- with default .Values.affinity .Values.controller.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - tolerations: - - key: CriticalAddonsOnly - operator: Exists - - operator: Exists - effect: NoExecute - tolerationSeconds: 300 - {{- with default .Values.tolerations .Values.controller.tolerations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- if or .Values.controller.topologySpreadConstraints .Values.topologySpreadConstraints }} - {{- $tscLabelSelector := dict "labelSelector" ( dict "matchLabels" ( dict "app" "ebs-csi-controller" ) ) }} - {{- $constraints := list }} - {{- range default .Values.topologySpreadConstraints .Values.controller.topologySpreadConstraints }} - {{- $constraints = mustAppend $constraints (mergeOverwrite . $tscLabelSelector) }} - {{- end }} - topologySpreadConstraints: - {{- $constraints | toYaml | nindent 8 }} - {{- end }} - containers: - - name: ebs-plugin - image: {{ .Values.image.repository }}:{{ .Values.image.tag }} - imagePullPolicy: {{ .Values.image.pullPolicy }} - args: - {{- if ne .Release.Name "kustomize" }} - - controller - {{- else }} - # - {all,controller,node} # specify the driver mode - {{- end }} - - --endpoint=$(CSI_ENDPOINT) - {{- if or .Values.controller.extraVolumeTags .Values.extraVolumeTags }} - {{- include "aws-ebs-csi-driver.extra-volume-tags" . | nindent 12 }} - {{- end }} - {{- with default .Values.k8sTagClusterId .Values.controller.k8sTagClusterId }} - - --k8s-tag-cluster-id={{ . }} - {{- end }} - {{- with .Values.controller.httpEndpoint }} - - --http-endpoint={{ . }} - {{- end }} - - --logtostderr - - --v={{ .Values.controller.logLevel }} - env: - - name: CSI_ENDPOINT - value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock - - name: CSI_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: AWS_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: aws-secret - key: key_id - optional: true - - name: AWS_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: aws-secret - key: access_key - optional: true - {{- with default .Values.region .Values.controller.region }} - - name: AWS_REGION - value: {{ . }} - {{- end }} - {{- if .Values.controller.extraVars }} - {{- range $key, $val := .Values.controller.extraVars }} - - name: {{ $key }} - value: "{{ $val }}" - {{- end }} - {{- end }} - {{- if .Values.proxy.http_proxy }} - {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} - {{- end }} - {{- with .Values.controller.env.ebsPlugin }} - {{- . | toYaml | nindent 12 }} - {{- end }} - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - - name: aws-token - mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" - readOnly: true - ports: - - name: healthz - containerPort: 9808 - protocol: TCP - livenessProbe: - httpGet: - path: /healthz - port: healthz - initialDelaySeconds: 10 - timeoutSeconds: 3 - periodSeconds: 10 - failureThreshold: 5 - readinessProbe: - httpGet: - path: /healthz - port: healthz - initialDelaySeconds: 10 - timeoutSeconds: 3 - periodSeconds: 10 - failureThreshold: 5 - {{- with default .Values.resources (default .Values.controller.resources .Values.controller.containerResources.ebsPlugin) }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - - name: csi-provisioner - image: {{ printf "%s:%s" .Values.sidecars.provisionerImage.repository .Values.sidecars.provisionerImage.tag }} - args: - - --csi-address=$(ADDRESS) - - --v={{ .Values.controller.logLevel }} - - --feature-gates=Topology=true - {{- if or .Values.controller.extraCreateMetadata .Values.extraCreateMetadata }} - - --extra-create-metadata - {{- end}} - - --leader-election=true - - --default-fstype=ext4 - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - {{- if .Values.proxy.http_proxy }} - {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} - {{- end }} - {{- with .Values.controller.env.provisioner }} - {{- . | toYaml | nindent 12 }} - {{- end }} - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - {{- with default .Values.resources (default .Values.controller.resources .Values.controller.containerResources.provisioner) }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - - name: csi-attacher - image: {{ printf "%s:%s" .Values.sidecars.attacherImage.repository .Values.sidecars.attacherImage.tag }} - args: - - --csi-address=$(ADDRESS) - - --v={{ .Values.controller.logLevel }} - - --leader-election=true - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - {{- if .Values.proxy.http_proxy }} - {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} - {{- end }} - {{- with .Values.controller.env.attacher }} - {{- . | toYaml | nindent 12 }} - {{- end }} - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - {{- with default .Values.resources (default .Values.controller.resources .Values.controller.containerResources.attacher) }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} -{{- if or .Values.enableVolumeSnapshot (.Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1") }} - - name: csi-snapshotter - image: {{ printf "%s:%s" .Values.sidecars.snapshotterImage.repository .Values.sidecars.snapshotterImage.tag }} - args: - - --csi-address=$(ADDRESS) - - --leader-election=true - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - {{- if .Values.proxy.http_proxy }} - {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} - {{- end }} - {{- with .Values.controller.env.snapshotter }} - {{- . | toYaml | nindent 12 }} - {{- end }} - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - {{- with default .Values.resources (default .Values.controller.resources .Values.controller.containerResources.snapshotter) }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} -{{- end }} - - name: csi-resizer - image: {{ printf "%s:%s" .Values.sidecars.resizerImage.repository .Values.sidecars.resizerImage.tag }} - imagePullPolicy: Always - args: - - --csi-address=$(ADDRESS) - - --v={{ .Values.controller.logLevel }} - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - {{- if .Values.proxy.http_proxy }} - {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} - {{- end }} - {{- with .Values.controller.env.resizer }} - {{- . | toYaml | nindent 12 }} - {{- end }} - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - {{- with default .Values.resources (default .Values.controller.resources .Values.controller.containerResources.resizer) }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - - name: liveness-probe - image: {{ printf "%s:%s" .Values.sidecars.livenessProbeImage.repository .Values.sidecars.livenessProbeImage.tag }} - args: - - --csi-address=/csi/csi.sock - volumeMounts: - - name: socket-dir - mountPath: /csi - {{- with default .Values.resources (default .Values.controller.resources .Values.controller.containerResources.liveness) }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- if .Values.imagePullSecrets }} - imagePullSecrets: - {{- range .Values.imagePullSecrets }} - - name: {{ . }} - {{- end }} - {{- end }} - volumes: - - name: socket-dir - emptyDir: {} - - name: aws-token - projected: - sources: - - serviceAccountToken: - path: token - expirationSeconds: 86400 - audience: "sts.amazonaws.com" diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/csidriver.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/csidriver.yaml deleted file mode 100644 index 6598355a..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/csidriver.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: {{ ternary "storage.k8s.io/v1" "storage.k8s.io/v1beta1" (semverCompare ">=1.18.0-0" .Capabilities.KubeVersion.Version) }} -kind: CSIDriver -metadata: - name: ebs.csi.aws.com - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -spec: - attachRequired: true - podInfoOnMount: false diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node-windows.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node-windows.yaml deleted file mode 100644 index b6cde40d..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node-windows.yaml +++ /dev/null @@ -1,185 +0,0 @@ -kind: DaemonSet -apiVersion: apps/v1 -metadata: - name: ebs-csi-node-windows - namespace: kube-system - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - app: ebs-csi-node - {{- include "aws-ebs-csi-driver.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - app: ebs-csi-node - {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }} - {{- if .Values.node.podAnnotations }} - annotations: {{ toYaml .Values.node.podAnnotations | nindent 8 }} - {{- end }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/compute-type - operator: NotIn - values: - - fargate - nodeSelector: - kubernetes.io/os: windows - {{- with .Values.node.nodeSelector }} -{{ toYaml . | indent 8 }} - {{- end }} - serviceAccountName: {{ .Values.serviceAccount.node.name }} - priorityClassName: {{ .Values.node.priorityClassName | default "system-cluster-critical" }} - tolerations: - {{- if .Values.node.tolerateAllTaints }} - - operator: Exists - {{- else }} - - key: CriticalAddonsOnly - operator: Exists - - operator: Exists - effect: NoExecute - tolerationSeconds: 300 - {{- end }} - {{- with .Values.node.tolerations }} -{{ toYaml . | indent 8 }} - {{- end }} - containers: - - name: ebs-plugin - image: {{ .Values.image.repository }}:{{ .Values.image.tag }} - args: - - node - - --endpoint=$(CSI_ENDPOINT) - {{- if .Values.volumeAttachLimit }} - - --volume-attach-limit={{ .Values.volumeAttachLimit }} - {{- end }} - - --logtostderr - - --v=5 - env: - - name: CSI_ENDPOINT - value: unix:/csi/csi.sock -{{- if .Values.proxy.http_proxy }} - - name: HTTP_PROXY - value: {{ .Values.proxy.http_proxy | quote }} - - name: HTTPS_PROXY - value: {{ .Values.proxy.http_proxy | quote }} - - name: NO_PROXY - value: {{ .Values.proxy.no_proxy | quote }} -{{- end }} - volumeMounts: - - name: kubelet-dir - mountPath: C:\var\lib\kubelet - mountPropagation: "None" - - name: plugin-dir - mountPath: C:\csi - - name: csi-proxy-disk-pipe - mountPath: \\.\pipe\csi-proxy-disk-v1beta2 - - name: csi-proxy-volume-pipe - mountPath: \\.\pipe\csi-proxy-volume-v1beta2 - - name: csi-proxy-filesystem-pipe - mountPath: \\.\pipe\csi-proxy-filesystem-v1beta1 - ports: - - name: healthz - containerPort: 9808 - protocol: TCP - livenessProbe: - httpGet: - path: /healthz - port: healthz - initialDelaySeconds: 10 - timeoutSeconds: 3 - periodSeconds: 10 - failureThreshold: 5 - {{- if .Values.node.resources }} - {{- with .Values.node.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - {{- else }} - {{- with .Values.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - {{- end }} - - name: node-driver-registrar - image: {{ printf "%s:%s" .Values.sidecars.nodeDriverRegistrarImage.repository .Values.sidecars.nodeDriverRegistrarImage.tag }} - args: - - --csi-address=$(ADDRESS) - - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) - - --v=5 - env: - - name: ADDRESS - value: unix:/csi/csi.sock - - name: DRIVER_REG_SOCK_PATH - value: C:\var\lib\kubelet\plugins\ebs.csi.aws.com\csi.sock -{{- if .Values.proxy.http_proxy }} - - name: HTTP_PROXY - value: {{ .Values.proxy.http_proxy | quote }} - - name: HTTPS_PROXY - value: {{ .Values.proxy.http_proxy | quote }} - - name: NO_PROXY - value: {{ .Values.proxy.no_proxy | quote }} -{{- end }} - volumeMounts: - - name: plugin-dir - mountPath: C:\csi - - name: registration-dir - mountPath: C:\registration - {{- if .Values.node.resources }} - {{- with .Values.node.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - {{- else }} - {{- with .Values.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - {{- end }} - - name: liveness-probe - image: {{ printf "%s:%s" .Values.sidecars.livenessProbeImage.repository .Values.sidecars.livenessProbeImage.tag }} - args: - - --csi-address=unix:/csi/csi.sock - volumeMounts: - - name: plugin-dir - mountPath: C:\csi - {{- if .Values.node.resources }} - {{- with .Values.node.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - {{- else }} - {{- with .Values.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - {{- end }} - {{- if .Values.imagePullSecrets }} - imagePullSecrets: - {{- range .Values.imagePullSecrets }} - - name: {{ . }} - {{- end }} - {{- end }} - volumes: - - name: kubelet-dir - hostPath: - path: C:\var\lib\kubelet - type: Directory - - name: plugin-dir - hostPath: - path: C:\var\lib\kubelet\plugins\ebs.csi.aws.com - type: DirectoryOrCreate - - name: registration-dir - hostPath: - path: C:\var\lib\kubelet\plugins_registry - type: Directory - - name: csi-proxy-disk-pipe - hostPath: - path: \\.\pipe\csi-proxy-disk-v1beta2 - type: "" - - name: csi-proxy-volume-pipe - hostPath: - path: \\.\pipe\csi-proxy-volume-v1beta2 - type: "" - - name: csi-proxy-filesystem-pipe - hostPath: - path: \\.\pipe\csi-proxy-filesystem-v1beta1 - type: "" diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node.yaml deleted file mode 100644 index c816adf7..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node.yaml +++ /dev/null @@ -1,164 +0,0 @@ -# Node Service -kind: DaemonSet -apiVersion: apps/v1 -metadata: - name: ebs-csi-node - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - app: ebs-csi-node - {{- include "aws-ebs-csi-driver.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - app: ebs-csi-node - {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }} - {{- if .Values.node.podLabels }} - {{- toYaml .Values.node.podLabels | nindent 8 }} - {{- end }} - {{- with .Values.node.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: eks.amazonaws.com/compute-type - operator: NotIn - values: - - fargate - nodeSelector: - kubernetes.io/os: linux - {{- with .Values.node.nodeSelector }} - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ .Values.serviceAccount.node.name }} - priorityClassName: {{ .Values.node.priorityClassName | default "system-node-critical" }} - tolerations: - {{- if .Values.node.tolerateAllTaints }} - - operator: Exists - {{- else }} - - key: CriticalAddonsOnly - operator: Exists - - operator: Exists - effect: NoExecute - tolerationSeconds: 300 - {{- end }} - {{- with .Values.node.tolerations }} - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: ebs-plugin - securityContext: - privileged: true - image: {{ .Values.image.repository }}:{{ .Values.image.tag }} - args: - - node - - --endpoint=$(CSI_ENDPOINT) - {{- with default .Values.volumeAttachLimit .Values.node.volumeAttachLimit }} - - --volume-attach-limit={{ . }} - {{- end }} - - --logtostderr - - --v={{ .Values.node.logLevel }} - env: - - name: CSI_ENDPOINT - value: unix:/csi/csi.sock - - name: CSI_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - {{- if .Values.proxy.http_proxy }} - {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} - {{- end }} - {{- with .Values.node.env.ebsPlugin }} - {{- . | toYaml | nindent 12 }} - {{- end }} - volumeMounts: - - name: kubelet-dir - mountPath: /var/lib/kubelet - mountPropagation: "Bidirectional" - - name: plugin-dir - mountPath: /csi - - name: device-dir - mountPath: /dev - ports: - - name: healthz - containerPort: 9808 - protocol: TCP - livenessProbe: - httpGet: - path: /healthz - port: healthz - initialDelaySeconds: 10 - timeoutSeconds: 3 - periodSeconds: 10 - failureThreshold: 5 - {{- with default .Values.resources (default .Values.node.resources .Values.node.containerResources.ebsPlugin) }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - - name: node-driver-registrar - image: {{ printf "%s:%s" .Values.sidecars.nodeDriverRegistrarImage.repository .Values.sidecars.nodeDriverRegistrarImage.tag }} - args: - - --csi-address=$(ADDRESS) - - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) - - --v={{ .Values.node.logLevel }} - env: - - name: ADDRESS - value: /csi/csi.sock - - name: DRIVER_REG_SOCK_PATH - value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock - {{- if .Values.proxy.http_proxy }} - {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} - {{- end }} - {{- with .Values.node.env.nodeDriverRegistrar }} - {{- . | toYaml | nindent 12 }} - {{- end }} - volumeMounts: - - name: plugin-dir - mountPath: /csi - - name: registration-dir - mountPath: /registration - {{- with default .Values.resources (default .Values.node.resources .Values.node.containerResources.nodeDriverRegistrar) }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - - name: liveness-probe - image: {{ printf "%s:%s" .Values.sidecars.livenessProbeImage.repository .Values.sidecars.livenessProbeImage.tag }} - args: - - --csi-address=/csi/csi.sock - volumeMounts: - - name: plugin-dir - mountPath: /csi - {{- with default .Values.resources (default .Values.node.resources .Values.node.containerResources.liveness) }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- if .Values.imagePullSecrets }} - imagePullSecrets: - {{- range .Values.imagePullSecrets }} - - name: {{ . }} - {{- end }} - {{- end }} - volumes: - - name: kubelet-dir - hostPath: - path: {{ .Values.node.kubeletPath }} - type: Directory - - name: plugin-dir - hostPath: - path: {{ printf "%s/plugins/ebs.csi.aws.com/" (trimSuffix "/" .Values.node.kubeletPath) }} - type: DirectoryOrCreate - - name: registration-dir - hostPath: - path: {{ printf "%s/plugins_registry/" (trimSuffix "/" .Values.node.kubeletPath) }} - type: Directory - - name: device-dir - hostPath: - path: /dev - type: Directory diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-controller.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-controller.yaml deleted file mode 100644 index 373974a0..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-controller.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- $replicas := (default .Values.replicaCount .Values.controller.replicaCount) | int }} -apiVersion: policy/v1beta1 -kind: PodDisruptionBudget -metadata: - name: ebs-csi-controller - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - app: ebs-csi-controller - {{- include "aws-ebs-csi-driver.selectorLabels" . | nindent 6 }} - {{- if le $replicas 2 }} - maxUnavailable: 1 - {{- else }} - minAvailable: 2 -{{- end }} diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-snapshot-controller.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-snapshot-controller.yaml deleted file mode 100644 index d9383bcb..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-snapshot-controller.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if .Values.enableVolumeSnapshot }} -apiVersion: policy/v1beta1 -kind: PodDisruptionBudget -metadata: - name: ebs-snapshot-controller - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - app: ebs-snapshot-controller - {{- include "aws-ebs-csi-driver.selectorLabels" . | nindent 6 }} - maxUnavailable: 1 -{{- end }} diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/role-snapshot-controller-leaderelection.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/role-snapshot-controller-leaderelection.yaml deleted file mode 100644 index 2b55a16a..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/role-snapshot-controller-leaderelection.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-snapshot-controller-leaderelection - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -rules: - - apiGroups: [ "coordination.k8s.io" ] - resources: [ "leases" ] - verbs: [ "get", "watch", "list", "delete", "update", "create" ] diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/rolebinding-snapshot-controller-leaderelection.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/rolebinding-snapshot-controller-leaderelection.yaml deleted file mode 100644 index 74095f38..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/rolebinding-snapshot-controller-leaderelection.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: ebs-snapshot-controller-leaderelection - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ .Values.serviceAccount.snapshot.name }} - namespace: {{ .Release.Namespace }} -roleRef: - kind: Role - name: ebs-snapshot-controller-leaderelection - apiGroup: rbac.authorization.k8s.io diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-controller.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-controller.yaml deleted file mode 100644 index b465c3be..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-controller.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if .Values.serviceAccount.controller.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ .Values.serviceAccount.controller.name }} - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.controller.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} - {{- if eq .Release.Name "kustomize" }} - #Enable if EKS IAM for SA is used - #annotations: - # eks.amazonaws.com/role-arn: arn:aws:iam::586565787010:role/ebs-csi-role - {{- end }} -{{- end -}} diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-node.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-node.yaml deleted file mode 100644 index 4722b2a9..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-node.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.node.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ .Values.serviceAccount.node.name }} - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.node.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-snapshot-controller.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-snapshot-controller.yaml deleted file mode 100644 index 9d2c6811..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount-snapshot-controller.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.snapshot.create }} ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ .Values.serviceAccount.snapshot.name }} - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.snapshot.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml deleted file mode 100644 index bccfd131..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml +++ /dev/null @@ -1,68 +0,0 @@ -{{- if .Values.enableVolumeSnapshot }} -#Snapshot controller -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: ebs-snapshot-controller - labels: - {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} -spec: - serviceName: ebs-snapshot-controller - replicas: 1 - selector: - matchLabels: - app: ebs-snapshot-controller - {{- include "aws-ebs-csi-driver.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - app: ebs-snapshot-controller - {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }} - {{- if .Values.snapshotController.podLabels }} - {{- toYaml .Values.snapshotController.podLabels | nindent 8 }} - {{- end }} - {{- if .Values.snapshotController.podAnnotations }} - annotations: {{ toYaml .Values.snapshotController.podAnnotations | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.snapshot.name }} - nodeSelector: - kubernetes.io/os: linux - {{- with .Values.nodeSelector }} - {{- toYaml . | nindent 8 }} - {{- end }} - priorityClassName: {{ .Values.priorityClassName | default "system-cluster-critical" }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - tolerations: - - key: CriticalAddonsOnly - operator: Exists - - operator: Exists - effect: NoExecute - tolerationSeconds: 300 - {{- with .Values.tolerations }} - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: snapshot-controller - image: {{ printf "%s:%s" .Values.snapshotController.repository .Values.snapshotController.tag }} - {{- with .Values.resources }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- if .Values.proxy.http_proxy }} - env: - {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} - {{- end }} - args: - - --v=2 - - --leader-election=false - {{- if .Values.imagePullSecrets }} - imagePullSecrets: - {{- range .Values.imagePullSecrets }} - - name: {{ . }} - {{- end }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/storageclass.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/storageclass.yaml deleted file mode 100644 index 847f5e21..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/storageclass.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- range .Values.storageClasses }} ---- -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: {{ .name }} - {{- with .annotations }} - annotations: {{- . | toYaml | trim | nindent 4 }} - {{- end }} - {{- with .labels }} - labels: {{- . | toYaml | trim | nindent 4 }} - {{- end }} -provisioner: ebs.csi.aws.com -{{ omit (dict "volumeBindingMode" "WaitForFirstConsumer" | merge .) "name" "annotations" "labels" | toYaml }} -{{- end }} diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml deleted file mode 100644 index 8a6e62a3..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml +++ /dev/null @@ -1,179 +0,0 @@ -# Default values for aws-ebs-csi-driver. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -image: - repository: k8s.gcr.io/provider-aws/aws-ebs-csi-driver - tag: "v1.1.1" - pullPolicy: IfNotPresent - -sidecars: - provisionerImage: - repository: k8s.gcr.io/sig-storage/csi-provisioner - tag: "v2.1.1" - attacherImage: - repository: k8s.gcr.io/sig-storage/csi-attacher - tag: "v3.1.0" - snapshotterImage: - repository: k8s.gcr.io/sig-storage/csi-snapshotter - tag: "v3.0.3" - livenessProbeImage: - repository: k8s.gcr.io/sig-storage/livenessprobe - tag: "v2.2.0" - resizerImage: - repository: k8s.gcr.io/sig-storage/csi-resizer - tag: "v1.0.0" - nodeDriverRegistrarImage: - repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar - tag: "v2.1.0" - -snapshotController: - repository: k8s.gcr.io/sig-storage/snapshot-controller - tag: "v3.0.3" - podAnnotations: {} - podLabels: {} - -proxy: - http_proxy: - no_proxy: - -imagePullSecrets: [] -nameOverride: -fullnameOverride: - -# True if enable volume snapshot -enableVolumeSnapshot: false - -# Moving to values under controller -affinity: {} -extraCreateMetadata: true -extraVolumeTags: {} -k8sTagClusterId: -nodeSelector: {} -podAnnotations: {} -priorityClassName: "system-cluster-critical" -region: -replicaCount: 2 -resources: {} -tolerations: [] -topologySpreadConstraints: [] - -controller: - affinity: {} - # True if enable volume scheduling for dynamic volume provisioning - env: - ebsPlugin: [] - provisioner: [] - attacher: [] - snapshotter: [] - resizer: [] - # If set, add pv/pvc metadata to plugin create requests as parameters. - extraCreateMetadata: true - # Will be removed in later version in favor of env.ebsPlugin - extraVars: {} - # Extra volume tags to attach to each dynamically provisioned volume. - # --- - # extraVolumeTags: - # key1: value1 - # key2: value2 - extraVolumeTags: {} - httpEndpoint: - # ID of the Kubernetes cluster used for tagging provisioned EBS volumes (optional). - k8sTagClusterId: - logLevel: 2 - nodeSelector: {} - podAnnotations: {} - podLabels: {} - priorityClassName: - # AWS region to use. If not specified then the region will be looked up via the AWS EC2 metadata - # service. - # --- - # region: us-east-1 - region: - replicaCount: - resources: {} - containerResources: - ebsPlugin: {} - provisioner: {} - attacher: {} - snapshotter: {} - resizer: {} - liveness: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # Note that you will need to set resource requests if you want the cluster autoscaler to - # scale your nodes when you increase/decrease the number of ebs-csi-controller replicas. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - tolerations: [] - # TSCs without the label selector stanza - # - # Example: - # - # topologySpreadConstraints: - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # whenUnsatisfiable: ScheduleAnyway - # - maxSkew: 1 - # topologyKey: kubernetes.io/hostname - # whenUnsatisfiable: ScheduleAnyway - topologySpreadConstraints: [] - -# Moving to values under node -# The "maximum number of attachable volumes" per node -volumeAttachLimit: - -node: - env: - ebsPlugin: [] - nodeDriverRegistrar: [] - kubeletPath: /var/lib/kubelet - logLevel: 2 - priorityClassName: - nodeSelector: {} - podAnnotations: {} - podLabels: {} - tolerateAllTaints: false - tolerations: [] - resources: {} - containerResources: - ebsPlugin: {} - nodeDriverRegistrar: {} - liveness: {} - volumeAttachLimit: - -serviceAccount: - controller: - create: true # A service account will be created for you if set to true. Set to false if you want to use your own. - name: ebs-csi-controller-sa # Name of the service-account to be used/created. - annotations: {} - snapshot: - create: true - name: ebs-snapshot-controller - annotations: {} - node: - create: true - name: ebs-csi-node-sa - annotations: {} - -storageClasses: [] -# Add StorageClass resources like: -# - name: ebs-sc -# # annotation metadata -# annotations: -# storageclass.kubernetes.io/is-default-class: "true" -# # label metadata -# labels: -# my-label-is: supercool -# # defaults to WaitForFirstConsumer -# volumeBindingMode: WaitForFirstConsumer -# # defaults to Delete -# reclaimPolicy: Retain -# parameters: -# encrypted: "true" diff --git a/charts/kubezero-aws-ebs-csi-driver/patch b/charts/kubezero-aws-ebs-csi-driver/patch deleted file mode 100644 index 71fb0085..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -rtubN charts/aws-ebs-csi-driver/templates/controller.yaml charts/aws-ebs-csi-driver.zdt/templates/controller.yaml ---- charts/aws-ebs-csi-driver/templates/controller.yaml 2021-06-17 22:22:22.000000000 +0200 -+++ charts/aws-ebs-csi-driver.zdt/templates/controller.yaml 2021-06-24 16:31:37.042386198 +0200 -@@ -116,6 +116,9 @@ - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ -+ - name: aws-token -+ mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" -+ readOnly: true - ports: - - name: healthz - containerPort: 9808 -@@ -144,7 +147,7 @@ - image: {{ printf "%s:%s" .Values.sidecars.provisionerImage.repository .Values.sidecars.provisionerImage.tag }} - args: - - --csi-address=$(ADDRESS) -- - --v=5 -+ - --v={{ .Values.controller.logLevel }} - - --feature-gates=Topology=true - {{- if or .Values.controller.extraCreateMetadata .Values.extraCreateMetadata }} - - --extra-create-metadata -@@ -171,7 +174,7 @@ - image: {{ printf "%s:%s" .Values.sidecars.attacherImage.repository .Values.sidecars.attacherImage.tag }} - args: - - --csi-address=$(ADDRESS) -- - --v=5 -+ - --v={{ .Values.controller.logLevel }} - - --leader-election=true - env: - - name: ADDRESS -@@ -215,7 +218,7 @@ - imagePullPolicy: Always - args: - - --csi-address=$(ADDRESS) -- - --v=5 -+ - --v={{ .Values.controller.logLevel }} - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock -@@ -252,3 +255,10 @@ - volumes: - - name: socket-dir - emptyDir: {} -+ - name: aws-token -+ projected: -+ sources: -+ - serviceAccountToken: -+ path: token -+ expirationSeconds: 86400 -+ audience: "sts.amazonaws.com" -diff -rtubN charts/aws-ebs-csi-driver/templates/node.yaml charts/aws-ebs-csi-driver.zdt/templates/node.yaml ---- charts/aws-ebs-csi-driver/templates/node.yaml 2021-06-17 22:22:22.000000000 +0200 -+++ charts/aws-ebs-csi-driver.zdt/templates/node.yaml 2021-06-24 15:03:44.532351851 +0200 -@@ -107,7 +107,7 @@ - args: - - --csi-address=$(ADDRESS) - - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) -- - --v=5 -+ - --v={{ .Values.node.logLevel }} - env: - - name: ADDRESS - value: /csi/csi.sock -diff -rtubN charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml charts/aws-ebs-csi-driver.zdt/templates/snapshot-controller.yaml ---- charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml 2021-06-17 22:22:22.000000000 +0200 -+++ charts/aws-ebs-csi-driver.zdt/templates/snapshot-controller.yaml 2021-06-24 15:04:17.999018733 +0200 -@@ -57,7 +57,7 @@ - {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} - {{- end }} - args: -- - --v=5 -+ - --v=2 - - --leader-election=false - {{- if .Values.imagePullSecrets }} - imagePullSecrets: -diff -rtubN charts/aws-ebs-csi-driver/values.yaml charts/aws-ebs-csi-driver.zdt/values.yaml ---- charts/aws-ebs-csi-driver/values.yaml 2021-06-17 22:22:22.000000000 +0200 -+++ charts/aws-ebs-csi-driver.zdt/values.yaml 2021-06-22 17:08:52.501232371 +0200 -@@ -56,7 +56,7 @@ - replicaCount: 2 - resources: {} - tolerations: [] --topologySpreadConstraints: [] -+topolk8sTagClusterIdogySpreadConstraints: [] - - controller: - affinity: {} diff --git a/charts/kubezero-aws-ebs-csi-driver/templates/snapshot-class.yaml b/charts/kubezero-aws-ebs-csi-driver/templates/snapshot-class.yaml deleted file mode 100644 index e0858382..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/templates/snapshot-class.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if index .Values "aws-ebs-csi-driver" "enableVolumeSnapshot" }} -apiVersion: snapshot.storage.k8s.io/v1beta1 -kind: VolumeSnapshotClass -metadata: - name: csi-aws-vsc - annotations: - snapshot.storage.kubernetes.io/is-default-class: "true" - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -driver: ebs.csi.aws.com -deletionPolicy: Delete -{{- end }} diff --git a/charts/kubezero-aws-ebs-csi-driver/update.sh b/charts/kubezero-aws-ebs-csi-driver/update.sh deleted file mode 100755 index 3908a3d8..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/update.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -VERSION=1.2.4 - -rm -rf charts/aws-ebs-csi-driver -curl -L -s -o - https://github.com/kubernetes-sigs/aws-ebs-csi-driver/releases/download/helm-chart-aws-ebs-csi-driver-${VERSION}/aws-ebs-csi-driver-${VERSION}.tgz | tar xfz - -C charts - -patch -i zdt.patch -p0 --no-backup-if-mismatch - -# Remove duplicated CRDs -rm -f charts/aws-ebs-csi-driver/templates/crds.yml diff --git a/charts/kubezero-aws-ebs-csi-driver/values.yaml b/charts/kubezero-aws-ebs-csi-driver/values.yaml deleted file mode 100644 index 44489efc..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/values.yaml +++ /dev/null @@ -1,61 +0,0 @@ -aws-ebs-csi-driver: - enableVolumeSnapshot: true - - controller: - replicaCount: 1 - logLevel: 1 - - nodeSelector: - node-role.kubernetes.io/master: "" - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - - # k8sTagClusterId: - - #env: - # ebsPlugin: - #- name: AWS_ROLE_ARN - # value: "" - #- name: AWS_WEB_IDENTITY_TOKEN_FILE - # value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" - #- name: AWS_STS_REGIONAL_ENDPOINTS - # value: regional - resources: - requests: - cpu: 10m - memory: 24Mi - limits: - # cpu: 50m - memory: 40Mi - - node: - tolerations: - - key: kubezero-workergroup - effect: NoSchedule - operator: Exists - - storageClasses: - - name: ebs-sc-gp2-xfs - volumeBindingMode: WaitForFirstConsumer - allowVolumeExpansion: true - parameters: - csi.storage.k8s.io/fstype: xfs - type: gp2 - encrypted: "true" - - name: ebs-sc-gp3-xfs - annotations: - storageclass.kubernetes.io/is-default-class: "true" - volumeBindingMode: WaitForFirstConsumer - allowVolumeExpansion: true - parameters: - csi.storage.k8s.io/fstype: xfs - type: gp3 - encrypted: "true" - - # This will probably move to snapshot later on - nodeSelector: - node-role.kubernetes.io/master: "" - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule diff --git a/charts/kubezero-aws-ebs-csi-driver/zdt.patch b/charts/kubezero-aws-ebs-csi-driver/zdt.patch deleted file mode 100644 index ecddbcc4..00000000 --- a/charts/kubezero-aws-ebs-csi-driver/zdt.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -rtubN charts/aws-ebs-csi-driver/templates/controller.yaml charts/aws-ebs-csi-driver.zdt/templates/controller.yaml ---- charts/aws-ebs-csi-driver/templates/controller.yaml 2021-06-17 22:22:22.000000000 +0200 -+++ charts/aws-ebs-csi-driver.zdt/templates/controller.yaml 2021-06-24 16:31:37.042386198 +0200 -@@ -116,6 +116,9 @@ - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ -+ - name: aws-token -+ mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" -+ readOnly: true - ports: - - name: healthz - containerPort: 9808 -@@ -144,7 +147,7 @@ - image: {{ printf "%s:%s" .Values.sidecars.provisionerImage.repository .Values.sidecars.provisionerImage.tag }} - args: - - --csi-address=$(ADDRESS) -- - --v=5 -+ - --v={{ .Values.controller.logLevel }} - - --feature-gates=Topology=true - {{- if or .Values.controller.extraCreateMetadata .Values.extraCreateMetadata }} - - --extra-create-metadata -@@ -171,7 +174,7 @@ - image: {{ printf "%s:%s" .Values.sidecars.attacherImage.repository .Values.sidecars.attacherImage.tag }} - args: - - --csi-address=$(ADDRESS) -- - --v=5 -+ - --v={{ .Values.controller.logLevel }} - - --leader-election=true - env: - - name: ADDRESS -@@ -215,7 +218,7 @@ - imagePullPolicy: Always - args: - - --csi-address=$(ADDRESS) -- - --v=5 -+ - --v={{ .Values.controller.logLevel }} - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock -@@ -252,3 +255,10 @@ - volumes: - - name: socket-dir - emptyDir: {} -+ - name: aws-token -+ projected: -+ sources: -+ - serviceAccountToken: -+ path: token -+ expirationSeconds: 86400 -+ audience: "sts.amazonaws.com" -diff -rtubN charts/aws-ebs-csi-driver/templates/node.yaml charts/aws-ebs-csi-driver.zdt/templates/node.yaml ---- charts/aws-ebs-csi-driver/templates/node.yaml 2021-06-17 22:22:22.000000000 +0200 -+++ charts/aws-ebs-csi-driver.zdt/templates/node.yaml 2021-06-24 15:03:44.532351851 +0200 -@@ -107,7 +107,7 @@ - args: - - --csi-address=$(ADDRESS) - - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) -- - --v=5 -+ - --v={{ .Values.node.logLevel }} - env: - - name: ADDRESS - value: /csi/csi.sock -diff -rtubN charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml charts/aws-ebs-csi-driver.zdt/templates/snapshot-controller.yaml ---- charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml 2021-06-17 22:22:22.000000000 +0200 -+++ charts/aws-ebs-csi-driver.zdt/templates/snapshot-controller.yaml 2021-06-24 15:04:17.999018733 +0200 -@@ -57,7 +57,7 @@ - {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} - {{- end }} - args: -- - --v=5 -+ - --v=2 - - --leader-election=false - {{- if .Values.imagePullSecrets }} - imagePullSecrets: diff --git a/charts/kubezero-aws-efs-csi-driver/.gitignore b/charts/kubezero-aws-efs-csi-driver/.gitignore deleted file mode 100644 index 5664e303..00000000 --- a/charts/kubezero-aws-efs-csi-driver/.gitignore +++ /dev/null @@ -1 +0,0 @@ -git diff --git a/charts/kubezero-aws-efs-csi-driver/.helmignore b/charts/kubezero-aws-efs-csi-driver/.helmignore deleted file mode 100644 index 58b068b4..00000000 --- a/charts/kubezero-aws-efs-csi-driver/.helmignore +++ /dev/null @@ -1,24 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ - -git diff --git a/charts/kubezero-aws-efs-csi-driver/Chart.yaml b/charts/kubezero-aws-efs-csi-driver/Chart.yaml deleted file mode 100644 index 930566bc..00000000 --- a/charts/kubezero-aws-efs-csi-driver/Chart.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v2 -name: kubezero-aws-efs-csi-driver -description: KubeZero Umbrella Chart for aws-efs-csi-driver -version: 0.4.2 -appVersion: 1.3.2 -kubeVersion: ">=1.18.0-0" -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -sources: - - https://github.com/Zero-Down-Time/kubezero - - https://github.com/kubernetes-sigs/aws-efs-csi-driver -keywords: - - kubezero - - aws - - efs - - csi -maintainers: - - name: Quarky9 -dependencies: - - name: kubezero-lib - version: ">= 0.1.3" - repository: https://cdn.zero-downtime.net/charts/ - - name: aws-efs-csi-driver - version: 2.1.3 - # repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver/ diff --git a/charts/kubezero-aws-efs-csi-driver/README.md b/charts/kubezero-aws-efs-csi-driver/README.md deleted file mode 100644 index 8d9e654a..00000000 --- a/charts/kubezero-aws-efs-csi-driver/README.md +++ /dev/null @@ -1,55 +0,0 @@ -# kubezero-aws-efs-csi-driver - -![Version: 0.4.2](https://img.shields.io/badge/Version-0.4.2-informational?style=flat-square) ![AppVersion: 1.3.2](https://img.shields.io/badge/AppVersion-1.3.2-informational?style=flat-square) - -KubeZero Umbrella Chart for aws-efs-csi-driver - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Quarky9 | | | - -## Source Code - -* -* - -## Requirements - -Kubernetes: `>=1.18.0-0` - -| Repository | Name | Version | -|------------|------|---------| -| | aws-efs-csi-driver | 2.1.3 | -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.3 | - -## Storage Class -Optionally creates the *efs-cs* storage class. -Could also be made the default storage class if requested. - -## Multiple PVs & PVCs backed by same EFS file system -Details also see: [Reserve PV](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#reserving-a-persistentvolume) - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| aws-efs-csi-driver.controller.create | bool | `true` | | -| aws-efs-csi-driver.controller.logLevel | int | `1` | | -| aws-efs-csi-driver.controller.nodeSelector."node-role.kubernetes.io/master" | 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.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"` | | -| aws-efs-csi-driver.node.logLevel | int | `1` | | -| aws-efs-csi-driver.node.resources.limits.memory | string | `"128Mi"` | | -| aws-efs-csi-driver.node.resources.requests.cpu | string | `"20m"` | | -| aws-efs-csi-driver.node.resources.requests.memory | string | `"64Mi"` | | -| aws-efs-csi-driver.node.tolerations[0].effect | string | `"NoSchedule"` | | -| aws-efs-csi-driver.node.tolerations[0].key | string | `"kubezero-workergroup"` | | -| aws-efs-csi-driver.node.tolerations[0].operator | string | `"Exists"` | | -| aws-efs-csi-driver.replicaCount | int | `1` | | -| aws-efs-csi-driver.storageClasses[0].name | string | `"efs-sc"` | | diff --git a/charts/kubezero-aws-efs-csi-driver/README.md.gotmpl b/charts/kubezero-aws-efs-csi-driver/README.md.gotmpl deleted file mode 100644 index 45206edc..00000000 --- a/charts/kubezero-aws-efs-csi-driver/README.md.gotmpl +++ /dev/null @@ -1,23 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.deprecationWarning" . }} - -{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} - -{{ template "chart.description" . }} - -{{ template "chart.homepageLine" . }} - -{{ template "chart.maintainersSection" . }} - -{{ template "chart.sourcesSection" . }} - -{{ template "chart.requirementsSection" . }} - -## Storage Class -Optionally creates the *efs-cs* storage class. -Could also be made the default storage class if requested. - -## Multiple PVs & PVCs backed by same EFS file system -Details also see: [Reserve PV](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#reserving-a-persistentvolume) - -{{ template "chart.valuesSection" . }} diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/.helmignore b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/.helmignore deleted file mode 100644 index 50af0317..00000000 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/.helmignore +++ /dev/null @@ -1,22 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/CHANGELOG.md b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/CHANGELOG.md deleted file mode 100644 index 0e499d85..00000000 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/CHANGELOG.md +++ /dev/null @@ -1,112 +0,0 @@ -# Helm chart - -# v2.1.3 -* Bump app/driver version to `v1.3.2` - -# v2.1.2 -* Add extra-create-metadata - -# v2.1.1 -* Update app/driver version to `v1.3.1` - -# v2.1.0 - -## New features -* Update app/driver version to `v1.3.0` - -## Bug fixes -* Put comments back in place inside the values file ([#475](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/475), [@pierluigilenoci](https://github.com/pierluigilenoci)) - -# v2.0.1 - -## Bug fixes -* Helm chart: fix reclaimPolicy and volumeBindingMode ([#464](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/464), [@devinsmith911](https://github.com/devinsmith911)) - - -# v2.0.0 - -## Breaking changes - -Multiple changes in values file at `sidecars`, `controller` and `node` - ---- -```yaml -sidecars: - xxxxxxxxx: - repository: - tag: -``` - -Moving to - -```yaml -sidecars: - xxxxxxxxx: - image: - repository: - tag: -``` - ---- -```yaml -podAnnotations: -resources: -nodeSelector: -tolerations: -affinity: -``` - -Moving to - -```yaml -controller: - podAnnotations: - resources: - nodeSelector: - tolerations: - affinity: -``` - ---- -```yaml -hostAliases: -dnsPolicy: -dnsConfig: -``` - -Moving to - -```yaml -node: - hostAliases: - dnsPolicy: - dnsConfig: -``` - ---- -```yaml -serviceAccount: - controller: -``` - -Moving to - -```yaml -controller: - serviceAccount: -``` - -## New features - -* Chart API `v2` (requires Helm 3) -* Set `resources` and `imagePullPolicy` fields independently for containers -* Set `logLevel`, `affinity`, `nodeSelector`, `podAnnotations` and `tolerations` fields independently -for Controller deployment and Node daemonset -* Set `reclaimPolicy` and `volumeBindingMode` fields in storage class - -## Fixes - -* Fixing Controller deployment using `podAnnotations` and `tolerations` values from Node daemonset -* Let the user define the whole `tolerations` array, default to `- operator: Exists` -* Default `logLevel` lowered from `5` to `2` -* Default `imagePullPolicy` everywhere set to `IfNotPresent` diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/Chart.yaml b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/Chart.yaml deleted file mode 100644 index 9c0b3b2f..00000000 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/Chart.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v2 -appVersion: 1.3.2 -description: A Helm chart for AWS EFS CSI Driver -home: https://github.com/kubernetes-sigs/aws-efs-csi-driver -keywords: -- aws -- efs -- csi -kubeVersion: '>=1.17.0-0' -maintainers: -- name: leakingtapan - url: https://github.com/leakingtapan -- name: krmichel - url: https://github.com/krmichel -name: aws-efs-csi-driver -sources: -- https://github.com/kubernetes-sigs/aws-efs-csi-driver -version: 2.1.3 diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/NOTES.txt b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/NOTES.txt deleted file mode 100644 index 66f4d12d..00000000 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -To verify that aws-efs-csi-driver has started, run: - - kubectl get pod -n {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "aws-efs-csi-driver.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/_helpers.tpl b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/_helpers.tpl deleted file mode 100644 index 3a74fef8..00000000 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/_helpers.tpl +++ /dev/null @@ -1,67 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "aws-efs-csi-driver.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "aws-efs-csi-driver.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "aws-efs-csi-driver.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "aws-efs-csi-driver.labels" -}} -app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }} -helm.sh/chart: {{ include "aws-efs-csi-driver.chart" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "aws-efs-csi-driver.serviceAccountName" -}} -{{- if .Values.controller.create -}} - {{ default (include "aws-efs-csi-driver.fullname" .) .Values.controller.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.controller.serviceAccount.name }} -{{- end -}} -{{- end -}} - -{{/* -Create a string out of the map for controller tags flag -*/}} -{{- define "aws-efs-csi-driver.tags" -}} -{{- $tags := list -}} -{{ range $key, $val := . }} -{{- $tags = print $key ":" $val | append $tags -}} -{{- end -}} -{{- join " " $tags -}} -{{- end -}} diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-deployment.yaml deleted file mode 100644 index c1beb69b..00000000 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-deployment.yaml +++ /dev/null @@ -1,127 +0,0 @@ -{{- if .Values.controller.create }} -# Controller Service -kind: Deployment -apiVersion: apps/v1 -metadata: - name: efs-csi-controller - labels: - app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app: efs-csi-controller - app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app: efs-csi-controller - app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - {{- with .Values.controller.podAnnotations }} - annotations: {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- if .Values.imagePullSecrets }} - imagePullSecrets: - {{- range .Values.imagePullSecrets }} - - name: {{ . }} - {{- end }} - {{- end }} - nodeSelector: - kubernetes.io/os: linux - {{- with .Values.controller.nodeSelector }} - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "aws-efs-csi-driver.serviceAccountName" . }} - priorityClassName: system-cluster-critical - {{- with .Values.controller.tolerations }} - tolerations: {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: efs-plugin - securityContext: - privileged: true - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - args: - - --endpoint=$(CSI_ENDPOINT) - - --logtostderr - {{- if .Values.controller.tags }} - - --tags={{ include "aws-efs-csi-driver.tags" .Values.controller.tags }} - {{- end }} - - --v={{ .Values.controller.logLevel }} - - --delete-access-point-root-dir={{ hasKey .Values.controller "deleteAccessPointRootDir" | ternary .Values.controller.deleteAccessPointRootDir false }} - env: - - name: CSI_ENDPOINT - value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock - {{- if .Values.controller.extraEnv }} -{{ toYaml .Values.controller.extraEnv | indent 12 }} - {{- end }} - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - - name: aws-token - mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" - ports: - - name: healthz - containerPort: 9909 - protocol: TCP - livenessProbe: - httpGet: - path: /healthz - port: healthz - initialDelaySeconds: 10 - timeoutSeconds: 3 - periodSeconds: 10 - failureThreshold: 5 - {{- with .Values.controller.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - - name: csi-provisioner - image: {{ printf "%s:%s" .Values.sidecars.csiProvisioner.image.repository .Values.sidecars.csiProvisioner.image.tag }} - imagePullPolicy: {{ .Values.sidecars.csiProvisioner.image.pullPolicy }} - args: - - --csi-address=$(ADDRESS) - - --v={{ .Values.controller.logLevel }} - - --feature-gates=Topology=true - {{- if .Values.controller.extraCreateMetadata }} - - --extra-create-metadata - {{- end }} - - --leader-election - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - {{- with .Values.sidecars.csiProvisioner.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - - name: liveness-probe - image: {{ printf "%s:%s" .Values.sidecars.livenessProbe.image.repository .Values.sidecars.livenessProbe.image.tag }} - imagePullPolicy: {{ .Values.sidecars.livenessProbe.image.pullPolicy }} - args: - - --csi-address=/csi/csi.sock - - --health-port=9909 - volumeMounts: - - name: socket-dir - mountPath: /csi - {{- with .Values.sidecars.livenessProbe.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - volumes: - - name: socket-dir - emptyDir: {} - - name: aws-token - projected: - sources: - - serviceAccountToken: - path: token - expirationSeconds: 86400 - audience: "sts.amazonaws.com" - {{- with .Values.controller.affinity }} - affinity: {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml deleted file mode 100644 index 63d45b64..00000000 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml +++ /dev/null @@ -1,62 +0,0 @@ -{{- if .Values.controller.serviceAccount.create }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "aws-efs-csi-driver.serviceAccountName" . }} - labels: - app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }} - {{- with .Values.controller.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} ---- - -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: efs-csi-external-provisioner-role - labels: - app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }} -rules: - - apiGroups: [""] - resources: ["persistentvolumes"] - verbs: ["get", "list", "watch", "create", "delete"] - - apiGroups: [""] - resources: ["persistentvolumeclaims"] - verbs: ["get", "list", "watch", "update"] - - apiGroups: ["storage.k8s.io"] - resources: ["storageclasses"] - verbs: ["get", "list", "watch"] - - apiGroups: [""] - resources: ["events"] - verbs: ["list", "watch", "create"] - - apiGroups: ["storage.k8s.io"] - resources: ["csinodes"] - verbs: ["get", "list", "watch"] - - apiGroups: [""] - resources: ["nodes"] - verbs: ["get", "list", "watch"] - - apiGroups: ["coordination.k8s.io"] - resources: ["leases"] - verbs: ["get", "watch", "list", "delete", "update", "create"] - - apiGroups: [ "" ] - resources: [ "secrets" ] - verbs: [ "get", "watch", "list" ] - ---- - -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: efs-csi-provisioner-binding - labels: - app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }} -subjects: - - kind: ServiceAccount - name: {{ include "aws-efs-csi-driver.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} -roleRef: - kind: ClusterRole - name: efs-csi-external-provisioner-role - apiGroup: rbac.authorization.k8s.io diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/csidriver.yaml b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/csidriver.yaml deleted file mode 100644 index e6b4d419..00000000 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/csidriver.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: {{ ternary "storage.k8s.io/v1" "storage.k8s.io/v1beta1" (semverCompare ">=1.18.0-0" .Capabilities.KubeVersion.Version) }} -kind: CSIDriver -metadata: - name: efs.csi.aws.com - annotations: - "helm.sh/hook": pre-install, pre-upgrade - "helm.sh/hook-delete-policy": before-hook-creation - "helm.sh/resource-policy": keep -spec: - attachRequired: false diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/node-daemonset.yaml b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/node-daemonset.yaml deleted file mode 100644 index df10a2d6..00000000 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/node-daemonset.yaml +++ /dev/null @@ -1,157 +0,0 @@ -# Node Service -kind: DaemonSet -apiVersion: apps/v1 -metadata: - name: efs-csi-node - labels: - app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }} -spec: - selector: - matchLabels: - app: efs-csi-node - app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app: efs-csi-node - app.kubernetes.io/name: {{ include "aws-efs-csi-driver.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - {{- if .Values.node.podAnnotations }} - annotations: {{ toYaml .Values.node.podAnnotations | nindent 8 }} - {{- end }} - spec: - {{- with .Values.node.hostAliases }} - hostAliases: - {{- range $k, $v := . }} - - ip: {{ $v.ip }} - hostnames: - - {{ $k }}.efs.{{ $v.region }}.amazonaws.com - {{- end }} - {{- end }} - {{- if .Values.imagePullSecrets }} - imagePullSecrets: - {{- range .Values.imagePullSecrets }} - - name: {{ . }} - {{- end }} - {{- end }} - nodeSelector: - beta.kubernetes.io/os: linux - {{- with .Values.node.nodeSelector }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.node.affinity }} - affinity: - {{- . | toYaml | nindent 8 }} - {{- end }} - hostNetwork: true - dnsPolicy: {{ .Values.node.dnsPolicy }} - {{- with .Values.node.dnsConfig }} - dnsConfig: {{- toYaml . | nindent 8 }} - {{- end }} - priorityClassName: system-node-critical - {{- with .Values.node.tolerations }} - tolerations: {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: efs-plugin - securityContext: - privileged: true - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - args: - - --endpoint=$(CSI_ENDPOINT) - - --logtostderr - - --v={{ .Values.node.logLevel }} - env: - - name: CSI_ENDPOINT - value: unix:/csi/csi.sock - volumeMounts: - - name: kubelet-dir - mountPath: /var/lib/kubelet - mountPropagation: "Bidirectional" - - name: plugin-dir - mountPath: /csi - - name: efs-state-dir - mountPath: /var/run/efs - - name: efs-utils-config - mountPath: /var/amazon/efs - - name: efs-utils-config-legacy - mountPath: /etc/amazon/efs-legacy - ports: - - name: healthz - containerPort: 9809 - protocol: TCP - livenessProbe: - httpGet: - path: /healthz - port: healthz - initialDelaySeconds: 10 - timeoutSeconds: 3 - periodSeconds: 2 - failureThreshold: 5 - {{- with .Values.node.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - - name: csi-driver-registrar - image: {{ printf "%s:%s" .Values.sidecars.nodeDriverRegistrar.image.repository .Values.sidecars.nodeDriverRegistrar.image.tag }} - imagePullPolicy: {{ .Values.sidecars.nodeDriverRegistrar.image.pullPolicy }} - args: - - --csi-address=$(ADDRESS) - - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) - - --v={{ .Values.node.logLevel }} - env: - - name: ADDRESS - value: /csi/csi.sock - - name: DRIVER_REG_SOCK_PATH - value: /var/lib/kubelet/plugins/efs.csi.aws.com/csi.sock - - name: KUBE_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - volumeMounts: - - name: plugin-dir - mountPath: /csi - - name: registration-dir - mountPath: /registration - {{- with .Values.sidecars.nodeDriverRegistrar.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - - name: liveness-probe - image: {{ printf "%s:%s" .Values.sidecars.livenessProbe.image.repository .Values.sidecars.livenessProbe.image.tag }} - imagePullPolicy: {{ .Values.sidecars.livenessProbe.image.pullPolicy }} - args: - - --csi-address=/csi/csi.sock - - --health-port=9809 - - --v={{ .Values.node.logLevel }} - volumeMounts: - - name: plugin-dir - mountPath: /csi - {{- with .Values.sidecars.livenessProbe.resources }} - resources: {{ toYaml . | nindent 12 }} - {{- end }} - volumes: - - name: kubelet-dir - hostPath: - path: /var/lib/kubelet - type: Directory - - name: plugin-dir - hostPath: - path: /var/lib/kubelet/plugins/efs.csi.aws.com/ - type: DirectoryOrCreate - - name: registration-dir - hostPath: - path: /var/lib/kubelet/plugins_registry/ - type: Directory - - name: efs-state-dir - hostPath: - path: /var/run/efs - type: DirectoryOrCreate - - name: efs-utils-config - hostPath: - path: /var/amazon/efs - type: DirectoryOrCreate - - name: efs-utils-config-legacy - hostPath: - path: /etc/amazon/efs - type: DirectoryOrCreate diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/storageclass.yaml b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/storageclass.yaml deleted file mode 100644 index 8ce1ec87..00000000 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/storageclass.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{- range .Values.storageClasses }} -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: {{ .name }} - {{- with .annotations }} - annotations: - {{ toYaml . | indent 4 }} - {{- end }} -provisioner: efs.csi.aws.com -{{- with .mountOptions }} -mountOptions: -{{ toYaml . }} -{{- end }} -{{- with .parameters }} -parameters: -{{ toYaml . | indent 2 }} -{{- end }} -{{- with .reclaimPolicy }} -reclaimPolicy: {{ . }} -{{- end }} -{{- with .volumeBindingMode }} -volumeBindingMode: {{ . }} -{{- end }} ---- -{{- end }} \ No newline at end of file diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/values.yaml b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/values.yaml deleted file mode 100644 index 6afb5d64..00000000 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/values.yaml +++ /dev/null @@ -1,125 +0,0 @@ -# Default values for aws-efs-csi-driver. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -nameOverride: "" -fullnameOverride: "" - -replicaCount: 2 - -image: - repository: amazon/aws-efs-csi-driver - tag: "v1.3.2" - pullPolicy: IfNotPresent - -sidecars: - livenessProbe: - image: - repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe - tag: v2.2.0-eks-1-18-2 - pullPolicy: IfNotPresent - resources: {} - nodeDriverRegistrar: - image: - repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar - tag: v2.1.0-eks-1-18-2 - pullPolicy: IfNotPresent - resources: {} - csiProvisioner: - image: - repository: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner - tag: v2.1.1-eks-1-18-2 - pullPolicy: IfNotPresent - resources: {} - -imagePullSecrets: [] - -## Controller deployment variables - -controller: - # Specifies whether a deployment should be created - create: true - # Number for the log level verbosity - logLevel: 2 - # If set, add pv/pvc metadata to plugin create requests as parameters. - extraCreateMetadata: true - # Add additional tags to access points - tags: {} - # environment: prod - # region: us-east-1 - # Enable if you want the controller to also delete the - # path on efs when deleteing an access point - deleteAccessPointRootDir: false - podAnnotations: {} - resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - nodeSelector: {} - tolerations: [] - affinity: {} - # Specifies whether a service account should be created - serviceAccount: - create: true - name: efs-csi-controller-sa - annotations: {} - ## Enable if EKS IAM for SA is used - # eks.amazonaws.com/role-arn: arn:aws:iam::111122223333:role/efs-csi-role - -## Node daemonset variables - -node: - # Number for the log level verbosity - logLevel: 2 - hostAliases: {} - # For cross VPC EFS, you need to poison or overwrite the DNS for the efs volume as per - # https://docs.aws.amazon.com/efs/latest/ug/efs-different-vpc.html#wt6-efs-utils-step3 - # implementing the suggested solution found here: - # https://github.com/kubernetes-sigs/aws-efs-csi-driver/issues/240#issuecomment-676849346 - # EFS Vol ID, IP, Region - # "fs-01234567": - # ip: 10.10.2.2 - # region: us-east-2 - dnsPolicy: ClusterFirst - dnsConfig: {} - # Example config which uses the AWS nameservers - # dnsPolicy: "None" - # dnsConfig: - # nameservers: - # - 169.254.169.253 - podAnnotations: {} - resources: {} - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - nodeSelector: {} - tolerations: - - operator: Exists - -storageClasses: [] -# Add StorageClass resources like: -# - name: efs-sc -# annotations: -# # Use that annotation if you want this to your default storageclass -# storageclass.kubernetes.io/is-default-class: "true" -# mountOptions: -# - tls -# parameters: -# provisioningMode: efs-ap -# fileSystemId: fs-1122aabb -# directoryPerms: "700" -# gidRangeStart: "1000" -# gidRangeEnd: "2000" -# basePath: "/dynamic_provisioning" -# reclaimPolicy: Delete -# volumeBindingMode: Immediate diff --git a/charts/kubezero-aws-efs-csi-driver/update.sh b/charts/kubezero-aws-efs-csi-driver/update.sh deleted file mode 100755 index ea3e8fb3..00000000 --- a/charts/kubezero-aws-efs-csi-driver/update.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -VERSION=2.1.3 - -rm -rf charts/aws-efs-csi-driver -curl -L -s -o - https://github.com/kubernetes-sigs/aws-efs-csi-driver/releases/download/helm-chart-aws-efs-csi-driver-${VERSION}/aws-efs-csi-driver-${VERSION}.tgz | tar xfz - -C charts - -patch -i zdt.patch -p0 --no-backup-if-mismatch diff --git a/charts/kubezero-aws-efs-csi-driver/values.yaml b/charts/kubezero-aws-efs-csi-driver/values.yaml deleted file mode 100644 index 8a33534b..00000000 --- a/charts/kubezero-aws-efs-csi-driver/values.yaml +++ /dev/null @@ -1,57 +0,0 @@ -aws-efs-csi-driver: - replicaCount: 1 - - controller: - create: true - logLevel: 1 - - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - nodeSelector: - node-role.kubernetes.io/master: "" - - #extraEnv: - #- name: AWS_ROLE_ARN - # value: "" - #- name: AWS_WEB_IDENTITY_TOKEN_FILE - # value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" - #- name: AWS_STS_REGIONAL_ENDPOINTS - # value: regional - - node: - logLevel: 1 - - resources: - requests: - cpu: 20m - memory: 64Mi - limits: - memory: 128Mi - - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: node.kubernetes.io/csi.efs.fs - operator: Exists - tolerations: - - key: kubezero-workergroup - effect: NoSchedule - operator: Exists - - storageClasses: - - name: efs-sc - -#PersistentVolumes: -# - name: example-pv -# mountOptions: -# - tls -# volumeHandle: ":/path" -# claimRef: -# name: foo-pvc -# namespace: foo -# -# - name: example-pv2 -# volumeHandle: ":/path2" diff --git a/charts/kubezero-aws-efs-csi-driver/zdt.patch b/charts/kubezero-aws-efs-csi-driver/zdt.patch deleted file mode 100644 index d5978c83..00000000 --- a/charts/kubezero-aws-efs-csi-driver/zdt.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -tubNr charts/aws-efs-csi-driver/templates/controller-deployment.yaml charts/aws-efs-csi-driver.zdt/templates/controller-deployment.yaml ---- charts/aws-efs-csi-driver/templates/controller-deployment.yaml 2021-06-25 22:43:06.000000000 +0200 -+++ charts/aws-efs-csi-driver.zdt/templates/controller-deployment.yaml 2021-07-15 00:37:28.960305011 +0200 -@@ -23,7 +23,6 @@ - annotations: {{- toYaml . | nindent 8 }} - {{- end }} - spec: -- hostNetwork: true - {{- if .Values.imagePullSecrets }} - imagePullSecrets: - {{- range .Values.imagePullSecrets }} -@@ -57,9 +56,14 @@ - env: - - name: CSI_ENDPOINT - value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock -+ {{- if .Values.controller.extraEnv }} -+{{ toYaml .Values.controller.extraEnv | indent 12 }} -+ {{- end }} - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ -+ - name: aws-token -+ mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" - ports: - - name: healthz - containerPort: 9909 -@@ -110,6 +114,13 @@ - volumes: - - name: socket-dir - emptyDir: {} -+ - name: aws-token -+ projected: -+ sources: -+ - serviceAccountToken: -+ path: token -+ expirationSeconds: 86400 -+ audience: "sts.amazonaws.com" - {{- with .Values.controller.affinity }} - affinity: {{- toYaml . | nindent 8 }} - {{- end }} -diff -tubNr charts/aws-efs-csi-driver/templates/node-daemonset.yaml charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml ---- charts/aws-efs-csi-driver/templates/node-daemonset.yaml 2021-06-25 22:43:06.000000000 +0200 -+++ charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml 2021-07-15 00:14:58.680295564 +0200 -@@ -40,15 +40,10 @@ - {{- with .Values.node.nodeSelector }} - {{- toYaml . | nindent 8 }} - {{- end }} -+ {{- with .Values.node.affinity }} - affinity: -- nodeAffinity: -- requiredDuringSchedulingIgnoredDuringExecution: -- nodeSelectorTerms: -- - matchExpressions: -- - key: eks.amazonaws.com/compute-type -- operator: NotIn -- values: -- - fargate -+ {{- . | toYaml | nindent 8 }} -+ {{- end }} - hostNetwork: true - dnsPolicy: {{ .Values.node.dnsPolicy }} - {{- with .Values.node.dnsConfig }} diff --git a/charts/kubezero-kiam/.helmignore b/charts/kubezero-kiam/.helmignore deleted file mode 100644 index 0e8a0eb3..00000000 --- a/charts/kubezero-kiam/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/kubezero-kiam/Chart.yaml b/charts/kubezero-kiam/Chart.yaml deleted file mode 100644 index 927fd6d4..00000000 --- a/charts/kubezero-kiam/Chart.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: v2 -name: kubezero-kiam -description: KubeZero Umbrella Chart for Kiam -type: application -version: 0.3.5 -appVersion: "4.0" -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero - - kiam -maintainers: - - name: Quarky9 -dependencies: - - name: kubezero-lib - version: ">= 0.1.3" - repository: https://cdn.zero-downtime.net/charts/ - - name: kiam - version: 6.0.0 - repository: https://uswitch.github.io/kiam-helm-charts/charts/ - condition: kiam.enabled -kubeVersion: ">= 1.18.0" diff --git a/charts/kubezero-kiam/README.md b/charts/kubezero-kiam/README.md deleted file mode 100644 index 0bfa4317..00000000 --- a/charts/kubezero-kiam/README.md +++ /dev/null @@ -1,104 +0,0 @@ -# kubezero-kiam - -![Version: 0.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0](https://img.shields.io/badge/AppVersion-4.0-informational?style=flat-square) - -KubeZero Umbrella Chart for Kiam - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Quarky9 | | | - -## Requirements - -Kubernetes: `>= 1.18.0` - -| Repository | Name | Version | -|------------|------|---------| -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.3 | -| https://uswitch.github.io/kiam-helm-charts/charts/ | kiam | 6.0.0 | - -## KubeZero default configuration -We run agents on the controllers as well, so we force eg. ebs csi controllers and others to assume roles etc. -This means we need to run kiam containers on the controllers using `hostnetwork: true`. -Therefore we also change the default port from 443 to 6444 to not collide with the potential api-server port on the controllers. -Make sure any firewall rules between controllers and workers are adjusted accordingly. - -## Kiam Certificates -The required certificates for Kiam server and agents are provided by a local cert-manager, which is configured to have a cluster local self-signing CA as part of the KubeZero platform. -[Kiam TLS Config](https://github.com/uswitch/kiam/blob/master/docs/TLS.md#cert-manager) -[KubeZero cert-manager](../kubezero-cert-manager/README.md) - -## Metadata restrictions -Some services require access to some basic AWS information. One example is the `aws-ebs-csi` controller. -By default all access to the meta-data service is blocked, expect for: - -- `/latest/meta-data/instance-id` -- `/latest/dynamic/instance-identity/document` - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| annotateKubeSystemNameSpace | bool | `false` | | -| kiam.agent.allowRouteRegexp | string | `"^/latest/(meta-data/instance-id|dynamic)"` | | -| kiam.agent.gatewayTimeoutCreation | string | `"5s"` | | -| kiam.agent.host.interface | string | `"cali+"` | | -| kiam.agent.host.iptables | bool | `false` | | -| kiam.agent.log.level | string | `"info"` | | -| kiam.agent.priorityClassName | string | `"system-node-critical"` | | -| kiam.agent.prometheus.servicemonitor.enabled | bool | `false` | | -| kiam.agent.prometheus.servicemonitor.interval | string | `"30s"` | | -| kiam.agent.prometheus.servicemonitor.labels.release | string | `"metrics"` | | -| kiam.agent.resources.limits.memory | string | `"64Mi"` | | -| kiam.agent.resources.requests.cpu | string | `"50m"` | | -| kiam.agent.resources.requests.memory | string | `"16Mi"` | | -| kiam.agent.sslCertHostPath | string | `"/etc/ssl/certs"` | | -| kiam.agent.tlsCerts.caFileName | string | `"ca.crt"` | | -| kiam.agent.tlsCerts.certFileName | string | `"tls.crt"` | | -| kiam.agent.tlsCerts.keyFileName | string | `"tls.key"` | | -| kiam.agent.tlsSecret | string | `"kiam-agent-tls"` | | -| kiam.agent.tolerations[0].effect | string | `"NoSchedule"` | | -| kiam.agent.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | -| kiam.agent.tolerations[1].effect | string | `"NoSchedule"` | | -| kiam.agent.tolerations[1].key | string | `"kubezero-workergroup"` | | -| kiam.agent.tolerations[1].operator | string | `"Exists"` | | -| kiam.agent.updateStrategy | string | `"RollingUpdate"` | | -| kiam.enabled | bool | `true` | | -| kiam.server.assumeRoleArn | string | `""` | kiam server IAM role to assume, required as we run the agents next to the servers normally, eg. arn:aws:iam::123456789012:role/kiam-server-role | -| kiam.server.deployment.enabled | bool | `true` | | -| kiam.server.deployment.replicas | int | `1` | | -| kiam.server.log.level | string | `"info"` | | -| kiam.server.nodeSelector."node-role.kubernetes.io/master" | string | `""` | | -| kiam.server.priorityClassName | string | `"system-cluster-critical"` | | -| kiam.server.prometheus.servicemonitor.enabled | bool | `false` | | -| kiam.server.prometheus.servicemonitor.interval | string | `"30s"` | | -| kiam.server.prometheus.servicemonitor.labels.release | string | `"metrics"` | | -| kiam.server.resources.limits.memory | string | `"128Mi"` | | -| kiam.server.resources.requests.cpu | string | `"50m"` | | -| kiam.server.resources.requests.memory | string | `"64Mi"` | | -| kiam.server.service.port | int | `6444` | | -| kiam.server.service.targetPort | int | `6444` | | -| kiam.server.sslCertHostPath | string | `"/etc/ssl/certs"` | | -| kiam.server.tlsCerts.caFileName | string | `"ca.crt"` | | -| kiam.server.tlsCerts.certFileName | string | `"tls.crt"` | | -| kiam.server.tlsCerts.keyFileName | string | `"tls.key"` | | -| kiam.server.tlsSecret | string | `"kiam-server-tls"` | | -| kiam.server.tolerations[0].effect | string | `"NoSchedule"` | | -| kiam.server.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | -| kiam.server.updateStrategy | string | `"RollingUpdate"` | | -| kiam.server.useHostNetwork | bool | `true` | | - -## Debugging -- Verify iptables rules on hosts to be set by the kiam agent: - `iptables -L -t nat -n --line-numbers` - `iptables -t nat -D PREROUTING ` - -## Resources -- https://github.com/uswitch/kiam -- https://www.bluematador.com/blog/iam-access-in-kubernetes-kube2iam-vs-kiam -- [Grafana Dashboard](https://raw.githubusercontent.com/uswitch/kiam/master/docs/dashboard-prom.json) -![Kiam overview](./kiam_architecure.png) diff --git a/charts/kubezero-kiam/README.md.gotmpl b/charts/kubezero-kiam/README.md.gotmpl deleted file mode 100644 index 75423d41..00000000 --- a/charts/kubezero-kiam/README.md.gotmpl +++ /dev/null @@ -1,45 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.deprecationWarning" . }} - -{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} - -{{ template "chart.description" . }} - -{{ template "chart.homepageLine" . }} - -{{ template "chart.maintainersSection" . }} - -{{ template "chart.sourcesSection" . }} - -{{ template "chart.requirementsSection" . }} - -## KubeZero default configuration -We run agents on the controllers as well, so we force eg. ebs csi controllers and others to assume roles etc. -This means we need to run kiam containers on the controllers using `hostnetwork: true`. -Therefore we also change the default port from 443 to 6444 to not collide with the potential api-server port on the controllers. -Make sure any firewall rules between controllers and workers are adjusted accordingly. - -## Kiam Certificates -The required certificates for Kiam server and agents are provided by a local cert-manager, which is configured to have a cluster local self-signing CA as part of the KubeZero platform. -[Kiam TLS Config](https://github.com/uswitch/kiam/blob/master/docs/TLS.md#cert-manager) -[KubeZero cert-manager](../kubezero-cert-manager/README.md) - -## Metadata restrictions -Some services require access to some basic AWS information. One example is the `aws-ebs-csi` controller. -By default all access to the meta-data service is blocked, expect for: - -- `/latest/meta-data/instance-id` -- `/latest/dynamic/instance-identity/document` - -{{ template "chart.valuesSection" . }} - -## Debugging -- Verify iptables rules on hosts to be set by the kiam agent: - `iptables -L -t nat -n --line-numbers` - `iptables -t nat -D PREROUTING ` - -## Resources -- https://github.com/uswitch/kiam -- https://www.bluematador.com/blog/iam-access-in-kubernetes-kube2iam-vs-kiam -- [Grafana Dashboard](https://raw.githubusercontent.com/uswitch/kiam/master/docs/dashboard-prom.json) -![Kiam overview](./kiam_architecure.png) diff --git a/charts/kubezero-kiam/dashboards.yaml b/charts/kubezero-kiam/dashboards.yaml deleted file mode 100644 index ac108821..00000000 --- a/charts/kubezero-kiam/dashboards.yaml +++ /dev/null @@ -1,8 +0,0 @@ -configmap: grafana-dashboards-kiam -condition: '.Values.kiam.server.prometheus.servicemonitor.enabled' -gzip: true -folder: AWS -dashboards: -- name: kiam - url: https://raw.githubusercontent.com/uswitch/kiam/master/docs/dashboard-prom.json - tags: ['AWS'] diff --git a/charts/kubezero-kiam/kiam-grafana-dashboard.json b/charts/kubezero-kiam/kiam-grafana-dashboard.json deleted file mode 100644 index 61dde81e..00000000 --- a/charts/kubezero-kiam/kiam-grafana-dashboard.json +++ /dev/null @@ -1,2933 +0,0 @@ -{ - "__inputs": [], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "5.2.2" - }, - { - "type": "panel", - "id": "graph", - "name": "Graph", - "version": "5.0.0" - }, - { - "type": "panel", - "id": "heatmap", - "name": "Heatmap", - "version": "5.0.0" - }, - { - "type": "panel", - "id": "singlestat", - "name": "Singlestat", - "version": "5.0.0" - } - ], - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "description": "Kiam cache, response & health metrics", - "editable": true, - "gnetId": 3831, - "graphTooltip": 0, - "id": null, - "iteration": 1533922855243, - "links": [], - "panels": [ - { - "collapsed": false, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 17, - "panels": [], - "title": "Stats", - "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { - "h": 4, - "w": 6, - "x": 0, - "y": 1 - }, - "id": 7, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": true, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (pod, handler) (delta(kiam_metadata_success_total[$interval]))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{handler}} - {{pod}} ", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Number of successful responses from a handler", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { - "h": 4, - "w": 6, - "x": 6, - "y": 1 - }, - "id": 37, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": false, - "show": false, - "total": true, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (code, pod) (delta(kiam_metadata_responses_total[$interval]))", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{code}} {{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Responses from mocked out metadata handlers", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { - "h": 4, - "w": 6, - "x": 12, - "y": 1 - }, - "id": 34, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": false, - "show": false, - "total": true, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (pod) (delta(kiam_metadata_empty_role_total[$interval]))", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Number of empty roles returned", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { - "h": 4, - "w": 6, - "x": 18, - "y": 1 - }, - "id": 38, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": false, - "show": false, - "total": true, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (handler, pod) (delta(kiam_metadata_find_role_errors_total[$interval]))", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{handler}} {{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Number of errors finding the role for a pod", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { - "h": 4, - "w": 6, - "x": 0, - "y": 5 - }, - "id": 39, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": false, - "show": false, - "total": true, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (handler, pod) (delta(kiam_metadata_find_role_errors_total[$interval]))", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{handler}} {{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Number of errors finding the role for a pod", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { - "h": 4, - "w": 6, - "x": 6, - "y": 5 - }, - "id": 41, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": false, - "show": false, - "total": true, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (pod) (delta(kiam_sts_issuing_errors_total[$interval]))", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Number of errors issuing credentials", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { - "h": 4, - "w": 6, - "x": 12, - "y": 5 - }, - "id": 45, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": false, - "show": false, - "total": true, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (pod) (kiam_k8s_dropped_pods_total)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Number of dropped pods because of full buffer", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "description": "Number of assume role calls currently executing", - "fill": 1, - "gridPos": { - "h": 4, - "w": 6, - "x": 18, - "y": 5 - }, - "id": 60, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "dimensions": {}, - "expr": "sum by (pod) (kiam_sts_assumerole_current)", - "format": "time_series", - "highResolution": false, - "intervalFactor": 1, - "legendFormat": "{{pod}}", - "metricName": "", - "namespace": "", - "period": "", - "refId": "A", - "region": "default", - "statistics": [ - "Average" - ], - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Number of assume role calls currently executing", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { - "h": 4, - "w": 12, - "x": 0, - "y": 9 - }, - "id": 29, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": true, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (delta(kiam_sts_cache_hit_total[$interval])) by (pod)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Number of cache hits to the metadata cache", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { - "h": 4, - "w": 12, - "x": 12, - "y": 9 - }, - "id": 40, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (delta(kiam_sts_cache_miss_total[$interval])) by (pod)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Number of cache misses to the metadata cache", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "cards": { - "cardPadding": null, - "cardRound": null - }, - "color": { - "cardColor": "#b4ff00", - "colorScale": "linear", - "colorScheme": "interpolateReds", - "exponent": 0.5, - "max": null, - "min": null, - "mode": "spectrum" - }, - "dataFormat": "tsbuckets", - "datasource": "$datasource", - "description": "Bucketed histogram of handler timings. Tagged by handler", - "gridPos": { - "h": 5, - "w": 12, - "x": 0, - "y": 24 - }, - "heatmap": {}, - "highlightCards": true, - "id": 9, - "legend": { - "show": false - }, - "links": [], - "targets": [ - { - "expr": "sum(rate(kiam_metadata_handler_latency_seconds_bucket{handler=\"credentials\"}[$interval])) by (le)", - "format": "heatmap", - "interval": "", - "intervalFactor": 2, - "legendFormat": "{{le}}", - "refId": "A", - "target": "" - } - ], - "title": "Credentials responsetime", - "tooltip": { - "show": true, - "showHistogram": false - }, - "transparent": false, - "type": "heatmap", - "xAxis": { - "show": true - }, - "xBucketNumber": null, - "xBucketSize": null, - "yAxis": { - "decimals": null, - "format": "s", - "logBase": 1, - "max": null, - "min": null, - "show": true, - "splitFactor": null - }, - "yBucketBound": "upper", - "yBucketNumber": null, - "yBucketSize": null - }, - { - "cards": { - "cardPadding": null, - "cardRound": 0 - }, - "color": { - "cardColor": "#bf1b00", - "colorScale": "sqrt", - "colorScheme": "interpolateReds", - "exponent": 0.5, - "max": null, - "min": null, - "mode": "spectrum" - }, - "dataFormat": "tsbuckets", - "datasource": "$datasource", - "description": "Bucketed histogram of handler timings. Tagged by handler", - "gridPos": { - "h": 5, - "w": 12, - "x": 12, - "y": 24 - }, - "heatmap": {}, - "highlightCards": true, - "id": 10, - "legend": { - "show": false - }, - "links": [], - "targets": [ - { - "expr": "sum(rate(kiam_metadata_handler_latency_seconds_bucket{handler=\"roleName\"}[$interval])) by (le)", - "format": "heatmap", - "interval": "", - "intervalFactor": 2, - "legendFormat": "{{le}}", - "refId": "A", - "target": "" - } - ], - "title": "roleHandler responsetime", - "tooltip": { - "show": true, - "showHistogram": false - }, - "type": "heatmap", - "xAxis": { - "show": true - }, - "xBucketNumber": null, - "xBucketSize": null, - "yAxis": { - "decimals": null, - "format": "ms", - "logBase": 1, - "max": null, - "min": null, - "show": true, - "splitFactor": null - }, - "yBucketBound": "upper", - "yBucketNumber": null, - "yBucketSize": null - }, - { - "cards": { - "cardPadding": null, - "cardRound": null - }, - "color": { - "cardColor": "#b4ff00", - "colorScale": "linear", - "colorScheme": "interpolateReds", - "exponent": 0.5, - "max": null, - "min": null, - "mode": "spectrum" - }, - "dataFormat": "tsbuckets", - "datasource": "$datasource", - "description": "Bucketed histogram of assumeRole timings", - "gridPos": { - "h": 6, - "w": 24, - "x": 0, - "y": 29 - }, - "heatmap": {}, - "highlightCards": true, - "id": 42, - "legend": { - "show": false - }, - "links": [], - "targets": [ - { - "expr": "sum(rate(kiam_sts_assumerole_timing_seconds_bucket[$interval])) by (le)", - "format": "heatmap", - "intervalFactor": 2, - "legendFormat": "{{le}}", - "refId": "A", - "target": "" - } - ], - "title": "assumeRole timings", - "tooltip": { - "show": true, - "showHistogram": false - }, - "transparent": false, - "type": "heatmap", - "xAxis": { - "show": true - }, - "xBucketNumber": null, - "xBucketSize": null, - "yAxis": { - "decimals": null, - "format": "s", - "logBase": 1, - "max": null, - "min": null, - "show": true, - "splitFactor": null - }, - "yBucketBound": "auto", - "yBucketNumber": null, - "yBucketSize": null - }, - { - "collapsed": true, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 24 - }, - "id": 15, - "panels": [ - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "$datasource", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 2, - "x": 0, - "y": 25 - }, - "id": 27, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "min(kube_daemonset_status_number_available{namespace=\"$namespace\",daemonset=~\".*kiam-server\"}) without (instance, pod)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "title": "Available Replicas", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "0", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "$datasource", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 10, - "x": 2, - "y": 25 - }, - "id": 12, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\",pod_name=~\".*kiam-server.*\"}[$interval]))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "title": "CPU usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "0", - "value": "null" - } - ], - "valueName": "current" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { - "h": 6, - "w": 12, - "x": 12, - "y": 25 - }, - "id": 24, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "Out", - "yaxis": 2 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(rate(container_network_receive_bytes_total{namespace=\"$namespace\",pod_name=~\".*kiam-server-.*\"}[$interval])) by (pod_name)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "In {{pod_name}}", - "refId": "B" - }, - { - "expr": "sum(rate(container_network_transmit_bytes_total{namespace=\"$namespace\",pod_name=~\".*kiam-server-.*\"}[$interval])) by (pod_name)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "Out {{pod_name}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Network traffic", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "$datasource", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 2, - "x": 0, - "y": 28 - }, - "id": 21, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "max(kube_daemonset_status_desired_number_scheduled{namespace=\"$namespace\",daemonset=~\".*kiam-server\"}) without (instance, pod)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "title": "Desired Replicas", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "0", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "$datasource", - "format": "decbytes", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 10, - "x": 2, - "y": 28 - }, - "id": 31, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(container_memory_usage_bytes{namespace=\"$namespace\",pod_name=~\".*kiam-server-.*\"})", - "format": "time_series", - "hide": false, - "instant": false, - "intervalFactor": 2, - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "title": "Memory usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "0", - "value": "null" - } - ], - "valueName": "current" - } - ], - "title": "Server", - "type": "row" - }, - { - "collapsed": true, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 25 - }, - "id": 19, - "panels": [ - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "$datasource", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 2, - "x": 0, - "y": 26 - }, - "id": 28, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "min(kube_daemonset_status_number_available{namespace=\"$namespace\",daemonset=~\".*kiam-agent\"}) without (instance, pod)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "title": "Available Replicas", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "0", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "$datasource", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 10, - "x": 2, - "y": 26 - }, - "id": 13, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\",pod_name=~\".*kiam-agent.*\"}[$interval]))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "title": "CPU usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "0", - "value": "null" - } - ], - "valueName": "current" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { - "h": 6, - "w": 12, - "x": 12, - "y": 26 - }, - "id": 25, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Out/", - "yaxis": 2 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(rate(container_network_receive_bytes_total{namespace=\"$namespace\",pod_name=~\".*kiam-agent-.*\"}[$interval])) by (pod_name)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "In {{pod_name}}", - "refId": "B" - }, - { - "expr": "sum(rate(container_network_transmit_bytes_total{namespace=\"$namespace\",pod_name=~\".*kiam-agent-.*\"}[$interval])) by (pod_name)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "Out {{pod_name}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Network traffic", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "$datasource", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 2, - "x": 0, - "y": 29 - }, - "id": 22, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "max(kube_daemonset_status_desired_number_scheduled{namespace=\"$namespace\",daemonset=~\".*kiam-agent\"}) without (instance, pod)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "title": "Desired Replicas", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "0", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "$datasource", - "format": "decbytes", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 10, - "x": 2, - "y": 29 - }, - "id": 32, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(container_memory_usage_bytes{namespace=\"$namespace\",pod_name=~\".*kiam-agent-.*\"})", - "format": "time_series", - "hide": false, - "intervalFactor": 2, - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "title": "Memory usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "0", - "value": "null" - } - ], - "valueName": "current" - } - ], - "title": "Agent", - "type": "row" - }, - { - "collapsed": true, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 26 - }, - "id": 47, - "panels": [ - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "description": "Total number of RPCs completed on the server, regardless of success or failure.", - "fill": 1, - "gridPos": { - "h": 4, - "w": 12, - "x": 0, - "y": 39 - }, - "id": 49, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (increase(grpc_server_handled_total{namespace=\"$namespace\",pod=~\".*kiam-.*\"}[$interval])) by (grpc_code, grpc_method, pod)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{grpc_method}} {{grpc_code}} {{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "grpc server handled total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "reqps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "description": "Total number of RPCs started on the server.", - "fill": 1, - "gridPos": { - "h": 4, - "w": 12, - "x": 12, - "y": 39 - }, - "id": 52, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Rate.*/", - "yaxis": 2 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (increase(grpc_server_started_total{namespace=\"$namespace\",pod=~\".*kiam-server-.*\"}[$interval])) by (grpc_method, pod)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{grpc_method}} {{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "grpc server started total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "reqps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "description": "Total number of RPC stream messages received on the server.", - "fill": 1, - "gridPos": { - "h": 4, - "w": 12, - "x": 0, - "y": 43 - }, - "id": 50, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (increase(grpc_server_msg_received_total{namespace=\"$namespace\",pod=~\".*kiam-.*\"}[$interval])) by (grpc_method, pod)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{grpc_method}} {{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "grpc server msg received total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "reqps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "description": "Total number of gRPC stream messages sent by the server.", - "fill": 1, - "gridPos": { - "h": 4, - "w": 12, - "x": 12, - "y": 43 - }, - "id": 51, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (increase(grpc_server_msg_sent_total{namespace=\"$namespace\",pod=~\".*kiam-.*\"}[$interval])) by (grpc_method, pod)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{grpc_method}} {{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "grpc server msg sent total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "reqps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "title": "Grpc server stats", - "type": "row" - }, - { - "collapsed": true, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 27 - }, - "id": 54, - "panels": [ - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "description": "Total number of RPCs completed by the client, regardless of success or failure.", - "fill": 1, - "gridPos": { - "h": 4, - "w": 12, - "x": 0, - "y": 28 - }, - "id": 55, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (increase(grpc_client_handled_total{namespace=\"$namespace\",pod=~\".*kiam-.*\"}[$interval])) by (grpc_code, grpc_method, pod)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{grpc_method}} {{grpc_code}} {{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "grpc client handled total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "reqps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "description": "Total number of RPCs started on the client.", - "fill": 1, - "gridPos": { - "h": 4, - "w": 12, - "x": 12, - "y": 28 - }, - "id": 58, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Rate.*/", - "yaxis": 2 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (increase(grpc_client_started_total{namespace=\"$namespace\",pod=~\".*kiam-.*\"}[$interval])) by (grpc_method, pod)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{grpc_method}} {{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "grpc client started total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "reqps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "description": "Total number of RPC stream messages received on the client.", - "fill": 1, - "gridPos": { - "h": 4, - "w": 12, - "x": 0, - "y": 32 - }, - "id": 56, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (increase(grpc_client_msg_received_total{namespace=\"$namespace\",pod=~\".*kiam-.*\"}[$interval])) by (grpc_method, pod)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{grpc_method}} {{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "grpc client msg received total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "reqps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "description": "Total number of gRPC stream messages sent by the client.", - "fill": 1, - "gridPos": { - "h": 4, - "w": 12, - "x": 12, - "y": 32 - }, - "id": 57, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (increase(grpc_client_msg_sent_total{namespace=\"$namespace\",pod=~\".*kiam-.*\"}[$interval])) by (grpc_method, pod)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{grpc_method}} {{pod}}", - "refId": "A", - "target": "" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "grpc client msg sent total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "reqps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "title": "Grpc client stats", - "type": "row" - } - ], - "refresh": "30s", - "schemaVersion": 16, - "style": "dark", - "tags": [ - "Kubernetes", - "Kiam" - ], - "templating": { - "list": [ - { - "current": { - "selected": true, - "text": "staging", - "value": "staging" - }, - "hide": 0, - "label": "Source", - "name": "datasource", - "options": [], - "query": "prometheus", - "refresh": 1, - "regex": "", - "type": "datasource" - }, - { - "current": {}, - "datasource": "$datasource", - "hide": 0, - "includeAll": false, - "label": "Namespace", - "multi": false, - "name": "namespace", - "options": [], - "query": "label_values(kiam_metadata_responses_total, namespace)", - "refresh": 1, - "regex": "", - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": { - "selected": false, - "tags": [], - "text": "5m", - "value": "5m" - }, - "hide": 0, - "includeAll": false, - "label": "Interval", - "multi": false, - "name": "interval", - "options": [ - { - "selected": false, - "text": "1m", - "value": "1m" - }, - { - "selected": false, - "text": "3m", - "value": "3m" - }, - { - "selected": true, - "text": "5m", - "value": "5m" - }, - { - "selected": false, - "text": "10m", - "value": "10m" - }, - { - "selected": false, - "text": "30m", - "value": "30m" - }, - { - "selected": false, - "text": "1h", - "value": "1h" - }, - { - "selected": false, - "text": "6h", - "value": "6h" - }, - { - "selected": false, - "text": "12h", - "value": "12h" - }, - { - "selected": false, - "text": "1d", - "value": "1d" - }, - { - "selected": false, - "text": "7d", - "value": "7d" - }, - { - "selected": false, - "text": "14d", - "value": "14d" - }, - { - "selected": false, - "text": "30d", - "value": "30d" - } - ], - "query": "1m,3m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d", - "type": "custom" - } - ] - }, - "time": { - "from": "now-24h", - "to": "now" - }, - "timepicker": { - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, - "timezone": "browser", - "title": "Kiam", - "uid": "000000070", - "version": 32 -} diff --git a/charts/kubezero-kiam/kiam_architecure.png b/charts/kubezero-kiam/kiam_architecure.png deleted file mode 100644 index b8fb789c..00000000 --- a/charts/kubezero-kiam/kiam_architecure.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a37511a23d3180d5c7d236c004a56c4b69afda33315920570e99e391ee1e732 -size 43992 diff --git a/charts/kubezero-kiam/templates/certificates.yaml b/charts/kubezero-kiam/templates/certificates.yaml deleted file mode 100644 index 9d4b21cf..00000000 --- a/charts/kubezero-kiam/templates/certificates.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: kiam-agent - namespace: {{ .Release.Namespace }} - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -spec: - secretName: kiam-agent-tls - issuerRef: - name: kubezero-local-ca-issuer - kind: ClusterIssuer - usages: - - "any" - dnsNames: - - "kiam-agent" ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: kiam-server - namespace: {{ .Release.Namespace }} - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -spec: - secretName: kiam-server-tls - issuerRef: - name: kubezero-local-ca-issuer - kind: ClusterIssuer - usages: - - "any" - dnsNames: - - "localhost" - - "kiam-server" - ipAddresses: - - "127.0.0.1" diff --git a/charts/kubezero-kiam/templates/grafana-dashboards.yaml b/charts/kubezero-kiam/templates/grafana-dashboards.yaml deleted file mode 100644 index 13b9dac0..00000000 --- a/charts/kubezero-kiam/templates/grafana-dashboards.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.kiam.server.prometheus.servicemonitor.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboards-kiam" | trunc 63 | trimSuffix "-" }} - namespace: {{ .Release.Namespace }} - labels: - grafana_dashboard: "1" -{{ include "kubezero-lib.labels" . | indent 4 }} - annotations: - k8s-sidecar-target-directory: AWS -binaryData: - kiam.json.gz: - H4sIAAAAAAAC/+1dbXPbNhL+nl/BYXs3TkdxRb345Wb6wUkvTaZJmrN9vZlrMhqIhCSO+aIQoG3V4/vttwDfQBIkZVeOJWf7IbUACiAWu/s83F2BN88Mw5xM3GAZc2b+w/jjcy9pieiX2I2obIMWw7iR/0IfXy0ptJrziMxIQMxe1uE62uaA+PL6X6odlzRibhiIvvH+YH9gyo7bnn66JQmop5lsudBOpTaXJurv9+8x0YIS7pNlfao31Y4NTMbcYO5Rxgmvz3em6WuYEv5NdpMEQQhfgEvEdib3YHou4/nmFncGPdPY9fhbMZzVK1odwgkL48iWt/ExCn3KFzRmpnINDcjUE/08iqnSvnAdTatrh8Gr0AsjMWA0n5K9fs8YWBb8Mx73DOu5OnS2/pNiLcbfjROPRrx0C5lgHcIW05BEjpn23cr/f36W7oXpUGZH7pKngvvVJb5hE3tBewao/RLGpzAB7LvHFwasNXLtZCKTOi6vrNOcB5S/FZs3PBpaSYvQwfMw9Li7hPa+bJT7G8Sel3ziNCLpDVjj4fB4MDgajwejoez13OBCMUmpKRpztEPPI0tGxcgz4rFcwnAHrvMxLLY82YrKtl7B58FIabjObjb9vBKfMxmWFdU6zD8Xd/c5b+Mu9xKdhQ0rNinfoii80hsH8VzCpGbImy9mnRLZUl6m2Ol3NJhzubR+qZ3qLu/QY3Pmep4qpWZBjiqCPOiQo6WXYyFGj85p4JQnAmnMgxN2rjctcjmvLlEoRRxFNOCaHmGK//SXfKW30v/SKKz3+ORaM5TvBprWyJ0v+JnW4NkivNJ8g4NBe/WrL4kXy/0T7TXBgXXknaXGK9fhJSWvGFLiTcAEP4ZuwN+H8kZlg0GY8adYf6HVFNQk4GROa2q0FN+OiOPGYuhxub2udbAbDo2odHUzL1ScN6ORS9lv4MNBy2jlPtmS2FSn3AAA9kVtFsbpckmddyCGWh8n0Zxyprh81ekLt3a9lLfHYt+Yroy9Zej0jAUJHPCxz409h3qc7F2Am5yAxRBhRhMW2zZlbCJ38I/vYeU0gm37/Fx13cKiwsgnQhvBJ/h0kiy5fEn23dfE5hIRBqXuxDBe5+Pc3KR3dntrvDBubuBm4a/ykBGdSZdsnpTbE0mIDjNvvk3/UrzXAmBgEXpOzav59DV4DcWR5+1nC3fG6x2pG/wQ+1MaGeHMSOU2i70ca5gxg0ENkklccZc5htyopkQi6fKrJhZGvCy8xI4mmdN1A8e9dJ0YLK5mUwqzU+nTNbl2K85vGtsXiTKpSxU+IbUnIQ0NfFeuTh1Ck+H/8bl2iytyTVt0uFA0GDri5X33yJR6tZsQHeH8JWG0jIy526tdnvi9WrOymEKtejtynzX1X9U3XQKRxn/L9nf0Mr/pEuN6suB+sB64Dx8S3TUI/tXAvdqH6L5L6G6DaHoGwGYDtOe49CDgbnWAu7g7wPMU17cb1k/LCO6HAI2OEcbcyISZYTpDUEdQR1DfZlC3Bmui+ghRHVF9G5/ZG/CcCgWaRKFHHwXQdwDHi8dzKStDyIrB8zmPowBQGaEboRuhe5uh+2hN6D5C6Ebo3jroTp8R257JZwAWCYTD3YO9PgqSF3H3XUN1KTNDCNEN5gb4IQnxBgjJIELqCPEI8Qjxu5RPHzcg/DEiPCI8Ijwi/EYRvo8IjwiPCP9Vk+oNCD+yEOER4bc//M44m7iMxQBHj4nou4jiqdgMGyAZFMqFncEHdIRvhO+dSp834fcY8Rvxe0vxWyL3xRGbOFEoxp5Ac4rbiNVlrE4lJJ6tmTGlNokZFe0zoVvTeDbDQnYEbQTthwDtyu8XC5skQJz9NPJlE89jRgqN3sqg19SOOdDqr5KAbwD/g347+G/bL9o6MLzanlu97EAUf3AUd8BFByz7dfNtb02EF8/mia3IgHuqYHdH+AXQv1PKQi9ObbGiEBsiAclPkD+kP4Mu9wlQkhKvd4EmuKFTb2/iFBGdpx7FoTMSexWXLn547jIufgut7ofsOwFVEBqntH7eMr5yR9+IjAUZCzKWxw8zlMIKukKAYz3TGBzjL+sxzLBVYYZqdkAeOTJZuFyTGMgZy8P/mn6nog5SZgbIjBk8lGn+/Jd2sgsBHAEcAXyrAbyWKGhA8FEfERyDDDuB4b6rPQkHQbwNxIXQ6IPAOFbrIYxvKYzbJHIqA4umj8QRdat1HRGdp2EcOJXBe8oZgNJBVAbMD1f8bjqazfp9VRvlV85skpilgAYSafoX1E9tBnzRMvQIp6fUKR/6eL0MgwRQ+/vjGjJWrUOzI7nJsCW1YVP8ul0Kr1C4Os4y67t/wuSlHIE68BzBeAj27guvlNY+G2C8sBVs3zgn8zlcBE68djBXI/sZ3zV8MRjVFpwdOFqieSLU7AkO8SrVoBK+S8LUHvFQWYaONFSZwF1gcS8C5ajUs6cymwi9CewVwJwdBg6bJNuXVZr/9MlUqrw+mbd1APVoI35Wj2YtYWc98H1nVPXohkE1w8JXxZrzY+BKoNGEezrEEK1vMk1u3GLgZAGwJh3/zaGvdtTt9UnND9YdaDHHdWJZCdJXiUDaeeb+WcVCc1WfxqG26xNPA7IKeqi+SAsPd3BEDbJdei7P9UXrgVfJul6mXtqMgWkqrmLVJpNVTSYbR43+PSBjZk3bIIN9KYE2AsZDAkbtcXmDiGH1dxMyRBJPpEO/GbwQC36TqtvXwovdxAQfQQEfJR4bGZJag1NRapCCwxpIcHDXo9kHxxsDgtFgG4CgUpaTiK6CApvz94/v1dvUBPn/rvJ/EvNww55eec9DyXY395oHDalMGOJY854HvU3LwO05kJIw5rrIm8SCl8S+mEepqOrVcvKa30UEtLlbU3723eD42B4dlIzRSF8sMhge9oBEH/dEQgmw5ej4efW675zRiAxJc/XaGi9AKSlmAFBW7puTWOZKbsozg3pmq7X6/cptgZpmndUufcqoHLh/JwKprOuq9yS6oBGrhkRLwdsGTcu1bVgZ/KrqVOtKVyjeuHHOpI7nsIms1wPENSBKZbxcgm89T3yc1dRXV6vySpUX0cgQvUxc0GteUaYsgq8cQqZZW8vg4Kbnaww+KA/eqLqgYT+D9n7Msm8VNasn/ABsA+BPyrGH+XXn4o40gl+GjM/ca00FatLxOgwyH2eO+3+rXANgqv2ubG/9qhTVe/CM3Vs3S1JWchl1ofJkYeaHH080nWH+xTVlLmD2wktyjRVzEXn08ouPhha4J+sI/jk6Fv7JOqr5J/GTmgY7FrOo4yXDDcDTWcfD2kC65EfV6uT7jWDI2A/qm6Ijdlp5ZwQPfNjeRTylE4dQXz61TkQdccwmgUTECbkkriemvMkrmeEB//v8wyezl3/1p/99Mvd/EFTxBQMvQCN4/n9uXLl8IY7c3nMDGDqw07PN6xvZnXddgx9qOWJ9EIUhrqk0pYRrVewZYzzJpGWcUmAmNqlAUEbkNK8RK7yHalNHVZuSV6xnU6Fgp+ZPzebUb3Zfd7In+aWs/D2r4ejMMiIfQT6ixFX7GkIyuAchsQZISJCQfNuEZNtZRx5WAt3hBG42mtjLeBIzMqd5PEnWazWzDuAQE/G5Rjr2f6imHZ4k1Xj18d+GFBgyjCaG0VST21iX21ab21KfexfMr9TpdoPlgQ4sdU/v1n3QUg086YPL3cW8zQW97UW9HYW97cW9zQW+zUW+HYW+nUxJX/DbXPRbl7mu+Le5ALiNpKxXCNxRDNxWENxSFNxeGNxUHNzuSqStirF+izUkJqv3G6wPqNry4+YS5K4y5I0BXUD5VRhdTCJqU/eSTqYrTu8Pdi/qaJdVNcsvbBD7rE7sexskx5LKmSs5mTIUvjTvRHXXEKdMn/guf0ryBFNYV6A6GqpJdt2Bd1T8TUNdeWtteaW+PNkp8H1kNnPtCm3RpNPaSskbfhW2Vkm5ht1qS8sbystbS8zbysybS82bE1wNJef1JdRLz/WPNblyvVxqlLSpuLutwLulyLul0LvlyaPbH+zIKhoNbaVXqoYS9tYy9vJEGGvDWNsGc39HHQ8PFobaMNSGub9dzf2R64bcHzyxucC6shwgA/BwYo86mANcIzD3cyI8zAAiK1mflTjUlg+umAVcMwvYQU2GSE2QmmAWcOuzgEUgzwcCEa3SHKD0hfcO392fVyy0R4XnTkRwF97Sv72k5L2ULiYMy9/T1PyfST0ya6X3EVjHoxV/N5zWax1j8TcGgB4yAHTQEQA6QpaFLAsDQFj8XQr8AMcIONZ+Y+QHIz9IRzYa9engI9YQ+QjyEYz6fIO135JzYOk3Egws/V734X18n9JvbW3SLtZ+6/qx+PuRi79//C3mP2L597p4h9Xfm6r+3j5xYvE3Fn9j8TcWf2PxNwbbHiX3d9zx+IDnLGCsDXN/WPyNOUCs/cYMINZ+f70sYAczGSIzQWaCWcBvp/ZbCd49WOk3lnbvfGn3iVCTLavsPmh4t+rh2pXdW5jprLyD4VxE440gf73k6cdXzLBDf+nJNzOEgXzBZPIDjp4R0TmJHFBXJq5lsW3LPyO4G9eLI7r/V7Oqo3WzqrqoyLCDe4yO10uq7krGFDOiD5UR3dqMpXhQtyNKGN2bR0t7khhm+vInZ43cmoLMDQk1Oa4NO9Uz5J/Ci4TOpuMC3Tm2mxtl+ttbI/0s7kx+qr+1d+cSb2JBqW9N33rmGInlYgruUVNw9Vfr7mYSLqJfticNV4WbrcrD7ShTA/SJajzt67EwbW1bFw0bD5CGIQ3bZGHaKeF0/4enVZvWwPRSg78b02s/PnPLWN4T43WZh0Zeh7zuafK6bS6v2klaBz4DHL9vgDsXcWPxlntZj/xoNE8XbBsNO1heH1kesrynGGzz2Tz7hcAGI25IwB6IgMF2FQ4UWRiyMGRhyMK6WNhcR8MYgKVw2FsTaevkYBZyMORgT5WDCXNE/rUT/Et6TuReyL2Qez0Y92qurfulHI7mbMvq7A71dXbj0bdTZ5eySttzwVNue51d1/nu4zHSTqSdT4p2JoaJdXY7TEeTLcQ6O2SjWGeHocC/VmeX+JJHjv510rAjpGFIw7DO7l5M7151dhhffARChwV2SOgwvIh8bpMFdl+b32l/zTrooHcHSO+Q3j3FKBsW2O0UAcMCO2RhyMKQhW22wG4rQmydHOwQORhysKfKwbDAbmf4FxbYIfdC7vWoBXZFOLq9wO5ZOoTwN8JFiN5hP/mKKQ509snvNGIJb7IOkma+SmZySHSRXAmIVuilefKfMzMfmFN/6RHuBvNcDgCkjCtqrNTsFRTkpoxhXnJsqAavs1MDYa1zMUv9CEC1V8desxMd1VrATLXMs4RcKl3ZYaoK9VR6Q8kyq37W/BLTSDAnc6mjqIr4rVLrnFZPL803UZm+WrKoF6i64jVos04qgM5e7NAT3WHmhcg+ZJCsjubH4Ps138qkGei+1CVMOeUkcZ17AvQFshKxuAmIcymOGk/f8dMz8gme31PwKRKp8gClkscos39ld2SWe2u3Ltr0F6fbmqxN6YgZPU8GUgmtbq+J52WHOpf91xpmpeNvcx1bSK1t7DcYGnSsa2PradPb7FTmOyiTq/mOokvPmkCnVSLK6i3f1MF32tWE3/eba9g81/A+c2m4R8OmNm3rRpZl9Vtk2N+4EFtmG258NmvRvLTFhuc6aJ7rYNNzWYOWhQ02PpvTPJmz4bkOm+c63PRc1qhlYSNn45rvtGh+ebZnGhZbgK3l94Z+b+z3wDx7YDQ9a9E7WPRg43uW0zt0enDzvfJ0OarZMeNhbmbJROI55zbhiK5fHGdeHKceXr3ILSk7KT1hrsXXli48o0XFl1M8n2QIoPp7c6xwYauvfBiqHxTnrnpE01I/qA5FtXdTMZFcTT9naxDRhDoONc+iDnygDqzOMhipHwrxq0pdbHVZ6n+GMnpjTuGRgIEc0470UeJXYFRJUywjjGY/+e8wOaHbvMwfDYaDZ7f/B/GB8jSHHAEA -{{- end }} diff --git a/charts/kubezero-kiam/templates/sync-ns.yaml b/charts/kubezero-kiam/templates/sync-ns.yaml deleted file mode 100644 index b14d982d..00000000 --- a/charts/kubezero-kiam/templates/sync-ns.yaml +++ /dev/null @@ -1,67 +0,0 @@ -{{- if .Values.annotateKubeSystemNameSpace }} -apiVersion: v1 -kind: ServiceAccount -metadata: - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} - name: kiam-namespace-annotate ---- -apiVersion: rbac.authorization.k8s.io/v1beta1 -kind: ClusterRole -metadata: - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} - name: kiam-namespace-annotate -rules: - - apiGroups: - - "" - resources: - - namespaces - verbs: - - get - - list - - update - - patch ---- -apiVersion: rbac.authorization.k8s.io/v1beta1 -kind: ClusterRoleBinding -metadata: - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} - name: kiam-namespace-annotate -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: kiam-namespace-annotate -subjects: - - kind: ServiceAccount - name: kiam-namespace-annotate - namespace: kube-system ---- -apiVersion: batch/v1 -kind: Job -metadata: - name: kiam-kube-system-ns-annotation - namespace: kube-system - annotations: - argocd.argoproj.io/hook: Sync - argocd.argoproj.io/hook-delete-policy: HookSucceeded - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -spec: - template: - spec: - serviceAccountName: kiam-namespace-annotate - containers: - - name: kubectl - image: "bitnami/kubectl:latest" - imagePullPolicy: "IfNotPresent" - command: - - /bin/sh - - -c - - kubectl annotate --overwrite namespace kube-system 'iam.amazonaws.com/permitted=.*' - restartPolicy: Never - tolerations: - - effect: NoSchedule - key: node-role.kubernetes.io/master -{{- end }} diff --git a/charts/kubezero-kiam/update.sh b/charts/kubezero-kiam/update.sh deleted file mode 100755 index 30d8c246..00000000 --- a/charts/kubezero-kiam/update.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -ex - -# Fetch dashboards -../kubezero-metrics/sync_grafana_dashboards.py dashboards.yaml templates/grafana-dashboards.yaml diff --git a/charts/kubezero-kiam/values.yaml b/charts/kubezero-kiam/values.yaml deleted file mode 100644 index 82a050ad..00000000 --- a/charts/kubezero-kiam/values.yaml +++ /dev/null @@ -1,84 +0,0 @@ -annotateKubeSystemNameSpace: false - -kiam: - enabled: true - server: - # kiam.server.assumeRoleArn -- kiam server IAM role to assume, required as we run the agents next to the servers normally, eg. arn:aws:iam::123456789012:role/kiam-server-role - assumeRoleArn: '' - useHostNetwork: true - sslCertHostPath: /etc/ssl/certs - tlsSecret: kiam-server-tls - tlsCerts: - certFileName: tls.crt - keyFileName: tls.key - caFileName: ca.crt - service: - port: 6444 - targetPort: 6444 - deployment: - enabled: true - replicas: 1 - updateStrategy: RollingUpdate - resources: - requests: - memory: "64Mi" - cpu: "50m" - limits: - memory: "128Mi" - # cpu: "300m" - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - nodeSelector: - node-role.kubernetes.io/master: "" - priorityClassName: system-cluster-critical - prometheus: - servicemonitor: - enabled: false - interval: 30s - labels: - release: metrics - log: - level: info - - agent: - gatewayTimeoutCreation: "5s" - updateStrategy: RollingUpdate - # IP tables set on each node at boot, see CloudBender - host: - iptables: false - interface: "cali+" - allowRouteRegexp: '^/latest/(meta-data/instance-id|dynamic)' - sslCertHostPath: /etc/ssl/certs - tlsSecret: kiam-agent-tls - tlsCerts: - certFileName: tls.crt - keyFileName: tls.key - caFileName: ca.crt - resources: - requests: - memory: "16Mi" - cpu: "50m" - limits: - memory: "64Mi" - # cpu: "50m" - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - - key: kubezero-workergroup - effect: NoSchedule - operator: Exists - priorityClassName: system-node-critical - prometheus: - servicemonitor: - enabled: false - interval: 30s - labels: - release: metrics - log: - level: info - # extraEnv: - # - name: GRPC_GO_LOG_SEVERITY_LEVEL - # value: "info" - # - name: GRPC_GO_LOG_VERBOSITY_LEVEL - # value: "8" diff --git a/charts/kubezero-storage/Chart.yaml b/charts/kubezero-storage/Chart.yaml index 449d628f..e29b6eeb 100644 --- a/charts/kubezero-storage/Chart.yaml +++ b/charts/kubezero-storage/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: kubezero-storage -description: KubeZero umbrella chart for all things storage incl. backup, eg. openEBS-lvm, gemini +description: KubeZero umbrella chart for all things storage incl. AWS EBS/EFS, openEBS-lvm, gemini type: application -version: 0.4.0 +version: 0.4.2 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -10,23 +10,29 @@ keywords: - gemini - openEBS - lvm + - ebs + - efs maintainers: - - name: Quarky9 + - name: Stefan Reimer + email: stefan@zero-downtime.net dependencies: + - name: kubezero-lib + version: ">= 0.1.4" + repository: https://cdn.zero-downtime.net/charts/ - name: lvm-localpv version: 0.8.5 condition: lvm-localpv.enabled - # repository: https://openebs.github.io/lvm-localpv + repository: https://openebs.github.io/lvm-localpv - name: gemini - version: 0.0.7 + version: 0.0.8 condition: gemini.enabled # repository: https://charts.fairwinds.com/stable - name: aws-ebs-csi-driver - version: 2.3.0 + version: 2.5.0 condition: aws-ebs-csi-driver.enabled # repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver - name: aws-efs-csi-driver - version: 2.1.5 + version: 2.2.0 condition: aws-efs-csi-driver.enabled # repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver -kubeVersion: ">= 1.18.0" +kubeVersion: ">= 1.20.0" diff --git a/charts/kubezero-storage/README.md b/charts/kubezero-storage/README.md index 02c9d69f..8889eb6c 100644 --- a/charts/kubezero-storage/README.md +++ b/charts/kubezero-storage/README.md @@ -2,7 +2,7 @@ ![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-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. backup, eg. openEBS-lvm, gemini +KubeZero umbrella chart for all things storage incl. AWS EBS/EFS, openEBS-lvm, gemini **Homepage:** @@ -10,25 +10,26 @@ KubeZero umbrella chart for all things storage incl. backup, eg. openEBS-lvm, ge | Name | Email | Url | | ---- | ------ | --- | -| Quarky9 | | | +| Stefan Reimer | stefan@zero-downtime.net | | ## Requirements -Kubernetes: `>= 1.18.0` +Kubernetes: `>= 1.20.0` | Repository | Name | Version | |------------|------|---------| -| | aws-ebs-csi-driver | 2.3.0 | -| | aws-efs-csi-driver | 2.1.5 | -| | gemini | 0.0.7 | -| | lvm-localpv | 0.8.5 | +| | aws-ebs-csi-driver | 2.5.0 | +| | aws-efs-csi-driver | 2.2.0 | +| | gemini | 0.0.8 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | +| https://openebs.github.io/lvm-localpv | lvm-localpv | 0.8.5 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | aws-ebs-csi-driver.controller.logLevel | int | `2` | | -| aws-ebs-csi-driver.controller.nodeSelector."node-role.kubernetes.io/master" | string | `""` | | +| 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"` | | @@ -52,9 +53,16 @@ Kubernetes: `>= 1.18.0` | aws-ebs-csi-driver.storageClasses[1].parameters.encrypted | string | `"true"` | | | aws-ebs-csi-driver.storageClasses[1].parameters.type | string | `"gp3"` | | | aws-ebs-csi-driver.storageClasses[1].volumeBindingMode | string | `"WaitForFirstConsumer"` | | +| aws-efs-csi-driver.PersistentVolumes[0].claimRef.name | string | `"foo-pvc"` | | +| aws-efs-csi-driver.PersistentVolumes[0].claimRef.namespace | string | `"foo"` | | +| aws-efs-csi-driver.PersistentVolumes[0].mountOptions[0] | string | `"tls"` | | +| aws-efs-csi-driver.PersistentVolumes[0].name | string | `"example-pv"` | | +| aws-efs-csi-driver.PersistentVolumes[0].volumeHandle | string | `":/path"` | | +| aws-efs-csi-driver.PersistentVolumes[1].name | string | `"example-pv2"` | | +| aws-efs-csi-driver.PersistentVolumes[1].volumeHandle | string | `":/path2"` | | | aws-efs-csi-driver.controller.create | bool | `true` | | | aws-efs-csi-driver.controller.logLevel | int | `2` | | -| aws-efs-csi-driver.controller.nodeSelector."node-role.kubernetes.io/master" | string | `""` | | +| 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.enabled | bool | `false` | | @@ -85,7 +93,6 @@ Kubernetes: `>= 1.18.0` | lvm-localpv.lvmNode.tolerations[0].effect | string | `"NoSchedule"` | | | lvm-localpv.lvmNode.tolerations[0].key | string | `"kubezero-workergroup"` | | | lvm-localpv.lvmNode.tolerations[0].operator | string | `"Exists"` | | -| lvm-localpv.storageCapacity | bool | `false` | | | lvm-localpv.storageClass.default | bool | `false` | | | lvm-localpv.storageClass.vgpattern | string | `""` | | diff --git a/charts/kubezero-storage/charts/aws-ebs-csi-driver/CHANGELOG.md b/charts/kubezero-storage/charts/aws-ebs-csi-driver/CHANGELOG.md index e9740cbc..f7e66a3c 100644 --- a/charts/kubezero-storage/charts/aws-ebs-csi-driver/CHANGELOG.md +++ b/charts/kubezero-storage/charts/aws-ebs-csi-driver/CHANGELOG.md @@ -1,5 +1,22 @@ # Helm chart +## v2.5.0 + +* Bump app/driver version to `v1.5.0` + + +## v2.4.1 + +* Replace deprecated arg `--extra-volume-tags` by `--extra-tags` + +## v2.4.0 + +* Bump app/driver version to `v1.4.0` + +## v2.3.1 + +* Bump app/driver version to `v1.3.1` + ## v2.3.0 * Support overriding controller `--default-fstype` flag via values diff --git a/charts/kubezero-storage/charts/aws-ebs-csi-driver/Chart.yaml b/charts/kubezero-storage/charts/aws-ebs-csi-driver/Chart.yaml index 16042a43..85dc31ff 100644 --- a/charts/kubezero-storage/charts/aws-ebs-csi-driver/Chart.yaml +++ b/charts/kubezero-storage/charts/aws-ebs-csi-driver/Chart.yaml @@ -3,7 +3,7 @@ annotations: - kind: added description: Custom controller.updateStrategy to set controller deployment strategy. apiVersion: v2 -appVersion: 1.3.0 +appVersion: 1.5.0 description: A Helm chart for AWS EBS CSI Driver home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver keywords: @@ -19,4 +19,4 @@ maintainers: name: aws-ebs-csi-driver sources: - https://github.com/kubernetes-sigs/aws-ebs-csi-driver -version: 2.3.0 +version: 2.5.0 diff --git a/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/_helpers.tpl b/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/_helpers.tpl index 424f7ea1..f7b23583 100644 --- a/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/_helpers.tpl +++ b/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/_helpers.tpl @@ -41,8 +41,12 @@ helm.sh/chart: {{ include "aws-ebs-csi-driver.chart" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} +app.kubernetes.io/component: csi-driver app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end }} +{{- if .Values.customLabels }} +{{ toYaml .Values.customLabels }} +{{- end }} {{- end -}} {{/* @@ -56,7 +60,7 @@ app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} {{/* -Convert the `--extra-volume-tags` command line arg from a map. +Convert the `--extra-tags` command line arg from a map. */}} {{- define "aws-ebs-csi-driver.extra-volume-tags" -}} {{- $result := dict "pairs" (list) -}} @@ -64,7 +68,7 @@ Convert the `--extra-volume-tags` command line arg from a map. {{- $noop := printf "%s=%v" $key $value | append $result.pairs | set $result "pairs" -}} {{- end -}} {{- if gt (len $result.pairs) 0 -}} -{{- printf "%s=%s" "- --extra-volume-tags" (join "," $result.pairs) -}} +{{- printf "%s=%s" "- --extra-tags" (join "," $result.pairs) -}} {{- end -}} {{- end -}} diff --git a/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/controller.yaml index dd9bfcbd..3777eb91 100644 --- a/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/controller.yaml +++ b/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/controller.yaml @@ -192,7 +192,7 @@ spec: resources: {{- toYaml . | nindent 12 }} {{- end }} - {{- if .Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1" }} + {{- if or (.Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1beta1") (.Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1") }} - name: csi-snapshotter image: {{ printf "%s:%s" .Values.sidecars.snapshotter.image.repository .Values.sidecars.snapshotter.image.tag }} imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.snapshotter.image.pullPolicy }} diff --git a/charts/kubezero-storage/charts/aws-ebs-csi-driver/values.yaml b/charts/kubezero-storage/charts/aws-ebs-csi-driver/values.yaml index a35fa6e1..d1709e2e 100644 --- a/charts/kubezero-storage/charts/aws-ebs-csi-driver/values.yaml +++ b/charts/kubezero-storage/charts/aws-ebs-csi-driver/values.yaml @@ -8,6 +8,10 @@ image: tag: "" pullPolicy: IfNotPresent +# -- Custom labels to add into metadata +customLabels: {} + # k8s-app: aws-ebs-csi-driver + sidecars: provisioner: env: [] diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md b/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md index c73f9e5e..729a5bc1 100644 --- a/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md +++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md @@ -1,5 +1,12 @@ # Helm chart +# v2.2.0 +* Allow health ports to be configured +* Add Missing "patch" permission for "events" + +# v2.1.6 +* Bump app/driver version to `v1.3.4` + # v2.1.5 * Bump app/driver version to `v1.3.3` diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml b/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml index 95458976..cbecb953 100644 --- a/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml +++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.3.3 +appVersion: 1.3.4 description: A Helm chart for AWS EFS CSI Driver home: https://github.com/kubernetes-sigs/aws-efs-csi-driver keywords: @@ -15,4 +15,4 @@ maintainers: name: aws-efs-csi-driver sources: - https://github.com/kubernetes-sigs/aws-efs-csi-driver -version: 2.1.5 +version: 2.2.0 diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/controller-deployment.yaml index d8d49333..bb766002 100644 --- a/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/controller-deployment.yaml +++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/controller-deployment.yaml @@ -23,6 +23,7 @@ spec: annotations: {{- toYaml . | nindent 8 }} {{- end }} spec: + hostNetwork: true {{- if .Values.imagePullSecrets }} imagePullSecrets: {{- range .Values.imagePullSecrets }} @@ -66,7 +67,7 @@ spec: mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" ports: - name: healthz - containerPort: 9909 + containerPort: {{ .Values.controller.healthPort }} protocol: TCP livenessProbe: httpGet: @@ -104,7 +105,7 @@ spec: imagePullPolicy: {{ .Values.sidecars.livenessProbe.image.pullPolicy }} args: - --csi-address=/csi/csi.sock - - --health-port=9909 + - --health-port={{ .Values.controller.healthPort }} volumeMounts: - name: socket-dir mountPath: /csi diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml b/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml index 17d1989b..5bd6a527 100644 --- a/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml +++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml @@ -30,7 +30,7 @@ rules: verbs: ["get", "list", "watch"] - apiGroups: [""] resources: ["events"] - verbs: ["list", "watch", "create"] + verbs: ["list", "watch", "create", "patch"] - apiGroups: ["storage.k8s.io"] resources: ["csinodes"] verbs: ["get", "list", "watch"] diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/node-daemonset.yaml b/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/node-daemonset.yaml index 0352af49..75ade6dc 100644 --- a/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/node-daemonset.yaml +++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/node-daemonset.yaml @@ -81,7 +81,7 @@ spec: mountPath: /etc/amazon/efs-legacy ports: - name: healthz - containerPort: 9809 + containerPort: {{ .Values.node.healthPort }} protocol: TCP livenessProbe: httpGet: @@ -123,7 +123,7 @@ spec: imagePullPolicy: {{ .Values.sidecars.livenessProbe.image.pullPolicy }} args: - --csi-address=/csi/csi.sock - - --health-port=9809 + - --health-port={{ .Values.node.healthPort }} - --v={{ .Values.node.logLevel }} volumeMounts: - name: plugin-dir diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml b/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml index 67fd2b3c..e315eff3 100644 --- a/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml +++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml @@ -9,7 +9,7 @@ replicaCount: 2 image: repository: amazon/aws-efs-csi-driver - tag: "v1.3.3" + tag: "v1.3.4" pullPolicy: IfNotPresent sidecars: @@ -74,6 +74,7 @@ controller: annotations: {} ## Enable if EKS IAM for SA is used # eks.amazonaws.com/role-arn: arn:aws:iam::111122223333:role/efs-csi-role + healthPort: 9909 ## Node daemonset variables @@ -117,6 +118,7 @@ node: annotations: {} ## Enable if EKS IAM for SA is used # eks.amazonaws.com/role-arn: arn:aws:iam::111122223333:role/efs-csi-role + healthPort: 9809 storageClasses: [] # Add StorageClass resources like: diff --git a/charts/kubezero-storage/charts/gemini/templates/deployment.yaml b/charts/kubezero-storage/charts/gemini/templates/deployment.yaml index ed1088e8..52beafe8 100644 --- a/charts/kubezero-storage/charts/gemini/templates/deployment.yaml +++ b/charts/kubezero-storage/charts/gemini/templates/deployment.yaml @@ -20,7 +20,7 @@ spec: serviceAccountName: {{ .Values.rbac.serviceAccountName }} {{- end }} nodeSelector: - node-role.kubernetes.io/master: "" + node-role.kubernetes.io/control-plane: "" tolerations: - effect: NoSchedule key: node-role.kubernetes.io/master diff --git a/charts/kubezero-storage/charts/lvm-localpv/.helmignore b/charts/kubezero-storage/charts/lvm-localpv/.helmignore deleted file mode 100644 index 0e8a0eb3..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/kubezero-storage/charts/lvm-localpv/Chart.yaml b/charts/kubezero-storage/charts/lvm-localpv/Chart.yaml deleted file mode 100644 index 71202d74..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/Chart.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: v2 -name: lvm-localpv -description: CSI Driver for dynamic provisioning of LVM Persistent Local Volumes. -version: 0.8.2 -appVersion: 0.8.0 -icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png -home: http://www.openebs.io/ -keywords: - - cloud-native-storage - - block-storage - - filesystem - - LVM - - Local Persistent Volumes - - storage -sources: -- https://github.com/openebs/lvm-localpv -maintainers: - - name: prateekpandey14 - email: prateek.pandey@mayadata.io - - name: pawanpraka1 - email: pawan@mayadata.io - - name: iyashu - email: yashpal.c1995@gmail.com diff --git a/charts/kubezero-storage/charts/lvm-localpv/README.md b/charts/kubezero-storage/charts/lvm-localpv/README.md deleted file mode 100644 index 017a1d5b..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/README.md +++ /dev/null @@ -1,160 +0,0 @@ - -# OpenEBS LocalPV Provisioner - -[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) -![Chart Lint and Test](https://github.com/openebs/lvm-localpv/workflows/Chart%20Lint%20and%20Test/badge.svg) -![Release Charts](https://github.com/openebs/lvm-localpv/workflows/Release%20Charts/badge.svg?branch=develop) - -A Helm chart for openebs lvm localpv provisioner. This chart bootstraps OpenEBS LVM LocalPV provisioner deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| pawanpraka1 | pawan@mayadata.io | | -| prateekpandey14 | prateek.pandey@mayadata.io | | -| iyashu | yashpal.c1995@gmail.com | | - - -## Get Repo Info - -```console -helm repo add openebs-lvmlocalpv https://openebs.github.io/lvm-localpv -helm repo update -``` - -_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ - -## Install Chart - -Please visit the [link](https://openebs.github.io/lvm-localpv/) for install instructions via helm3. - -```console -# Helm -$ helm install [RELEASE_NAME] openebs-lvmlocalpv/lvm-localpv --namespace [NAMESPACE] -``` - -
- Click here if you're using MicroK8s. - - ```console - microk8s helm3 install [RELEASE_NAME] openebs-lvmlocalpv/lvm-localpv --namespace [NAMESPACE] --set-string lvmNode.kubeletDir="/var/snap/microk8s/common/var/lib/kubelet/" - ``` -
- - -**Note:** If moving from the operator to helm -- Make sure the namespace provided in the helm install command is same as `LVM_NAMESPACE` (by default it is `openebs`) env in the controller statefulset. -- Before installing, clean up the stale statefulset and daemonset from `kube-system` namespace using the below commands -```sh -kubectl delete sts openebs-lvm-controller -n kube-system -kubectl delete ds openebs-lvm-node -n kube-system -``` - - -_See [configuration](#configuration) below._ - -_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ - -## Uninstall Chart - -```console -# Helm -$ helm uninstall [RELEASE_NAME] -``` - -This removes all the Kubernetes components associated with the chart and deletes the release. - -_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ - -## Upgrading Chart - -```console -# Helm -$ helm upgrade [RELEASE_NAME] [CHART] --install --namespace [NAMESPACE] -``` - -## Configuration - -The following table lists the configurable parameters of the OpenEBS LVM Localpv chart and their default values. - -```console -helm install openebs-lvmlocalpv openebs-lvmlocalpv/lvm-localpv --namespace openebs --create-namespace -``` -
- Click here if you're using MicroK8s. - - If you are using MicroK8s, it is necessary to add the following flag: - - ```console - --set-string lvmNode.kubeletDir="/var/snap/microk8s/common/var/lib/kubelet/" - ``` -
- -| Parameter| Description| Default| -| -| -| -| -| `imagePullSecrets`| Provides image pull secrect| `""`| -| `lvmPlugin.image.registry`| Registry for openebs-lvm-plugin image| `""`| -| `lvmPlugin.image.repository`| Image repository for openebs-lvm-plugin| `openebs/lvm-driver`| -| `lvmPlugin.image.pullPolicy`| Image pull policy for openebs-lvm-plugin| `IfNotPresent`| -| `lvmPlugin.image.tag`| Image tag for openebs-lvm-plugin| `0.8.0`| -| `lvmPlugin.metricsPort`| The TCP port number used for exposing lvm-metrics | `9500`| -| `lvmPlugin.allowedTopologies`| The comma seperated list of allowed node topologies | `kubernetes.io/hostname,`| -| `lvmNode.driverRegistrar.image.registry`| Registry for csi-node-driver-registrar image| `k8s.gcr.io/`| -| `lvmNode.driverRegistrar.image.repository`| Image repository for csi-node-driver-registrar| `sig-storage/csi-node-driver-registrar`| -| `lvmNode.driverRegistrar.image.pullPolicy`| Image pull policy for csi-node-driver-registrar| `IfNotPresent`| -| `lvmNode.driverRegistrar.image.tag`| Image tag for csi-node-driver-registrar| `v2.3.0`| -| `lvmNode.updateStrategy.type`| Update strategy for lvmnode daemonset | `RollingUpdate` | -| `lvmNode.kubeletDir`| Kubelet mount point for lvmnode daemonset| `"/var/lib/kubelet/"` | -| `lvmNode.annotations` | Annotations for lvmnode daemonset metadata| `""`| -| `lvmNode.podAnnotations`| Annotations for lvmnode daemonset's pods metadata | `""`| -| `lvmNode.resources`| Resource and request and limit for lvmnode daemonset containers | `""`| -| `lvmNode.labels`| Labels for lvmnode daemonset metadata | `""`| -| `lvmNode.podLabels`| Appends labels to the lvmnode daemonset pods| `""`| -| `lvmNode.nodeSelector`| Nodeselector for lvmnode daemonset pods| `""`| -| `lvmNode.tolerations` | lvmnode daemonset's pod toleration values | `""`| -| `lvmNode.securityContext` | Security context for lvmnode daemonset container | `""`| -| `lvmController.resizer.image.registry`| Registry for csi-resizer image| `k8s.gcr.io/`| -| `lvmController.resizer.image.repository`| Image repository for csi-resizer| `sig-storage/csi-resizer`| -| `lvmController.resizer.image.pullPolicy`| Image pull policy for csi-resizer| `IfNotPresent`| -| `lvmController.resizer.image.tag`| Image tag for csi-resizer| `v1.2.0`| -| `lvmController.snapshotter.image.registry`| Registry for csi-snapshotter image| `k8s.gcr.io/`| -| `lvmController.snapshotter.image.repository`| Image repository for csi-snapshotter| `sig-storage/csi-snapshotter`| -| `lvmController.snapshotter.image.pullPolicy`| Image pull policy for csi-snapshotter| `IfNotPresent`| -| `lvmController.snapshotter.image.tag`| Image tag for csi-snapshotter| `v4.0.0`| -| `lvmController.snapshotController.image.registry`| Registry for snapshot-controller image| `k8s.gcr.io/`| -| `lvmController.snapshotController.image.repository`| Image repository for snapshot-controller| `sig-storage/snapshot-controller`| -| `lvmController.snapshotController.image.pullPolicy`| Image pull policy for snapshot-controller| `IfNotPresent`| -| `lvmController.snapshotController.image.tag`| Image tag for snapshot-controller| `v4.0.0`| -| `lvmController.provisioner.image.registry`| Registry for csi-provisioner image| `k8s.gcr.io/`| -| `lvmController.provisioner.image.repository`| Image repository for csi-provisioner| `sig-storage/csi-provisioner`| -| `lvmController.provisioner.image.pullPolicy`| Image pull policy for csi-provisioner| `IfNotPresent`| -| `lvmController.provisioner.image.tag`| Image tag for csi-provisioner| `v2.3.0`| -| `lvmController.updateStrategy.type`| Update strategy for lvm localpv controller statefulset | `RollingUpdate` | -| `lvmController.annotations` | Annotations for lvm localpv controller statefulset metadata| `""`| -| `lvmController.podAnnotations`| Annotations for lvm localpv controller statefulset's pods metadata | `""`| -| `lvmController.resources`| Resource and request and limit for lvm localpv controller statefulset containers | `""`| -| `lvmController.labels`| Labels for lvm localpv controller statefulset metadata | `""`| -| `lvmController.podLabels`| Appends labels to the lvm localpv controller statefulset pods| `""`| -| `lvmController.nodeSelector`| Nodeselector for lvm localpv controller statefulset pods| `""`| -| `lvmController.tolerations` | lvm localpv controller statefulset's pod toleration values | `""`| -| `lvmController.securityContext` | Seurity context for lvm localpv controller statefulset container | `""`| -| `rbac.pspEnabled` | Enable PodSecurityPolicy | `false` | -| `serviceAccount.lvmNode.create` | Create a service account for lvmnode or not| `true`| -| `serviceAccount.lvmNode.name` | Name for the lvmnode service account| `openebs-lvm-node-sa`| -| `serviceAccount.lvmController.create` | Create a service account for lvm localpv controller or not| `true`| -| `serviceAccount.lvmController.name` | Name for the lvm localpv controller service account| `openebs-lvm-controller-sa`| -| `analytics.enabled` | Enable or Disable google analytics for the controller| `true`| - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. - -Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, - -```bash -helm install -f values.yaml openebs/lvm-localpv -``` - -> **Tip**: You can use the default [values.yaml](values.yaml) diff --git a/charts/kubezero-storage/charts/lvm-localpv/crds/lvmnode.yaml b/charts/kubezero-storage/charts/lvm-localpv/crds/lvmnode.yaml deleted file mode 100644 index d2aed0c6..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/crds/lvmnode.yaml +++ /dev/null @@ -1,110 +0,0 @@ - - -############################################## -########### ############ -########### LVMNode CRD ############ -########### ############ -############################################## - -# LVMNode CRD is autogenerated via `make manifests` command. -# Do the modification in the code and run the `make manifests` command -# to generate the CRD definition - ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.4.0 - creationTimestamp: null - name: lvmnodes.local.openebs.io -spec: - group: local.openebs.io - names: - kind: LVMNode - listKind: LVMNodeList - plural: lvmnodes - shortNames: - - lvmnode - singular: lvmnode - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: LVMNode records information about all lvm volume groups available - in a node. In general, the openebs node-agent creates the LVMNode object - & periodically synchronizing the volume groups available in the node. LVMNode - has an owner reference pointing to the corresponding node object. - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' - type: string - metadata: - type: object - volumeGroups: - items: - description: VolumeGroup specifies attributes of a given vg exists on - node. - properties: - free: - anyOf: - - type: integer - - type: string - description: Free specifies the available capacity of volume group. - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - lvCount: - description: LVCount denotes total number of logical volumes in - volume group. - format: int32 - minimum: 0 - type: integer - name: - description: Name of the lvm volume group. - minLength: 1 - type: string - pvCount: - description: PVCount denotes total number of physical volumes constituting - the volume group. - format: int32 - minimum: 0 - type: integer - size: - anyOf: - - type: integer - - type: string - description: Size specifies the total size of volume group. - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - uuid: - description: UUID denotes a unique identity of a lvm volume group. - minLength: 1 - type: string - required: - - free - - lvCount - - name - - pvCount - - size - - uuid - type: object - type: array - required: - - volumeGroups - type: object - served: true - storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/charts/kubezero-storage/charts/lvm-localpv/crds/lvmsnapshot.yaml b/charts/kubezero-storage/charts/lvm-localpv/crds/lvmsnapshot.yaml deleted file mode 100644 index 63458c13..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/crds/lvmsnapshot.yaml +++ /dev/null @@ -1,109 +0,0 @@ - - -############################################## -########### ############ -########### LVMSnapshot CRD ############ -########### ############ -############################################## - -# LVMSnapshot CRD is autogenerated via `make manifests` command. -# Do the modification in the code and run the `make manifests` command -# to generate the CRD definition - ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.4.0 - creationTimestamp: null - name: lvmsnapshots.local.openebs.io -spec: - group: local.openebs.io - names: - kind: LVMSnapshot - listKind: LVMSnapshotList - plural: lvmsnapshots - singular: lvmsnapshot - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: LVMSnapshot represents an LVM Snapshot of the lvm volume - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: VolumeInfo defines LVM info - properties: - capacity: - description: Capacity of the volume - minLength: 1 - type: string - ownerNodeID: - description: OwnerNodeID is the Node ID where the volume group is - present which is where the volume has been provisioned. OwnerNodeID - can not be edited after the volume has been provisioned. - minLength: 1 - type: string - shared: - description: Shared specifies whether the volume can be shared among - multiple pods. If it is not set to "yes", then the LVM LocalPV Driver - will not allow the volumes to be mounted by more than one pods. - enum: - - "yes" - - "no" - type: string - thinProvision: - description: ThinProvision specifies whether logical volumes can be - thinly provisioned. If it is set to "yes", then the LVM LocalPV - Driver will create thinProvision i.e. logical volumes that are larger - than the available extents. - enum: - - "yes" - - "no" - type: string - vgPattern: - description: VgPattern specifies the regex to choose volume groups - where volume needs to be created. - type: string - volGroup: - description: VolGroup specifies the name of the volume group where - the volume has been created. - type: string - required: - - capacity - - ownerNodeID - - vgPattern - - volGroup - type: object - status: - description: SnapStatus string that reflects if the snapshot was created - successfully - properties: - state: - type: string - type: object - required: - - spec - - status - type: object - served: true - storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/charts/kubezero-storage/charts/lvm-localpv/crds/lvmvolume.yaml b/charts/kubezero-storage/charts/lvm-localpv/crds/lvmvolume.yaml deleted file mode 100644 index f6c61e26..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/crds/lvmvolume.yaml +++ /dev/null @@ -1,153 +0,0 @@ - - -############################################## -########### ############ -########### LVMVolume CRD ############ -########### ############ -############################################## - -# LVMVolume CRD is autogenerated via `make manifests` command. -# Do the modification in the code and run the `make manifests` command -# to generate the CRD definition - ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.4.0 - creationTimestamp: null - name: lvmvolumes.local.openebs.io -spec: - group: local.openebs.io - names: - kind: LVMVolume - listKind: LVMVolumeList - plural: lvmvolumes - shortNames: - - lvmvol - singular: lvmvolume - scope: Namespaced - versions: - - additionalPrinterColumns: - - description: volume group where the volume is created - jsonPath: .spec.volGroup - name: VolGroup - type: string - - description: Node where the volume is created - jsonPath: .spec.ownerNodeID - name: Node - type: string - - description: Size of the volume - jsonPath: .spec.capacity - name: Size - type: string - - description: Status of the volume - jsonPath: .status.state - name: Status - type: string - - description: Age of the volume - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1alpha1 - schema: - openAPIV3Schema: - description: LVMVolume represents a LVM based volume - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: VolumeInfo defines LVM info - properties: - capacity: - description: Capacity of the volume - minLength: 1 - type: string - ownerNodeID: - description: OwnerNodeID is the Node ID where the volume group is - present which is where the volume has been provisioned. OwnerNodeID - can not be edited after the volume has been provisioned. - minLength: 1 - type: string - shared: - description: Shared specifies whether the volume can be shared among - multiple pods. If it is not set to "yes", then the LVM LocalPV Driver - will not allow the volumes to be mounted by more than one pods. - enum: - - "yes" - - "no" - type: string - thinProvision: - description: ThinProvision specifies whether logical volumes can be - thinly provisioned. If it is set to "yes", then the LVM LocalPV - Driver will create thinProvision i.e. logical volumes that are larger - than the available extents. - enum: - - "yes" - - "no" - type: string - vgPattern: - description: VgPattern specifies the regex to choose volume groups - where volume needs to be created. - type: string - volGroup: - description: VolGroup specifies the name of the volume group where - the volume has been created. - type: string - required: - - capacity - - ownerNodeID - - vgPattern - - volGroup - type: object - status: - description: VolStatus string that specifies the current state of the - volume provisioning request. - properties: - error: - description: Error denotes the error occurred during provisioning/expanding - a volume. Error field should only be set when State becomes Failed. - properties: - code: - description: VolumeErrorCode represents the error code to represent - specific class of errors. - type: string - message: - type: string - type: object - state: - description: State specifies the current state of the volume provisioning - request. The state "Pending" means that the volume creation request - has not processed yet. The state "Ready" means that the volume has - been created and it is ready for the use. "Failed" means that volume - provisioning has been failed and will not be retried by node agent - controller. - enum: - - Pending - - Ready - - Failed - type: string - type: object - required: - - spec - type: object - served: true - storage: true - subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshotclasses.yaml b/charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshotclasses.yaml deleted file mode 100644 index afd637b1..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshotclasses.yaml +++ /dev/null @@ -1,112 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.4.0 - api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/419" - creationTimestamp: null - name: volumesnapshotclasses.snapshot.storage.k8s.io -spec: - group: snapshot.storage.k8s.io - names: - kind: VolumeSnapshotClass - listKind: VolumeSnapshotClassList - plural: volumesnapshotclasses - singular: volumesnapshotclass - scope: Cluster - versions: - - additionalPrinterColumns: - - jsonPath: .driver - name: Driver - type: string - - description: Determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted. - jsonPath: .deletionPolicy - name: DeletionPolicy - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1 - schema: - openAPIV3Schema: - description: VolumeSnapshotClass specifies parameters that a underlying storage system uses when creating a volume snapshot. A specific VolumeSnapshotClass is used by specifying its name in a VolumeSnapshot object. VolumeSnapshotClasses are non-namespaced - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - deletionPolicy: - description: deletionPolicy determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted. Supported values are "Retain" and "Delete". "Retain" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are kept. "Delete" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are deleted. Required. - enum: - - Delete - - Retain - type: string - driver: - description: driver is the name of the storage driver that handles this VolumeSnapshotClass. Required. - type: string - kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - parameters: - additionalProperties: - type: string - description: parameters is a key-value map with storage driver specific parameters for creating snapshots. These values are opaque to Kubernetes. - type: object - required: - - deletionPolicy - - driver - type: object - served: true - storage: false - subresources: {} - - additionalPrinterColumns: - - jsonPath: .driver - name: Driver - type: string - - description: Determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted. - jsonPath: .deletionPolicy - name: DeletionPolicy - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1beta1 - schema: - openAPIV3Schema: - description: VolumeSnapshotClass specifies parameters that a underlying storage system uses when creating a volume snapshot. A specific VolumeSnapshotClass is used by specifying its name in a VolumeSnapshot object. VolumeSnapshotClasses are non-namespaced - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - deletionPolicy: - description: deletionPolicy determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted. Supported values are "Retain" and "Delete". "Retain" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are kept. "Delete" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are deleted. Required. - enum: - - Delete - - Retain - type: string - driver: - description: driver is the name of the storage driver that handles this VolumeSnapshotClass. Required. - type: string - kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - parameters: - additionalProperties: - type: string - description: parameters is a key-value map with storage driver specific parameters for creating snapshots. These values are opaque to Kubernetes. - type: object - required: - - deletionPolicy - - driver - type: object - served: true - storage: true - subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] - - diff --git a/charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshotcontents.yaml b/charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshotcontents.yaml deleted file mode 100644 index c57a2e4a..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshotcontents.yaml +++ /dev/null @@ -1,291 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.4.0 - api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/419" - creationTimestamp: null - name: volumesnapshotcontents.snapshot.storage.k8s.io -spec: - group: snapshot.storage.k8s.io - names: - kind: VolumeSnapshotContent - listKind: VolumeSnapshotContentList - plural: volumesnapshotcontents - singular: volumesnapshotcontent - scope: Cluster - versions: - - additionalPrinterColumns: - - description: Indicates if the snapshot is ready to be used to restore a volume. - jsonPath: .status.readyToUse - name: ReadyToUse - type: boolean - - description: Represents the complete size of the snapshot in bytes - jsonPath: .status.restoreSize - name: RestoreSize - type: integer - - description: Determines whether this VolumeSnapshotContent and its physical snapshot on the underlying storage system should be deleted when its bound VolumeSnapshot is deleted. - jsonPath: .spec.deletionPolicy - name: DeletionPolicy - type: string - - description: Name of the CSI driver used to create the physical snapshot on the underlying storage system. - jsonPath: .spec.driver - name: Driver - type: string - - description: Name of the VolumeSnapshotClass to which this snapshot belongs. - jsonPath: .spec.volumeSnapshotClassName - name: VolumeSnapshotClass - type: string - - description: Name of the VolumeSnapshot object to which this VolumeSnapshotContent object is bound. - jsonPath: .spec.volumeSnapshotRef.name - name: VolumeSnapshot - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1 - schema: - openAPIV3Schema: - description: VolumeSnapshotContent represents the actual "on-disk" snapshot object in the underlying storage system - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - spec: - description: spec defines properties of a VolumeSnapshotContent created by the underlying storage system. Required. - properties: - deletionPolicy: - description: deletionPolicy determines whether this VolumeSnapshotContent and its physical snapshot on the underlying storage system should be deleted when its bound VolumeSnapshot is deleted. Supported values are "Retain" and "Delete". "Retain" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are kept. "Delete" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are deleted. For dynamically provisioned snapshots, this field will automatically be filled in by the CSI snapshotter sidecar with the "DeletionPolicy" field defined in the corresponding VolumeSnapshotClass. For pre-existing snapshots, users MUST specify this field when creating the VolumeSnapshotContent object. Required. - enum: - - Delete - - Retain - type: string - driver: - description: driver is the name of the CSI driver used to create the physical snapshot on the underlying storage system. This MUST be the same as the name returned by the CSI GetPluginName() call for that driver. Required. - type: string - source: - description: source specifies whether the snapshot is (or should be) dynamically provisioned or already exists, and just requires a Kubernetes object representation. This field is immutable after creation. Required. - properties: - snapshotHandle: - description: snapshotHandle specifies the CSI "snapshot_id" of a pre-existing snapshot on the underlying storage system for which a Kubernetes object representation was (or should be) created. This field is immutable. - type: string - volumeHandle: - description: volumeHandle specifies the CSI "volume_id" of the volume from which a snapshot should be dynamically taken from. This field is immutable. - type: string - type: object - oneOf: - - required: ["snapshotHandle"] - - required: ["volumeHandle"] - volumeSnapshotClassName: - description: name of the VolumeSnapshotClass from which this snapshot was (or will be) created. Note that after provisioning, the VolumeSnapshotClass may be deleted or recreated with different set of values, and as such, should not be referenced post-snapshot creation. - type: string - volumeSnapshotRef: - description: volumeSnapshotRef specifies the VolumeSnapshot object to which this VolumeSnapshotContent object is bound. VolumeSnapshot.Spec.VolumeSnapshotContentName field must reference to this VolumeSnapshotContent's name for the bidirectional binding to be valid. For a pre-existing VolumeSnapshotContent object, name and namespace of the VolumeSnapshot object MUST be provided for binding to happen. This field is immutable after creation. Required. - properties: - apiVersion: - description: API version of the referent. - type: string - fieldPath: - description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.' - type: string - kind: - description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' - type: string - namespace: - description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' - type: string - resourceVersion: - description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' - type: string - uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' - type: string - type: object - required: - - deletionPolicy - - driver - - source - - volumeSnapshotRef - type: object - status: - description: status represents the current information of a snapshot. - properties: - creationTime: - description: creationTime is the timestamp when the point-in-time snapshot is taken by the underlying storage system. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "creation_time" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "creation_time" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. If not specified, it indicates the creation time is unknown. The format of this field is a Unix nanoseconds time encoded as an int64. On Unix, the command `date +%s%N` returns the current time in nanoseconds since 1970-01-01 00:00:00 UTC. - format: int64 - type: integer - error: - description: error is the last observed error during snapshot creation, if any. Upon success after retry, this error field will be cleared. - properties: - message: - description: 'message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information.' - type: string - time: - description: time is the timestamp when the error was encountered. - format: date-time - type: string - type: object - readyToUse: - description: readyToUse indicates if a snapshot is ready to be used to restore a volume. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "ready_to_use" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "ready_to_use" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it, otherwise, this field will be set to "True". If not specified, it means the readiness of a snapshot is unknown. - type: boolean - restoreSize: - description: restoreSize represents the complete size of the snapshot in bytes. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "size_bytes" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "size_bytes" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. When restoring a volume from this snapshot, the size of the volume MUST NOT be smaller than the restoreSize if it is specified, otherwise the restoration will fail. If not specified, it indicates that the size is unknown. - format: int64 - minimum: 0 - type: integer - snapshotHandle: - description: snapshotHandle is the CSI "snapshot_id" of a snapshot on the underlying storage system. If not specified, it indicates that dynamic snapshot creation has either failed or it is still in progress. - type: string - type: object - required: - - spec - type: object - served: true - storage: false - subresources: - status: {} - - additionalPrinterColumns: - - description: Indicates if the snapshot is ready to be used to restore a volume. - jsonPath: .status.readyToUse - name: ReadyToUse - type: boolean - - description: Represents the complete size of the snapshot in bytes - jsonPath: .status.restoreSize - name: RestoreSize - type: integer - - description: Determines whether this VolumeSnapshotContent and its physical snapshot on the underlying storage system should be deleted when its bound VolumeSnapshot is deleted. - jsonPath: .spec.deletionPolicy - name: DeletionPolicy - type: string - - description: Name of the CSI driver used to create the physical snapshot on the underlying storage system. - jsonPath: .spec.driver - name: Driver - type: string - - description: Name of the VolumeSnapshotClass to which this snapshot belongs. - jsonPath: .spec.volumeSnapshotClassName - name: VolumeSnapshotClass - type: string - - description: Name of the VolumeSnapshot object to which this VolumeSnapshotContent object is bound. - jsonPath: .spec.volumeSnapshotRef.name - name: VolumeSnapshot - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1beta1 - schema: - openAPIV3Schema: - description: VolumeSnapshotContent represents the actual "on-disk" snapshot object in the underlying storage system - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - spec: - description: spec defines properties of a VolumeSnapshotContent created by the underlying storage system. Required. - properties: - deletionPolicy: - description: deletionPolicy determines whether this VolumeSnapshotContent and its physical snapshot on the underlying storage system should be deleted when its bound VolumeSnapshot is deleted. Supported values are "Retain" and "Delete". "Retain" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are kept. "Delete" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are deleted. For dynamically provisioned snapshots, this field will automatically be filled in by the CSI snapshotter sidecar with the "DeletionPolicy" field defined in the corresponding VolumeSnapshotClass. For pre-existing snapshots, users MUST specify this field when creating the VolumeSnapshotContent object. Required. - enum: - - Delete - - Retain - type: string - driver: - description: driver is the name of the CSI driver used to create the physical snapshot on the underlying storage system. This MUST be the same as the name returned by the CSI GetPluginName() call for that driver. Required. - type: string - source: - description: source specifies whether the snapshot is (or should be) dynamically provisioned or already exists, and just requires a Kubernetes object representation. This field is immutable after creation. Required. - properties: - snapshotHandle: - description: snapshotHandle specifies the CSI "snapshot_id" of a pre-existing snapshot on the underlying storage system for which a Kubernetes object representation was (or should be) created. This field is immutable. - type: string - volumeHandle: - description: volumeHandle specifies the CSI "volume_id" of the volume from which a snapshot should be dynamically taken from. This field is immutable. - type: string - type: object - volumeSnapshotClassName: - description: name of the VolumeSnapshotClass from which this snapshot was (or will be) created. Note that after provisioning, the VolumeSnapshotClass may be deleted or recreated with different set of values, and as such, should not be referenced post-snapshot creation. - type: string - volumeSnapshotRef: - description: volumeSnapshotRef specifies the VolumeSnapshot object to which this VolumeSnapshotContent object is bound. VolumeSnapshot.Spec.VolumeSnapshotContentName field must reference to this VolumeSnapshotContent's name for the bidirectional binding to be valid. For a pre-existing VolumeSnapshotContent object, name and namespace of the VolumeSnapshot object MUST be provided for binding to happen. This field is immutable after creation. Required. - properties: - apiVersion: - description: API version of the referent. - type: string - fieldPath: - description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.' - type: string - kind: - description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' - type: string - namespace: - description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' - type: string - resourceVersion: - description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' - type: string - uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' - type: string - type: object - required: - - deletionPolicy - - driver - - source - - volumeSnapshotRef - type: object - status: - description: status represents the current information of a snapshot. - properties: - creationTime: - description: creationTime is the timestamp when the point-in-time snapshot is taken by the underlying storage system. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "creation_time" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "creation_time" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. If not specified, it indicates the creation time is unknown. The format of this field is a Unix nanoseconds time encoded as an int64. On Unix, the command `date +%s%N` returns the current time in nanoseconds since 1970-01-01 00:00:00 UTC. - format: int64 - type: integer - error: - description: error is the last observed error during snapshot creation, if any. Upon success after retry, this error field will be cleared. - properties: - message: - description: 'message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information.' - type: string - time: - description: time is the timestamp when the error was encountered. - format: date-time - type: string - type: object - readyToUse: - description: readyToUse indicates if a snapshot is ready to be used to restore a volume. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "ready_to_use" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "ready_to_use" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it, otherwise, this field will be set to "True". If not specified, it means the readiness of a snapshot is unknown. - type: boolean - restoreSize: - description: restoreSize represents the complete size of the snapshot in bytes. In dynamic snapshot creation case, this field will be filled in by the CSI snapshotter sidecar with the "size_bytes" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "size_bytes" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. When restoring a volume from this snapshot, the size of the volume MUST NOT be smaller than the restoreSize if it is specified, otherwise the restoration will fail. If not specified, it indicates that the size is unknown. - format: int64 - minimum: 0 - type: integer - snapshotHandle: - description: snapshotHandle is the CSI "snapshot_id" of a snapshot on the underlying storage system. If not specified, it indicates that dynamic snapshot creation has either failed or it is still in progress. - type: string - type: object - required: - - spec - type: object - served: true - storage: true - subresources: - status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshots.yaml b/charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshots.yaml deleted file mode 100644 index 13d89414..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/crds/volumesnapshots.yaml +++ /dev/null @@ -1,225 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.4.0 - api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/419" - creationTimestamp: null - name: volumesnapshots.snapshot.storage.k8s.io -spec: - group: snapshot.storage.k8s.io - names: - kind: VolumeSnapshot - listKind: VolumeSnapshotList - plural: volumesnapshots - singular: volumesnapshot - scope: Namespaced - versions: - - additionalPrinterColumns: - - description: Indicates if the snapshot is ready to be used to restore a volume. - jsonPath: .status.readyToUse - name: ReadyToUse - type: boolean - - description: If a new snapshot needs to be created, this contains the name of the source PVC from which this snapshot was (or will be) created. - jsonPath: .spec.source.persistentVolumeClaimName - name: SourcePVC - type: string - - description: If a snapshot already exists, this contains the name of the existing VolumeSnapshotContent object representing the existing snapshot. - jsonPath: .spec.source.volumeSnapshotContentName - name: SourceSnapshotContent - type: string - - description: Represents the minimum size of volume required to rehydrate from this snapshot. - jsonPath: .status.restoreSize - name: RestoreSize - type: string - - description: The name of the VolumeSnapshotClass requested by the VolumeSnapshot. - jsonPath: .spec.volumeSnapshotClassName - name: SnapshotClass - type: string - - description: Name of the VolumeSnapshotContent object to which the VolumeSnapshot object intends to bind to. Please note that verification of binding actually requires checking both VolumeSnapshot and VolumeSnapshotContent to ensure both are pointing at each other. Binding MUST be verified prior to usage of this object. - jsonPath: .status.boundVolumeSnapshotContentName - name: SnapshotContent - type: string - - description: Timestamp when the point-in-time snapshot was taken by the underlying storage system. - jsonPath: .status.creationTime - name: CreationTime - type: date - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1 - schema: - openAPIV3Schema: - description: VolumeSnapshot is a user's request for either creating a point-in-time snapshot of a persistent volume, or binding to a pre-existing snapshot. - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - spec: - description: 'spec defines the desired characteristics of a snapshot requested by a user. More info: https://kubernetes.io/docs/concepts/storage/volume-snapshots#volumesnapshots Required.' - properties: - source: - description: source specifies where a snapshot will be created from. This field is immutable after creation. Required. - properties: - persistentVolumeClaimName: - description: persistentVolumeClaimName specifies the name of the PersistentVolumeClaim object representing the volume from which a snapshot should be created. This PVC is assumed to be in the same namespace as the VolumeSnapshot object. This field should be set if the snapshot does not exists, and needs to be created. This field is immutable. - type: string - volumeSnapshotContentName: - description: volumeSnapshotContentName specifies the name of a pre-existing VolumeSnapshotContent object representing an existing volume snapshot. This field should be set if the snapshot already exists and only needs a representation in Kubernetes. This field is immutable. - type: string - type: object - oneOf: - - required: ["persistentVolumeClaimName"] - - required: ["volumeSnapshotContentName"] - volumeSnapshotClassName: - description: 'VolumeSnapshotClassName is the name of the VolumeSnapshotClass requested by the VolumeSnapshot. VolumeSnapshotClassName may be left nil to indicate that the default SnapshotClass should be used. A given cluster may have multiple default Volume SnapshotClasses: one default per CSI Driver. If a VolumeSnapshot does not specify a SnapshotClass, VolumeSnapshotSource will be checked to figure out what the associated CSI Driver is, and the default VolumeSnapshotClass associated with that CSI Driver will be used. If more than one VolumeSnapshotClass exist for a given CSI Driver and more than one have been marked as default, CreateSnapshot will fail and generate an event. Empty string is not allowed for this field.' - type: string - required: - - source - type: object - status: - description: status represents the current information of a snapshot. Consumers must verify binding between VolumeSnapshot and VolumeSnapshotContent objects is successful (by validating that both VolumeSnapshot and VolumeSnapshotContent point at each other) before using this object. - properties: - boundVolumeSnapshotContentName: - description: 'boundVolumeSnapshotContentName is the name of the VolumeSnapshotContent object to which this VolumeSnapshot object intends to bind to. If not specified, it indicates that the VolumeSnapshot object has not been successfully bound to a VolumeSnapshotContent object yet. NOTE: To avoid possible security issues, consumers must verify binding between VolumeSnapshot and VolumeSnapshotContent objects is successful (by validating that both VolumeSnapshot and VolumeSnapshotContent point at each other) before using this object.' - type: string - creationTime: - description: creationTime is the timestamp when the point-in-time snapshot is taken by the underlying storage system. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "creation_time" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "creation_time" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. If not specified, it may indicate that the creation time of the snapshot is unknown. - format: date-time - type: string - error: - description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurs during the snapshot creation. Upon success, this error field will be cleared. - properties: - message: - description: 'message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information.' - type: string - time: - description: time is the timestamp when the error was encountered. - format: date-time - type: string - type: object - readyToUse: - description: readyToUse indicates if the snapshot is ready to be used to restore a volume. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "ready_to_use" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "ready_to_use" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it, otherwise, this field will be set to "True". If not specified, it means the readiness of a snapshot is unknown. - type: boolean - restoreSize: - type: string - description: restoreSize represents the minimum size of volume required to create a volume from this snapshot. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "size_bytes" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "size_bytes" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. When restoring a volume from this snapshot, the size of the volume MUST NOT be smaller than the restoreSize if it is specified, otherwise the restoration will fail. If not specified, it indicates that the size is unknown. - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - required: - - spec - type: object - served: true - storage: false - subresources: - status: {} - - additionalPrinterColumns: - - description: Indicates if the snapshot is ready to be used to restore a volume. - jsonPath: .status.readyToUse - name: ReadyToUse - type: boolean - - description: If a new snapshot needs to be created, this contains the name of the source PVC from which this snapshot was (or will be) created. - jsonPath: .spec.source.persistentVolumeClaimName - name: SourcePVC - type: string - - description: If a snapshot already exists, this contains the name of the existing VolumeSnapshotContent object representing the existing snapshot. - jsonPath: .spec.source.volumeSnapshotContentName - name: SourceSnapshotContent - type: string - - description: Represents the minimum size of volume required to rehydrate from this snapshot. - jsonPath: .status.restoreSize - name: RestoreSize - type: string - - description: The name of the VolumeSnapshotClass requested by the VolumeSnapshot. - jsonPath: .spec.volumeSnapshotClassName - name: SnapshotClass - type: string - - description: Name of the VolumeSnapshotContent object to which the VolumeSnapshot object intends to bind to. Please note that verification of binding actually requires checking both VolumeSnapshot and VolumeSnapshotContent to ensure both are pointing at each other. Binding MUST be verified prior to usage of this object. - jsonPath: .status.boundVolumeSnapshotContentName - name: SnapshotContent - type: string - - description: Timestamp when the point-in-time snapshot was taken by the underlying storage system. - jsonPath: .status.creationTime - name: CreationTime - type: date - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1beta1 - schema: - openAPIV3Schema: - description: VolumeSnapshot is a user's request for either creating a point-in-time snapshot of a persistent volume, or binding to a pre-existing snapshot. - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - spec: - description: 'spec defines the desired characteristics of a snapshot requested by a user. More info: https://kubernetes.io/docs/concepts/storage/volume-snapshots#volumesnapshots Required.' - properties: - source: - description: source specifies where a snapshot will be created from. This field is immutable after creation. Required. - properties: - persistentVolumeClaimName: - description: persistentVolumeClaimName specifies the name of the PersistentVolumeClaim object representing the volume from which a snapshot should be created. This PVC is assumed to be in the same namespace as the VolumeSnapshot object. This field should be set if the snapshot does not exists, and needs to be created. This field is immutable. - type: string - volumeSnapshotContentName: - description: volumeSnapshotContentName specifies the name of a pre-existing VolumeSnapshotContent object representing an existing volume snapshot. This field should be set if the snapshot already exists and only needs a representation in Kubernetes. This field is immutable. - type: string - type: object - volumeSnapshotClassName: - description: 'VolumeSnapshotClassName is the name of the VolumeSnapshotClass requested by the VolumeSnapshot. VolumeSnapshotClassName may be left nil to indicate that the default SnapshotClass should be used. A given cluster may have multiple default Volume SnapshotClasses: one default per CSI Driver. If a VolumeSnapshot does not specify a SnapshotClass, VolumeSnapshotSource will be checked to figure out what the associated CSI Driver is, and the default VolumeSnapshotClass associated with that CSI Driver will be used. If more than one VolumeSnapshotClass exist for a given CSI Driver and more than one have been marked as default, CreateSnapshot will fail and generate an event. Empty string is not allowed for this field.' - type: string - required: - - source - type: object - status: - description: status represents the current information of a snapshot. Consumers must verify binding between VolumeSnapshot and VolumeSnapshotContent objects is successful (by validating that both VolumeSnapshot and VolumeSnapshotContent point at each other) before using this object. - properties: - boundVolumeSnapshotContentName: - description: 'boundVolumeSnapshotContentName is the name of the VolumeSnapshotContent object to which this VolumeSnapshot object intends to bind to. If not specified, it indicates that the VolumeSnapshot object has not been successfully bound to a VolumeSnapshotContent object yet. NOTE: To avoid possible security issues, consumers must verify binding between VolumeSnapshot and VolumeSnapshotContent objects is successful (by validating that both VolumeSnapshot and VolumeSnapshotContent point at each other) before using this object.' - type: string - creationTime: - description: creationTime is the timestamp when the point-in-time snapshot is taken by the underlying storage system. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "creation_time" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "creation_time" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. If not specified, it may indicate that the creation time of the snapshot is unknown. - format: date-time - type: string - error: - description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurs during the snapshot creation. Upon success, this error field will be cleared. - properties: - message: - description: 'message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information.' - type: string - time: - description: time is the timestamp when the error was encountered. - format: date-time - type: string - type: object - readyToUse: - description: readyToUse indicates if the snapshot is ready to be used to restore a volume. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "ready_to_use" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "ready_to_use" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it, otherwise, this field will be set to "True". If not specified, it means the readiness of a snapshot is unknown. - type: boolean - restoreSize: - type: string - description: restoreSize represents the minimum size of volume required to create a volume from this snapshot. In dynamic snapshot creation case, this field will be filled in by the snapshot controller with the "size_bytes" value returned from CSI "CreateSnapshot" gRPC call. For a pre-existing snapshot, this field will be filled with the "size_bytes" value returned from the CSI "ListSnapshots" gRPC call if the driver supports it. When restoring a volume from this snapshot, the size of the volume MUST NOT be smaller than the restoreSize if it is specified, otherwise the restoration will fail. If not specified, it indicates that the size is unknown. - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - required: - - spec - type: object - served: true - storage: true - subresources: - status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/charts/kubezero-storage/charts/lvm-localpv/templates/NOTES.txt b/charts/kubezero-storage/charts/lvm-localpv/templates/NOTES.txt deleted file mode 100644 index cc5aaf67..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/templates/NOTES.txt +++ /dev/null @@ -1,5 +0,0 @@ -The OpenEBS LVM LocalPV has been installed. Check its status by running: -$ kubectl get pods -n {{ .Release.Namespace }} -l role=openebs-lvm - -For more information, visit our Slack at https://openebs.io/community or view -the documentation online at http://docs.openebs.io/. diff --git a/charts/kubezero-storage/charts/lvm-localpv/templates/_helpers.tpl b/charts/kubezero-storage/charts/lvm-localpv/templates/_helpers.tpl deleted file mode 100644 index 6251921d..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/templates/_helpers.tpl +++ /dev/null @@ -1,138 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "lvmlocalpv.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified localpv provisioner name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "lvmlocalpv.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "lvmlocalpv.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - - -{{/* -Create the name of the service account for controller -*/}} -{{- define "lvmlocalpv.lvmController.serviceAccountName" -}} -{{- if .Values.serviceAccount.lvmController.create }} -{{- default (include "lvmlocalpv.fullname" .) .Values.serviceAccount.lvmController.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.lvmController.name }} -{{- end -}} -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "lvmlocalpv.lvmNode.serviceAccountName" -}} -{{- if .Values.serviceAccount.lvmNode.create }} -{{- default (include "lvmlocalpv.fullname" .) .Values.serviceAccount.lvmNode.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.lvmNode.name }} -{{- end -}} -{{- end -}} - -{{/* -Define meta labels for openebs lvm-localpv components -*/}} -{{- define "lvmlocalpv.common.metaLabels" -}} -chart: {{ template "lvmlocalpv.chart" . }} -heritage: {{ .Release.Service }} -openebs.io/version: {{ .Values.release.version | quote }} -role: {{ .Values.role | quote }} -{{- end -}} - -{{/* -Create match labels for openebs lvm-localpv controller -*/}} -{{- define "lvmlocalpv.lvmController.matchLabels" -}} -app: {{ .Values.lvmController.componentName | quote }} -release: {{ .Release.Name }} -component: {{ .Values.lvmController.componentName | quote }} -{{- end -}} - -{{/* -Create component labels for lvmlocalpv controller -*/}} -{{- define "lvmlocalpv.lvmController.componentLabels" -}} -openebs.io/component-name: {{ .Values.lvmController.componentName | quote }} -{{- end -}} - - -{{/* -Create labels for openebs lvm-localpv controller -*/}} -{{- define "lvmlocalpv.lvmController.labels" -}} -{{ include "lvmlocalpv.common.metaLabels" . }} -{{ include "lvmlocalpv.lvmController.matchLabels" . }} -{{ include "lvmlocalpv.lvmController.componentLabels" . }} -{{- end -}} - -{{/* -Create match labels for openebs lvm-localpv node daemon -*/}} -{{- define "lvmlocalpv.lvmNode.matchLabels" -}} -name: {{ .Values.lvmNode.componentName | quote }} -release: {{ .Release.Name }} -{{- end -}} - -{{/* -Create component labels openebs lvm-localpv node daemon -*/}} -{{- define "lvmlocalpv.lvmNode.componentLabels" -}} -openebs.io/component-name: {{ .Values.lvmNode.componentName | quote }} -{{- end -}} - - -{{/* -Create labels for openebs lvm-localpv node daemon -*/}} -{{- define "lvmlocalpv.lvmNode.labels" -}} -{{ include "lvmlocalpv.common.metaLabels" . }} -{{ include "lvmlocalpv.lvmNode.matchLabels" . }} -{{ include "lvmlocalpv.lvmNode.componentLabels" . }} -{{- end -}} - -{{/* -Create the name of the priority class for csi node plugin -*/}} -{{- define "lvmlocalpv.lvmNode.priorityClassName" -}} -{{- if .Values.lvmNode.priorityClass.create }} -{{- printf "%s-%s" .Release.Name .Values.lvmNode.priorityClass.name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s" .Values.lvmNode.priorityClass.name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} - -{{/* -Create the name of the priority class for csi controller plugin -*/}} -{{- define "lvmlocalpv.lvmController.priorityClassName" -}} -{{- if .Values.lvmController.priorityClass.create }} -{{- printf "%s-%s" .Release.Name .Values.lvmController.priorityClass.name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s" .Values.lvmController.priorityClass.name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} diff --git a/charts/kubezero-storage/charts/lvm-localpv/templates/csidriver.yaml b/charts/kubezero-storage/charts/lvm-localpv/templates/csidriver.yaml deleted file mode 100644 index 5eeac542..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/templates/csidriver.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# Create the CSI Driver object -apiVersion: storage.k8s.io/v1 -kind: CSIDriver -metadata: - name: local.csi.openebs.io -spec: - # do not require volumeattachment - attachRequired: false - podInfoOnMount: true - storageCapacity: {{ .Values.storageCapacity }} diff --git a/charts/kubezero-storage/charts/lvm-localpv/templates/lvm-controller.yaml b/charts/kubezero-storage/charts/lvm-localpv/templates/lvm-controller.yaml deleted file mode 100644 index 3571a939..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/templates/lvm-controller.yaml +++ /dev/null @@ -1,157 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "lvmlocalpv.fullname" . }}-controller - {{- with .Values.lvmController.annotations }} - annotations: {{ toYaml . | nindent 4 }} - {{- end }} - labels: - {{- include "lvmlocalpv.lvmController.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - {{- include "lvmlocalpv.lvmController.matchLabels" . | nindent 6 }} - serviceName: "{{ .Values.lvmController.serviceName }}" - replicas: {{ .Values.lvmController.replicas }} - template: - metadata: - {{- with .Values.lvmController.podAnnotations }} - annotations: {{ toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "lvmlocalpv.lvmController.labels" . | nindent 8 }} - {{- with .Values.lvmController.podLabels}} - {{ toYaml . | nindent 8 }} - {{- end}} - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - openebs-lvm-controller - topologyKey: "kubernetes.io/hostname" -{{- if .Values.lvmController.priorityClass.create }} - priorityClassName: {{ template "lvmlocalpv.lvmController.priorityClassName" . }} -{{- end }} - serviceAccount: {{ .Values.serviceAccount.lvmController.name }} - containers: - - name: {{ .Values.lvmController.resizer.name }} - image: "{{ .Values.lvmController.resizer.image.registry }}{{ .Values.lvmController.resizer.image.repository }}:{{ .Values.lvmController.resizer.image.tag }}" - args: - - "--v={{ .Values.lvmController.logLevel }}" - - "--csi-address=$(ADDRESS)" - {{- if gt (int .Values.lvmController.replicas) 1 }} - - "--leader-election" - {{- end }} - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - imagePullPolicy: {{ .Values.lvmController.resizer.image.pullPolicy }} - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - resources: - {{- toYaml .Values.lvmController.resources | nindent 12 }} - - name: {{ .Values.lvmController.snapshotter.name }} - image: "{{ .Values.lvmController.snapshotter.image.registry }}{{ .Values.lvmController.snapshotter.image.repository }}:{{ .Values.lvmController.snapshotter.image.tag }}" - imagePullPolicy: {{ .Values.lvmController.snapshotter.image.pullPolicy }} - args: - - "--csi-address=$(ADDRESS)" - {{- if gt (int .Values.lvmController.replicas) 1 }} - - "--leader-election" - {{- end }} - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - resources: - {{- toYaml .Values.lvmController.resources | nindent 12 }} - - name: {{ .Values.lvmController.snapshotController.name }} - image: "{{ .Values.lvmController.snapshotController.image.registry }}{{ .Values.lvmController.snapshotController.image.repository }}:{{ .Values.lvmController.snapshotController.image.tag }}" - args: - - "--v={{ .Values.lvmController.logLevel }}" - {{- if gt (int .Values.lvmController.replicas) 1 }} - - "--leader-election=true" - {{- end }} - imagePullPolicy: {{ .Values.lvmController.snapshotController.image.pullPolicy }} - resources: - {{- toYaml .Values.lvmController.resources | nindent 12 }} - - name: {{ .Values.lvmController.provisioner.name }} - image: "{{ .Values.lvmController.provisioner.image.registry }}{{ .Values.lvmController.provisioner.image.repository }}:{{ .Values.lvmController.provisioner.image.tag }}" - imagePullPolicy: {{ .Values.lvmController.provisioner.image.pullPolicy }} - args: - - "--csi-address=$(ADDRESS)" - - "--v={{ .Values.lvmController.logLevel }}" - - "--feature-gates=Topology=true" - - "--strict-topology" - {{- if gt (int .Values.lvmController.replicas) 1 }} - - "--leader-election" - {{- end }} - - "--enable-capacity={{ .Values.storageCapacity }}" - - "--extra-create-metadata=true" - - "--default-fstype=ext4" - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - resources: - {{- toYaml .Values.lvmController.resources | nindent 12 }} - - name: {{ .Values.lvmPlugin.name }} - image: "{{ .Values.lvmPlugin.image.registry }}{{ .Values.lvmPlugin.image.repository }}:{{ .Values.lvmPlugin.image.tag }}" - imagePullPolicy: {{ .Values.lvmPlugin.image.pullPolicy }} - env: - - name: OPENEBS_CONTROLLER_DRIVER - value: controller - - name: OPENEBS_CSI_ENDPOINT - value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock - - name: LVM_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: OPENEBS_IO_INSTALLER_TYPE - value: "lvm-localpv-helm" - - name: OPENEBS_IO_ENABLE_ANALYTICS - value: "{{ .Values.analytics.enabled }}" - args : - - "--endpoint=$(OPENEBS_CSI_ENDPOINT)" - - "--plugin=$(OPENEBS_CONTROLLER_DRIVER)" - volumeMounts: - - name: socket-dir - mountPath: /var/lib/csi/sockets/pluginproxy/ - resources: - {{- toYaml .Values.lvmController.resources | nindent 12 }} - volumes: - - name: socket-dir - emptyDir: {} -{{- if .Values.imagePullSecrets }} - imagePullSecrets: -{{ toYaml .Values.imagePullSecrets | indent 2 }} -{{- end }} -{{- if .Values.lvmController.nodeSelector }} - nodeSelector: -{{ toYaml .Values.lvmController.nodeSelector | indent 8 }} -{{- end }} -{{- if .Values.lvmController.securityContext }} - securityContext: -{{ toYaml .Values.lvmController.securityContext | indent 8 }} -{{- end }} -{{- if .Values.lvmController.tolerations }} - tolerations: -{{ toYaml .Values.lvmController.tolerations | indent 8 }} -{{- end }} diff --git a/charts/kubezero-storage/charts/lvm-localpv/templates/lvm-node-service.yaml b/charts/kubezero-storage/charts/lvm-localpv/templates/lvm-node-service.yaml deleted file mode 100644 index 34c1977e..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/templates/lvm-node-service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if .Values.lvmPlugin.metricsPort }} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "lvmlocalpv.fullname" . }}-node-service - labels: - {{- include "lvmlocalpv.lvmNode.labels" . | nindent 4 }} -spec: - clusterIP: None - ports: - - name: metrics - port: {{ .Values.lvmPlugin.metricsPort }} - targetPort: {{ .Values.lvmPlugin.metricsPort }} - selector: - {{- with .Values.lvmNode.podLabels }} - {{ toYaml . }} - {{- end }} -{{- end }} diff --git a/charts/kubezero-storage/charts/lvm-localpv/templates/lvm-node.yaml b/charts/kubezero-storage/charts/lvm-localpv/templates/lvm-node.yaml deleted file mode 100644 index 9c104113..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/templates/lvm-node.yaml +++ /dev/null @@ -1,156 +0,0 @@ -kind: DaemonSet -apiVersion: apps/v1 -metadata: - name: {{ template "lvmlocalpv.fullname" . }}-node - {{- with .Values.lvmNode.annotations }} - annotations: {{ toYaml . | nindent 4 }} - {{- end }} - labels: - {{- include "lvmlocalpv.lvmNode.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - {{- include "lvmlocalpv.lvmNode.matchLabels" . | nindent 6 }} - updateStrategy: - rollingUpdate: - maxUnavailable: 100% - type: RollingUpdate - template: - metadata: - {{- with .Values.lvmNode.podAnnotations }} - annotations: {{ toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "lvmlocalpv.lvmNode.labels" . | nindent 8 }} - {{- with .Values.lvmNode.podLabels}} - {{ toYaml . | nindent 8 }} - {{- end}} - spec: -{{- if .Values.lvmNode.priorityClass.create }} - priorityClassName: {{ template "lvmlocalpv.lvmNode.priorityClassName" . }} -{{- end }} - serviceAccount: {{ .Values.serviceAccount.lvmNode.name }} - hostNetwork: true - containers: - - name: {{ .Values.lvmNode.driverRegistrar.name }} - image: "{{ .Values.lvmNode.driverRegistrar.image.registry }}{{ .Values.lvmNode.driverRegistrar.image.repository }}:{{ .Values.lvmNode.driverRegistrar.image.tag }}" - imagePullPolicy: {{ .Values.lvmNode.driverRegistrar.image.pullPolicy }} - args: - - "--v={{ .Values.lvmNode.logLevel }}" - - "--csi-address=$(ADDRESS)" - - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)" - lifecycle: - preStop: - exec: - command: ["/bin/sh", "-c", "rm -rf /registration/lvm-localpv /registration/lvm-localpv-reg.sock"] - env: - - name: ADDRESS - value: /plugin/csi.sock - - name: DRIVER_REG_SOCK_PATH - value: {{ .Values.lvmNode.kubeletDir }}plugins/lvm-localpv/csi.sock - - name: KUBE_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: NODE_DRIVER - value: openebs-lvm - volumeMounts: - - name: plugin-dir - mountPath: /plugin - - name: registration-dir - mountPath: /registration - resources: - {{- toYaml .Values.lvmNode.resources | nindent 12 }} - - name: {{ .Values.lvmPlugin.name }} - securityContext: - privileged: true - allowPrivilegeEscalation: true - image: "{{ .Values.lvmPlugin.image.registry }}{{ .Values.lvmPlugin.image.repository }}:{{ .Values.lvmPlugin.image.tag }}" - imagePullPolicy: {{ .Values.lvmPlugin.image.pullPolicy }} - args: - - "--nodeid=$(OPENEBS_NODE_ID)" - - "--endpoint=$(OPENEBS_CSI_ENDPOINT)" - - "--plugin=$(OPENEBS_NODE_DRIVER)" - {{- if .Values.lvmPlugin.ioLimits.enabled }} - - "--setiolimits" - - "--container-runtime=$(CONTAINER_RUNTIME)" - - "--riops-per-gb=$(RIOPS_PER_GB)" - - "--wiops-per-gb=$(WIOPS_PER_GB)" - {{- end }} - {{- if .Values.lvmPlugin.metricsPort }} - - "--listen-address=$(METRICS_LISTEN_ADDRESS)" - {{- end }} - env: - - name: OPENEBS_NODE_ID - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: OPENEBS_CSI_ENDPOINT - value: unix:///plugin/csi.sock - - name: OPENEBS_NODE_DRIVER - value: agent - - name: LVM_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - {{- if .Values.lvmPlugin.ioLimits.enabled }} - - name: CONTAINER_RUNTIME - value: {{ .Values.lvmPlugin.ioLimits.containerRuntime }} - - name: RIOPS_PER_GB - value: {{ .Values.lvmPlugin.ioLimits.readIopsPerGB }} - - name: WIOPS_PER_GB - value: {{ .Values.lvmPlugin.ioLimits.writeIopsPerGB }} - {{- end }} - {{- if .Values.lvmPlugin.metricsPort }} - - name: METRICS_LISTEN_ADDRESS - value: :{{ .Values.lvmPlugin.metricsPort }} - {{- end }} - {{- if .Values.lvmPlugin.allowedTopologies }} - - name: ALLOWED_TOPOLOGIES - value: {{ .Values.lvmPlugin.allowedTopologies }} - {{- end }} - volumeMounts: - - name: plugin-dir - mountPath: /plugin - - name: device-dir - mountPath: /dev - - name: pods-mount-dir - mountPath: {{ .Values.lvmNode.kubeletDir }} - # needed so that any mounts setup inside this container are - # propagated back to the host machine. - mountPropagation: "Bidirectional" - resources: - {{- toYaml .Values.lvmNode.resources | nindent 12 }} - volumes: - - name: device-dir - hostPath: - path: /dev - type: Directory - - name: registration-dir - hostPath: - path: {{ .Values.lvmNode.kubeletDir }}plugins_registry/ - type: DirectoryOrCreate - - name: plugin-dir - hostPath: - path: {{ .Values.lvmNode.kubeletDir }}plugins/lvm-localpv/ - type: DirectoryOrCreate - - name: pods-mount-dir - hostPath: - path: {{ .Values.lvmNode.kubeletDir }} - type: Directory -{{- if .Values.imagePullSecrets }} - imagePullSecrets: -{{ toYaml .Values.imagePullSecrets | indent 2 }} -{{- end }} -{{- if .Values.lvmNode.nodeSelector }} - nodeSelector: -{{ toYaml .Values.lvmNode.nodeSelector | indent 8 }} -{{- end }} -{{- if .Values.lvmNode.securityContext }} - securityContext: -{{ toYaml .Values.lvmNode.securityContext | indent 8 }} -{{- end }} -{{- if .Values.lvmNode.tolerations }} - tolerations: -{{ toYaml .Values.lvmNode.tolerations | indent 8 }} -{{- end }} diff --git a/charts/kubezero-storage/charts/lvm-localpv/templates/priority-class.yaml b/charts/kubezero-storage/charts/lvm-localpv/templates/priority-class.yaml deleted file mode 100644 index 44552ab3..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/templates/priority-class.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- if .Values.lvmController.priorityClass.create }} -apiVersion: scheduling.k8s.io/v1 -kind: PriorityClass -metadata: - name: {{ template "lvmlocalpv.lvmController.priorityClassName" . }} -value: 900000000 -globalDefault: false -description: "This priority class should be used for the CStor CSI driver controller deployment only." -{{- end }} ---- -{{- if .Values.lvmNode.priorityClass.create }} -apiVersion: scheduling.k8s.io/v1 -kind: PriorityClass -metadata: - name: {{ template "lvmlocalpv.lvmNode.priorityClassName" . }} -value: 900001000 -globalDefault: false -description: "This priority class should be used for the CStor CSI driver node deployment only." -{{- end }} diff --git a/charts/kubezero-storage/charts/lvm-localpv/templates/psp.yaml b/charts/kubezero-storage/charts/lvm-localpv/templates/psp.yaml deleted file mode 100644 index 7472d7c6..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/templates/psp.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if .Values.rbac.pspEnabled }} -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: openebs-lvm-node-psp - labels: - {{- include "lvmlocalpv.lvmNode.labels" . | nindent 4 }} -spec: - privileged: true - allowPrivilegeEscalation: true - allowedCapabilities: ['*'] - volumes: ['*'] - hostNetwork: true - hostIPC: true - hostPID: true - runAsUser: - rule: 'RunAsAny' - seLinux: - rule: 'RunAsAny' - supplementalGroups: - rule: 'RunAsAny' - fsGroup: - rule: 'RunAsAny' -{{- end }} diff --git a/charts/kubezero-storage/charts/lvm-localpv/templates/rbac.yaml b/charts/kubezero-storage/charts/lvm-localpv/templates/rbac.yaml deleted file mode 100644 index 5f54948c..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/templates/rbac.yaml +++ /dev/null @@ -1,197 +0,0 @@ -{{- if .Values.serviceAccount.lvmController.create -}} -kind: ServiceAccount -apiVersion: v1 -metadata: - name: {{ .Values.serviceAccount.lvmController.name }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "lvmlocalpv.lvmController.labels" . | nindent 4 }} ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openebs-lvm-provisioner-role - labels: - {{- include "lvmlocalpv.lvmController.labels" . | nindent 4 }} -rules: - - apiGroups: [""] - resources: ["secrets"] - verbs: ["get", "list"] - - apiGroups: [""] - resources: ["namespaces"] - verbs: ["get", "list", "watch"] - - apiGroups: [""] - resources: ["persistentvolumes", "services"] - verbs: ["get", "list", "watch", "create", "delete", "update", "patch"] - - apiGroups: [""] - resources: ["persistentvolumeclaims"] - verbs: ["get", "list", "watch", "update"] - - apiGroups: [""] - resources: ["persistentvolumeclaims/status"] - verbs: ["update", "patch"] - - apiGroups: ["storage.k8s.io"] - resources: ["storageclasses", "csinodes"] - verbs: ["get", "list", "watch"] - - apiGroups: [ "storage.k8s.io" ] - resources: [ "csistoragecapacities"] - verbs: ["*"] - - apiGroups: [""] - resources: ["events"] - verbs: ["list", "watch", "create", "update", "patch"] - - apiGroups: ["coordination.k8s.io"] - resources: ["leases"] - verbs: ["get", "watch", "list", "delete", "update", "create"] - - apiGroups: [""] - resources: ["nodes"] - verbs: ["get", "list", "watch"] - - apiGroups: [""] - resources: ["pods"] - verbs: ["get", "list", "watch", "update", "patch"] - - apiGroups: ["local.openebs.io"] - resources: ["lvmvolumes", "lvmsnapshots", "lvmnodes"] - verbs: ["*"] ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openebs-lvm-provisioner-binding - labels: - {{- include "lvmlocalpv.lvmController.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ .Values.serviceAccount.lvmController.name }} - namespace: {{ .Release.Namespace }} -roleRef: - kind: ClusterRole - name: openebs-lvm-provisioner-role - apiGroup: rbac.authorization.k8s.io ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openebs-lvm-snapshotter-role - labels: - {{- include "lvmlocalpv.lvmController.labels" . | nindent 4 }} -rules: - - apiGroups: [""] - resources: ["persistentvolumes"] - verbs: ["get", "list", "watch"] - - apiGroups: [""] - resources: ["persistentvolumeclaims"] - verbs: ["get", "list", "watch"] - - apiGroups: ["storage.k8s.io"] - resources: ["storageclasses"] - verbs: ["get", "list", "watch"] - - apiGroups: [""] - resources: ["events"] - verbs: ["list", "watch", "create", "update", "patch"] - - apiGroups: [""] - resources: ["secrets"] - verbs: ["get", "list"] - - apiGroups: ["snapshot.storage.k8s.io"] - resources: ["volumesnapshotclasses"] - verbs: ["get", "list", "watch"] - - apiGroups: ["snapshot.storage.k8s.io"] - resources: ["volumesnapshotcontents"] - verbs: ["create", "get", "list", "watch", "update", "delete"] - - apiGroups: ["snapshot.storage.k8s.io"] - resources: ["volumesnapshots"] - verbs: ["get", "list", "watch", "update"] - - apiGroups: ["snapshot.storage.k8s.io"] - resources: ["volumesnapshotcontents/status"] - verbs: ["update"] - - apiGroups: ["snapshot.storage.k8s.io"] - resources: ["volumesnapshots/status"] - verbs: ["update"] - - apiGroups: ["apiextensions.k8s.io"] - resources: ["customresourcedefinitions"] - verbs: ["create", "list", "watch", "delete"] ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openebs-lvm-snapshotter-binding - labels: - {{- include "lvmlocalpv.lvmController.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ .Values.serviceAccount.lvmController.name }} - namespace: {{ .Release.Namespace }} -roleRef: - kind: ClusterRole - name: openebs-lvm-snapshotter-role - apiGroup: rbac.authorization.k8s.io ---- -{{- end }} -{{- if .Values.serviceAccount.lvmNode.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ .Values.serviceAccount.lvmNode.name }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "lvmlocalpv.lvmNode.labels" . | nindent 4 }} ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openebs-lvm-driver-registrar-role - labels: - {{- include "lvmlocalpv.lvmNode.labels" . | nindent 4 }} -rules: - - apiGroups: [""] - resources: ["events"] - verbs: ["get", "list", "watch", "create", "update", "patch"] - - apiGroups: [""] - resources: ["persistentvolumes", "nodes", "services"] - verbs: ["get", "list"] - - apiGroups: ["local.openebs.io"] - resources: ["lvmvolumes", "lvmsnapshots", "lvmnodes"] - verbs: ["get", "list", "watch", "create", "update", "patch"] ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openebs-lvm-driver-registrar-binding - labels: - {{- include "lvmlocalpv.lvmNode.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ .Values.serviceAccount.lvmNode.name }} - namespace: {{ .Release.Namespace }} -roleRef: - kind: ClusterRole - name: openebs-lvm-driver-registrar-role - apiGroup: rbac.authorization.k8s.io - -{{- if .Values.rbac.pspEnabled }} ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openebs-lvm-node-role - labels: - {{- include "lvmlocalpv.lvmNode.labels" . | nindent 4 }} -rules: -- apiGroups: ['policy'] - resources: ['podsecuritypolicies'] - verbs: ['use'] - resourceNames: - - openebs-lvm-node-psp ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: openebs-lvm-node-binding - labels: - {{- include "lvmlocalpv.lvmNode.labels" . | nindent 4 }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: openebs-lvm-node-role -subjects: - - kind: ServiceAccount - name: {{ .Values.serviceAccount.lvmNode.name }} - namespace: {{ $.Release.Namespace }} -{{- end }} -{{- end }} diff --git a/charts/kubezero-storage/charts/lvm-localpv/values.yaml b/charts/kubezero-storage/charts/lvm-localpv/values.yaml deleted file mode 100644 index b5a7549a..00000000 --- a/charts/kubezero-storage/charts/lvm-localpv/values.yaml +++ /dev/null @@ -1,169 +0,0 @@ -# Default values for openebs-lvmlocalpv. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. -release: - version: "0.8.0" - -imagePullSecrets: -# - name: "image-pull-secret" - -# enable storage capacity tracking feature -# Ref: https://kubernetes:io/docs/concepts/storage/storage-capacity -storageCapacity: true - -rbac: - # rbac.pspEnabled: `true` if PodSecurityPolicy resources should be created - pspEnabled: false - -# lvmNode contains the configurables for -# the lvm node daemonset -lvmNode: - componentName: openebs-lvm-node - driverRegistrar: - name: "csi-node-driver-registrar" - image: - # Make sure that registry name end with a '/'. - # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect - registry: k8s.gcr.io/ - repository: sig-storage/csi-node-driver-registrar - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: v2.3.0 - updateStrategy: - type: RollingUpdate - annotations: {} - podAnnotations: {} - # This can be configured to run on various different k8s distributions like - # microk8s where kubelet dir is different - kubeletDir: "/var/lib/kubelet/" - resources: {} -# limits: -# cpu: 10m -# memory: 32Mi -# requests: -# cpu: 10m -# memory: 32Mi - ## Labels to be added to openebs-lvm node pods - podLabels: {} - nodeSelector: {} - tolerations: [] - securityContext: {} - labels: {} - priorityClass: - create: true - name: lvm-localpv-csi-node-critical - logLevel: 5 - - -# lvmController contains the configurables for -# the lvm controller statefulset -lvmController: - componentName: openebs-lvm-controller - replicas: 1 - serviceName: openebs-lvm - logLevel: 5 - resizer: - name: "csi-resizer" - image: - # Make sure that registry name end with a '/'. - # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect - registry: k8s.gcr.io/ - repository: sig-storage/csi-resizer - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: v1.2.0 - snapshotter: - name: "csi-snapshotter" - image: - # Make sure that registry name end with a '/'. - # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect - registry: k8s.gcr.io/ - repository: sig-storage/csi-snapshotter - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: v4.0.0 - snapshotController: - name: "snapshot-controller" - image: - # Make sure that registry name end with a '/'. - # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect - registry: k8s.gcr.io/ - repository: sig-storage/snapshot-controller - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: v4.0.0 - provisioner: - name: "csi-provisioner" - image: - # Make sure that registry name end with a '/'. - # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect - registry: k8s.gcr.io/ - repository: sig-storage/csi-provisioner - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: v3.0.0 - updateStrategy: - type: RollingUpdate - annotations: {} - podAnnotations: {} - resources: {} -# limits: -# cpu: 10m -# memory: 32Mi -# requests: -# cpu: 10m -# memory: 32Mi - ## Labels to be added to openebs-lvm controller pods - podLabels: - name: openebs-lvm-controller - nodeSelector: {} - tolerations: [] - securityContext: {} - priorityClass: - create: true - name: lvm-localpv-csi-controller-critical - -# lvmPlugin is the common csi container used by the -# controller statefulset and node daemonset -lvmPlugin: - name: "openebs-lvm-plugin" - image: - # Make sure that registry name end with a '/'. - # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect - registry: - repository: openebs/lvm-driver - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: 0.8.0 - ioLimits: - enabled: false - containerRuntime: containerd - readIopsPerGB: "" - writeIopsPerGB: "" - # The TCP port number used for exposing lvm-metrics. - # If not set, service will not be created to expose metrics endpoint to serviceMonitor and listen-address flag will not be set. - metricsPort: 9500 - # Comma seperated list of k8s worker node topologies - allowedTopologies: "kubernetes.io/hostname," - -role: openebs-lvm - -crd: - enableInstall: true - -serviceAccount: - lvmController: - # Specifies whether a service account should be created - create: true - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: openebs-lvm-controller-sa - lvmNode: - # Specifies whether a service account should be created - create: true - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: openebs-lvm-node-sa - -analytics: - enabled: true diff --git a/charts/kubezero-storage/efs.patch b/charts/kubezero-storage/efs.patch index d5978c83..24dadc5d 100644 --- a/charts/kubezero-storage/efs.patch +++ b/charts/kubezero-storage/efs.patch @@ -1,14 +1,6 @@ diff -tubNr charts/aws-efs-csi-driver/templates/controller-deployment.yaml charts/aws-efs-csi-driver.zdt/templates/controller-deployment.yaml --- charts/aws-efs-csi-driver/templates/controller-deployment.yaml 2021-06-25 22:43:06.000000000 +0200 +++ charts/aws-efs-csi-driver.zdt/templates/controller-deployment.yaml 2021-07-15 00:37:28.960305011 +0200 -@@ -23,7 +23,6 @@ - annotations: {{- toYaml . | nindent 8 }} - {{- end }} - spec: -- hostNetwork: true - {{- if .Values.imagePullSecrets }} - imagePullSecrets: - {{- range .Values.imagePullSecrets }} @@ -57,9 +56,14 @@ env: - name: CSI_ENDPOINT diff --git a/charts/kubezero-storage/gemini.patch b/charts/kubezero-storage/gemini.patch index 59e2320e..26177f3f 100644 --- a/charts/kubezero-storage/gemini.patch +++ b/charts/kubezero-storage/gemini.patch @@ -6,7 +6,7 @@ diff -rtubN charts/gemini/templates/deployment.yaml charts/gemini.zdt/templates/ serviceAccountName: {{ .Values.rbac.serviceAccountName }} {{- end }} + nodeSelector: -+ node-role.kubernetes.io/master: "" ++ node-role.kubernetes.io/control-plane: "" + tolerations: + - effect: NoSchedule + key: node-role.kubernetes.io/master diff --git a/charts/kubezero-aws-efs-csi-driver/templates/efs_pvs.yaml b/charts/kubezero-storage/templates/efs_pvs.yaml similarity index 81% rename from charts/kubezero-aws-efs-csi-driver/templates/efs_pvs.yaml rename to charts/kubezero-storage/templates/efs_pvs.yaml index 39435189..552ba32e 100644 --- a/charts/kubezero-aws-efs-csi-driver/templates/efs_pvs.yaml +++ b/charts/kubezero-storage/templates/efs_pvs.yaml @@ -1,4 +1,5 @@ -{{- range .Values.PersistentVolumes }} +{{- if index .Values "aws-efs-csi-driver" "enabled" }} +{{- range ( index .Values "aws-efs-csi-driver" "PersistentVolumes" ) }} apiVersion: v1 kind: PersistentVolume metadata: @@ -26,3 +27,4 @@ spec: {{- end }} --- {{- end }} +{{- end }} diff --git a/charts/kubezero-storage/values.yaml b/charts/kubezero-storage/values.yaml index 8e46ff2a..132dc7f4 100644 --- a/charts/kubezero-storage/values.yaml +++ b/charts/kubezero-storage/values.yaml @@ -16,7 +16,7 @@ lvm-localpv: - key: node-role.kubernetes.io/master effect: NoSchedule nodeSelector: - node-role.kubernetes.io/master: "" + node-role.kubernetes.io/control-plane: "" storageClass: vgpattern: "" @@ -47,12 +47,13 @@ aws-ebs-csi-driver: logLevel: 2 nodeSelector: - node-role.kubernetes.io/master: "" + node-role.kubernetes.io/control-plane: "" tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule # k8sTagClusterId: + # region: #env: # ebsPlugin: @@ -108,7 +109,7 @@ aws-efs-csi-driver: - key: node-role.kubernetes.io/master effect: NoSchedule nodeSelector: - node-role.kubernetes.io/master: "" + node-role.kubernetes.io/control-plane: "" #extraEnv: #- name: AWS_ROLE_ARN @@ -143,14 +144,14 @@ aws-efs-csi-driver: storageClasses: - name: efs-sc -#PersistentVolumes: -# - name: example-pv -# mountOptions: -# - tls -# volumeHandle: ":/path" -# claimRef: -# name: foo-pvc -# namespace: foo -# -# - name: example-pv2 -# volumeHandle: ":/path2" + #PersistentVolumes: + # - name: example-pv + # mountOptions: + # - tls + # volumeHandle: ":/path" + # claimRef: + # name: foo-pvc + # namespace: foo + # + # - name: example-pv2 + # volumeHandle: ":/path2" diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml index ec9475b4..e7c5f712 100644 --- a/charts/kubezero/Chart.yaml +++ b/charts/kubezero/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero description: KubeZero - Root App of Apps chart type: application -version: 1.21.7-0 +version: 1.21.7-6 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero/README.md b/charts/kubezero/README.md index 4a926850..c2f29504 100644 --- a/charts/kubezero/README.md +++ b/charts/kubezero/README.md @@ -1,6 +1,6 @@ # kubezero -![Version: 1.21.7-0](https://img.shields.io/badge/Version-1.21.7--0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 1.21.7-6](https://img.shields.io/badge/Version-1.21.7--6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero - Root App of Apps chart @@ -30,11 +30,7 @@ Kubernetes: `>= 1.20.0` | argocd.enabled | bool | `false` | | | argocd.istio.enabled | bool | `false` | | | argocd.namespace | string | `"argocd"` | | -| argocd.targetRevision | string | `"0.8.7"` | | -| aws-ebs-csi-driver.enabled | bool | `false` | | -| aws-ebs-csi-driver.targetRevision | string | `"0.6.4"` | | -| aws-efs-csi-driver.enabled | bool | `false` | | -| aws-efs-csi-driver.targetRevision | string | `"0.4.2"` | | +| argocd.targetRevision | string | `"0.8.8"` | | | cert-manager.enabled | bool | `false` | | | cert-manager.namespace | string | `"cert-manager"` | | | cert-manager.targetRevision | string | `"0.7.3"` | | @@ -44,8 +40,6 @@ Kubernetes: `>= 1.20.0` | istio.enabled | bool | `false` | | | istio.namespace | string | `"istio-system"` | | | istio.targetRevision | string | `"0.7.5"` | | -| kiam.enabled | bool | `false` | | -| kiam.targetRevision | string | `"0.3.5"` | | | kubezero.defaultTargetRevision | string | `"*"` | | | kubezero.gitSync | object | `{}` | | | kubezero.repoURL | string | `"https://cdn.zero-downtime.net/charts"` | | @@ -62,7 +56,7 @@ Kubernetes: `>= 1.20.0` | network.retain | bool | `true` | | | network.targetRevision | string | `"0.1.0"` | | | storage.enabled | bool | `false` | | -| storage.targetRevision | string | `"0.3.2"` | | +| storage.targetRevision | string | `"0.4.2"` | | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0) diff --git a/charts/kubezero/templates/aws-ebs-csi-driver.yaml b/charts/kubezero/templates/aws-ebs-csi-driver.yaml deleted file mode 100644 index a797f6ff..00000000 --- a/charts/kubezero/templates/aws-ebs-csi-driver.yaml +++ /dev/null @@ -1,20 +0,0 @@ -{{- define "aws-ebs-csi-driver-values" }} -aws-ebs-csi-driver: - controller: - replicaCount: {{ ternary 2 1 .Values.HighAvailableControlplane }} - k8sTagClusterId: {{ .Values.ClusterName }} - env: - ebsPlugin: - - name: AWS_ROLE_ARN - value: {{ index .Values "aws-ebs-csi-driver" "IamArn" | quote }} - - name: AWS_WEB_IDENTITY_TOKEN_FILE - value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" - - name: AWS_STS_REGIONAL_ENDPOINTS - value: regional -{{- end }} - - -{{- define "aws-ebs-csi-driver-argo" }} -{{- end }} - -{{ include "kubezero-app.app" . }} diff --git a/charts/kubezero/templates/aws-efs-csi-driver.yaml b/charts/kubezero/templates/aws-efs-csi-driver.yaml deleted file mode 100644 index 1d5f8080..00000000 --- a/charts/kubezero/templates/aws-efs-csi-driver.yaml +++ /dev/null @@ -1,22 +0,0 @@ -{{- define "aws-efs-csi-driver-values" }} -aws-efs-csi-driver: - controller: - extraEnv: - - name: AWS_ROLE_ARN - value: {{ index .Values "aws-efs-csi-driver" "IamArn" | quote }} - - name: AWS_WEB_IDENTITY_TOKEN_FILE - value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" - - name: AWS_STS_REGIONAL_ENDPOINTS - value: regional -{{- with index .Values "aws-efs-csi-driver" "PersistentVolumes" }} -PersistentVolumes: -{{- toYaml . | nindent 2 }} -{{- end }} - -{{- end }} - - -{{- define "aws-efs-csi-driver-argo" }} -{{- end }} - -{{ include "kubezero-app.app" . }} diff --git a/charts/kubezero/templates/storage.yaml b/charts/kubezero/templates/storage.yaml index 9e65f991..6b53fc5c 100644 --- a/charts/kubezero/templates/storage.yaml +++ b/charts/kubezero/templates/storage.yaml @@ -10,6 +10,34 @@ gemini: {{- toYaml . | nindent 2 }} {{- end }} +aws-ebs-csi-driver: + enabled: {{ default false (index .Values "storage" "aws-ebs-csi-driver" "enabled")}} + controller: + replicaCount: {{ ternary 2 1 .Values.HighAvailableControlplane }} + k8sTagClusterId: {{ .Values.ClusterName }} + env: + - name: AWS_ROLE_ARN + value: {{ index .Values "storage" "aws-ebs-csi-driver" "IamArn" | quote }} + - name: AWS_WEB_IDENTITY_TOKEN_FILE + value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" + - name: AWS_STS_REGIONAL_ENDPOINTS + value: regional + +aws-efs-csi-driver: + enabled: {{ default false (index .Values "storage" "aws-efs-csi-driver" "enabled")}} + controller: + extraEnv: + - name: AWS_ROLE_ARN + value: {{ index .Values "storage" "aws-efs-csi-driver" "IamArn" | quote }} + - name: AWS_WEB_IDENTITY_TOKEN_FILE + value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" + - name: AWS_STS_REGIONAL_ENDPOINTS + value: regional + {{- with index .Values "storage" "aws-efs-csi-driver" "PersistentVolumes" }} + PersistentVolumes: + {{- toYaml . | nindent 4 }} + {{- end }} + {{- end }} {{- define "storage-argo" }} diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml index fe1c8b49..f56a405d 100644 --- a/charts/kubezero/values.yaml +++ b/charts/kubezero/values.yaml @@ -20,19 +20,12 @@ cert-manager: namespace: cert-manager targetRevision: 0.7.3 +# deprecated - removed with 1.22 kiam: enabled: false targetRevision: 0.3.5 storage: - enabled: false - targetRevision: 0.3.2 - -aws-ebs-csi-driver: - enabled: false - targetRevision: 0.6.4 - -aws-efs-csi-driver: enabled: false targetRevision: 0.4.2 @@ -62,6 +55,6 @@ logging: argocd: enabled: false namespace: argocd - targetRevision: 0.8.7 + targetRevision: 0.8.8 istio: enabled: false