From 2f29a9b7f87474f2de4eaebdb86e6d338a4bbba5 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 20 Apr 2022 11:21:04 +0200 Subject: [PATCH] feat: storage modules version bumps, Gemini snapshot for 1.22 --- charts/kubezero-storage/Chart.yaml | 6 +++--- .../charts/aws-ebs-csi-driver/CHANGELOG.md | 4 ++++ .../charts/aws-ebs-csi-driver/Chart.yaml | 4 ++-- .../templates/poddisruptionbudget-controller.yaml | 4 ++++ .../charts/aws-ebs-csi-driver/values.yaml | 2 +- charts/kubezero-storage/charts/lvm-localpv/Chart.yaml | 4 ++-- charts/kubezero-storage/charts/lvm-localpv/README.md | 2 +- .../kubezero-storage/charts/lvm-localpv/values.yaml | 4 ++-- charts/kubezero-storage/jsonnet/Makefile | 4 +++- charts/kubezero-storage/jsonnet/build.sh | 1 + charts/kubezero-storage/jsonnet/config.libsonnet | 4 ++-- charts/kubezero-storage/jsonnet/jsonnetfile.lock.json | 10 +++++----- charts/kubezero-storage/jsonnet/rules-fix.patch | 11 +++++++++++ 13 files changed, 41 insertions(+), 19 deletions(-) create mode 120000 charts/kubezero-storage/jsonnet/build.sh create mode 100644 charts/kubezero-storage/jsonnet/rules-fix.patch diff --git a/charts/kubezero-storage/Chart.yaml b/charts/kubezero-storage/Chart.yaml index 79e0901d..02c208f0 100644 --- a/charts/kubezero-storage/Chart.yaml +++ b/charts/kubezero-storage/Chart.yaml @@ -20,15 +20,15 @@ dependencies: version: ">= 0.1.4" repository: https://cdn.zero-downtime.net/charts/ - name: lvm-localpv - version: 0.8.6 + version: 0.9.0 condition: lvm-localpv.enabled # repository: https://openebs.github.io/lvm-localpv - name: gemini - version: 0.0.8 + version: 1.0.0 condition: gemini.enabled # repository: https://charts.fairwinds.com/stable - name: aws-ebs-csi-driver - version: 2.6.4 + version: 2.6.5 condition: aws-ebs-csi-driver.enabled # repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver - name: aws-efs-csi-driver 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 9ec008dd..cb7acf0b 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,9 @@ # Helm chart +## v2.6.5 + +* Bump app/driver to version `v1.5.3` + ## v2.6.4 * Remove exposure all secrets to external-snapshotter-role 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 a57b5157..ad05206f 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.5.1 +appVersion: 1.5.3 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.6.4 +version: 2.6.5 diff --git a/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-controller.yaml b/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-controller.yaml index f6241fad..6bbd1b28 100644 --- a/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-controller.yaml +++ b/charts/kubezero-storage/charts/aws-ebs-csi-driver/templates/poddisruptionbudget-controller.yaml @@ -1,4 +1,8 @@ +{{- if .Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" }} +apiVersion: policy/v1 +{{- else }} apiVersion: policy/v1beta1 +{{- end }} kind: PodDisruptionBudget metadata: name: ebs-csi-controller 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 c5d3c2ac..2a9d6344 100644 --- a/charts/kubezero-storage/charts/aws-ebs-csi-driver/values.yaml +++ b/charts/kubezero-storage/charts/aws-ebs-csi-driver/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: - repository: k8s.gcr.io/provider-aws/aws-ebs-csi-driver + repository: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver # Overrides the image tag whose default is v{{ .Chart.AppVersion }} tag: "" pullPolicy: IfNotPresent diff --git a/charts/kubezero-storage/charts/lvm-localpv/Chart.yaml b/charts/kubezero-storage/charts/lvm-localpv/Chart.yaml index 1ff285f7..9b024063 100644 --- a/charts/kubezero-storage/charts/lvm-localpv/Chart.yaml +++ b/charts/kubezero-storage/charts/lvm-localpv/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.8.3 +appVersion: 0.9.0 description: CSI Driver for dynamic provisioning of LVM Persistent Local Volumes. home: http://www.openebs.io/ icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png @@ -20,4 +20,4 @@ maintainers: name: lvm-localpv sources: - https://github.com/openebs/lvm-localpv -version: 0.8.6 +version: 0.9.0 diff --git a/charts/kubezero-storage/charts/lvm-localpv/README.md b/charts/kubezero-storage/charts/lvm-localpv/README.md index f792b1d6..0a065488 100644 --- a/charts/kubezero-storage/charts/lvm-localpv/README.md +++ b/charts/kubezero-storage/charts/lvm-localpv/README.md @@ -100,7 +100,7 @@ helm install openebs-lvmlocalpv openebs-lvmlocalpv/lvm-localpv --namespace opene | `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.3`| +| `lvmPlugin.image.tag`| Image tag for openebs-lvm-plugin| `0.9.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/`| diff --git a/charts/kubezero-storage/charts/lvm-localpv/values.yaml b/charts/kubezero-storage/charts/lvm-localpv/values.yaml index e664eed8..a87ecad5 100644 --- a/charts/kubezero-storage/charts/lvm-localpv/values.yaml +++ b/charts/kubezero-storage/charts/lvm-localpv/values.yaml @@ -2,7 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. release: - version: "0.8.3" + version: "0.9.0" imagePullSecrets: # - name: "image-pull-secret" @@ -135,7 +135,7 @@ lvmPlugin: repository: openebs/lvm-driver pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: 0.8.3 + tag: 0.9.0 ioLimits: enabled: false containerRuntime: containerd diff --git a/charts/kubezero-storage/jsonnet/Makefile b/charts/kubezero-storage/jsonnet/Makefile index eb4d2df0..ba159e20 100644 --- a/charts/kubezero-storage/jsonnet/Makefile +++ b/charts/kubezero-storage/jsonnet/Makefile @@ -16,7 +16,9 @@ fmt: find . -name 'vendor' -prune -o -name '*.libsonnet' -print -o -name '*.jsonnet' -print | \ xargs -n 1 -- $(JSONNET_FMT) -i -generate: clean +generate: clean build.sh + bash build.sh $< + patch -p0 -i rules-fix.patch jsonnet -J vendor -m rules -e '(import "prometheusRules.libsonnet")' jsonnet -J vendor -m dashboards -e '(import "dashboards.libsonnet")' diff --git a/charts/kubezero-storage/jsonnet/build.sh b/charts/kubezero-storage/jsonnet/build.sh new file mode 120000 index 00000000..35ff8f39 --- /dev/null +++ b/charts/kubezero-storage/jsonnet/build.sh @@ -0,0 +1 @@ +../../kubezero-metrics/jsonnet/build.sh \ No newline at end of file diff --git a/charts/kubezero-storage/jsonnet/config.libsonnet b/charts/kubezero-storage/jsonnet/config.libsonnet index 20e03ce3..097e0a61 100644 --- a/charts/kubezero-storage/jsonnet/config.libsonnet +++ b/charts/kubezero-storage/jsonnet/config.libsonnet @@ -3,7 +3,7 @@ dashboards+: { cStor: false, jiva: false, - localPV: false, + localPV: false, lvmLocalPV: true, deviceLocalPV: false, zfsLocalPV: false, @@ -13,7 +13,7 @@ alertRules+: { cStor: false, jiva: false, - localPV: false, + localPV: false, lvmLocalPV: true, deviceLocalPV: false, zfsLocalPV: false, diff --git a/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json b/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json index 4b07926b..87e021f9 100644 --- a/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json +++ b/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "fa191c64bd3c3eaa6cc167e837d7a73e3b7d7c72", + "version": "b872757492ca70f350abd44eb95d81b95339f581", "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc=" }, { @@ -38,7 +38,7 @@ "subdir": "grafana-builder" } }, - "version": "03d32a72a2a0bf0ee00ffc853be5f07ad3bafcbe", + "version": "5fb2525651cc6e5100e081b10ad9fbe7e3595231", "sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc=" }, { @@ -58,7 +58,7 @@ "subdir": "lib/promgrafonnet" } }, - "version": "177bc8ec789fa049a9585713d232035b159f8c92", + "version": "62ad10fe9ceb53c6b846871997abbfe8e0bd7cf5", "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps=" }, { @@ -98,8 +98,8 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "c8db3c85db6e13b94726b7c5d630a6ebe7038cf9", - "sum": "7DfVEg2kDzIQPgxTThnjQ4S2ZksrF0hkNLysXP6Wv24=" + "version": "452aaed72e36acb31cae93cfa85a5d9c3d3d2ec7", + "sum": "pupXEvlRbhLdEO9b8LfFZB66+Z7fEqvRZ9m3MyEvsv4=" }, { "source": { diff --git a/charts/kubezero-storage/jsonnet/rules-fix.patch b/charts/kubezero-storage/jsonnet/rules-fix.patch new file mode 100644 index 00000000..d3c84451 --- /dev/null +++ b/charts/kubezero-storage/jsonnet/rules-fix.patch @@ -0,0 +1,11 @@ +# https://github.com/openebs/monitoring/issues/98 +--- vendor/github.com/openebs/monitoring/jsonnet/openebs-mixin/rules/prometheus-rules.libsonnet.orig 2022-04-20 11:16:33.096498884 +0200 ++++ vendor/github.com/openebs/monitoring/jsonnet/openebs-mixin/rules/prometheus-rules.libsonnet 2022-04-20 11:16:49.831051800 +0200 +@@ -23,6 +23,6 @@ + local prometheusRules = self, + _config+:: param, + prometheusRules+:: +- cstor(prometheusRules._config).prometheusRules.cStor + jiva(prometheusRules._config).prometheusRules.jiva + lvmLocalPV(prometheusRules._config).prometheusRules.lvmlocalpv + volume(prometheusRules._config).prometheusRules.volume ++ cstor(prometheusRules._config).prometheusRules.cStor + jiva(prometheusRules._config).prometheusRules.jiva + lvmLocalPV(prometheusRules._config).prometheusRules.lvmLocalPV + volume(prometheusRules._config).prometheusRules.volume + + npd(prometheusRules._config).prometheusRules.npd, + }