fix: shorten kubezero-lib names, tweaks

1 month ago · d41e82ff08
parent 2b0597125f
commit d41e82ff08
44 changed files with 163 additions and 80 deletions
--- a/charts/kubezero-addons/Chart.yaml
+++ b/charts/kubezero-addons/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-addons
 description: KubeZero umbrella chart for various optional cluster addons
 type: application
-version: 0.7.1
+version: 0.7.2
 appVersion: v1.24
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
@ -12,13 +12,15 @@ keywords:
  - neuron-device-plugin
  - nvidia-device-plugin
  - aws-node-termination-handler
+  - cluster-autoscaler
+  - sealed-secrets
  - external-dns
 maintainers:
  - name: Stefan Reimer
    email: stefan@zero-downtime.net
 dependencies:
  - name: aws-node-termination-handler
-    version: 0.20.0
+    version: 0.20.1
    # repository: https://aws.github.io/eks-charts
    condition: aws-node-termination-handler.enabled
  - name: external-dns
@ -34,4 +36,8 @@ dependencies:
    # https://github.com/NVIDIA/k8s-device-plugin
    repository: https://nvidia.github.io/k8s-device-plugin
    condition: nvidia-device-plugin.enabled
+  - name: sealed-secrets
+    version: 2.7.1
+    repository: https://bitnami-labs.github.io/sealed-secrets
+    condition: sealed-secrets.enabled
 kubeVersion: ">= 1.24.0"
--- a/charts/kubezero-addons/README.md
+++ b/charts/kubezero-addons/README.md
@ -1,6 +1,6 @@
 # kubezero-addons

-![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.24](https://img.shields.io/badge/AppVersion-v1.24-informational?style=flat-square)
+![Version: 0.7.2](https://img.shields.io/badge/Version-0.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.24](https://img.shields.io/badge/AppVersion-v1.24-informational?style=flat-square)

 KubeZero umbrella chart for various optional cluster addons

@ -18,7 +18,8 @@ Kubernetes: `>= 1.24.0`

 | Repository | Name | Version |
 |------------|------|---------|
-|  | aws-node-termination-handler | 0.20.0 |
+|  | aws-node-termination-handler | 0.20.1 |
+| https://bitnami-labs.github.io/sealed-secrets | sealed-secrets | 2.7.1 |
 | https://kubernetes-sigs.github.io/external-dns/ | external-dns | 1.11.0 |
 | https://kubernetes.github.io/autoscaler | cluster-autoscaler | 9.21.0 |
 | https://nvidia.github.io/k8s-device-plugin | nvidia-device-plugin | 0.12.3 |
@ -123,3 +124,15 @@ Device plugin for [AWS Neuron](https://aws.amazon.com/machine-learning/neuron/)
 | nvidia-device-plugin.tolerations[1].effect | string | `"NoSchedule"` |  |
 | nvidia-device-plugin.tolerations[1].key | string | `"kubezero-workergroup"` |  |
 | nvidia-device-plugin.tolerations[1].operator | string | `"Exists"` |  |
+| sealed-secrets.enabled | bool | `false` |  |
+| sealed-secrets.fullnameOverride | string | `"sealed-secrets-controller"` |  |
+| sealed-secrets.keyrenewperiod | int | `0` |  |
+| sealed-secrets.metrics.serviceMonitor.enabled | bool | `false` |  |
+| sealed-secrets.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` |  |
+| sealed-secrets.resources.limits.memory | string | `"128Mi"` |  |
+| sealed-secrets.resources.requests.cpu | string | `"10m"` |  |
+| sealed-secrets.resources.requests.memory | string | `"24Mi"` |  |
+| sealed-secrets.tolerations[0].effect | string | `"NoSchedule"` |  |
+| sealed-secrets.tolerations[0].key | string | `"node-role.kubernetes.io/master"` |  |
+| sealed-secrets.tolerations[1].effect | string | `"NoSchedule"` |  |
+| sealed-secrets.tolerations[1].key | string | `"node-role.kubernetes.io/control-plane"` |  |
--- a/charts/kubezero-addons/charts/aws-node-termination-handler/Chart.yaml
+++ b/charts/kubezero-addons/charts/aws-node-termination-handler/Chart.yaml
@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.18.0
+appVersion: 1.18.1
 description: A Helm chart for the AWS Node Termination Handler.
 home: https://github.com/aws/eks-charts
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
@ -22,4 +22,4 @@ sources:
 - https://github.com/aws/aws-node-termination-handler/
 - https://github.com/aws/eks-charts/
 type: application
-version: 0.20.0
+version: 0.20.1
--- a/charts/kubezero-addons/values.yaml
+++ b/charts/kubezero-addons/values.yaml
@ -24,6 +24,34 @@ forseti:
    # -- "arn:aws:iam::${AWS::AccountId}:role/${AWS::Region}.${ClusterName}.kubezeroForseti"
    iamRoleArn: ""

+sealed-secrets:
+  enabled: false
+
+  # ensure kubeseal default values match
+  fullnameOverride: sealed-secrets-controller
+
+  # Disable auto keyrotation for now
+  keyrenewperiod: 0
+
+  resources:
+    requests:
+      cpu: 10m
+      memory: 24Mi
+    limits:
+      memory: 128Mi
+
+  metrics:
+    serviceMonitor:
+      enabled: false
+
+  nodeSelector:
+    node-role.kubernetes.io/control-plane: ""
+  tolerations:
+  - key: node-role.kubernetes.io/master
+    effect: NoSchedule
+  - key: node-role.kubernetes.io/control-plane
+    effect: NoSchedule
+
 aws-node-termination-handler:
  enabled: false

--- a/charts/kubezero-argocd/Chart.yaml
+++ b/charts/kubezero-argocd/Chart.yaml
@ -14,7 +14,7 @@ maintainers:
 # Url: https://github.com/argoproj/argo-helm/tree/main/charts
 dependencies:
  - name: kubezero-lib
-    version: ">= 0.1.5"
+    version: ">= 0.1.6"
    repository: https://cdn.zero-downtime.net/charts/
  - name: argo-cd
    version: 5.16.1
--- a/charts/kubezero-argocd/README.md
+++ b/charts/kubezero-argocd/README.md
@ -21,7 +21,7 @@ Kubernetes: `>= 1.24.0`
 | https://argoproj.github.io/argo-helm | argo-cd | 5.16.1 |
 | https://argoproj.github.io/argo-helm | argocd-apps | 0.0.4 |
 | https://argoproj.github.io/argo-helm | argocd-image-updater | 0.8.1 |
-| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
+| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |

 ## Values

--- a/charts/kubezero-auth/Chart.yaml
+++ b/charts/kubezero-auth/Chart.yaml
@ -2,8 +2,8 @@ apiVersion: v2
 name: kubezero-auth
 description: KubeZero umbrella chart for all things Authentication and Identity management
 type: application
-version: 0.3.3
-appVersion: 20.0.0
+version: 0.3.4
+appVersion: 20.0.2
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@ -14,7 +14,7 @@ maintainers:
    email: stefan@zero-downtime.net
 dependencies:
  - name: kubezero-lib
-    version: ">= 0.1.5"
+    version: ">= 0.1.6"
    repository: https://cdn.zero-downtime.net/charts/
  - name: postgresql
    version: 11.8.1
--- a/charts/kubezero-auth/README.md
+++ b/charts/kubezero-auth/README.md
@ -1,6 +1,6 @@
 # kubezero-auth

-![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 20.0.0](https://img.shields.io/badge/AppVersion-20.0.0-informational?style=flat-square)
+![Version: 0.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 20.0.2](https://img.shields.io/badge/AppVersion-20.0.2-informational?style=flat-square)

 KubeZero umbrella chart for all things Authentication and Identity management

@ -18,7 +18,7 @@ Kubernetes: `>= 1.20.0`

 | Repository | Name | Version |
 |------------|------|---------|
-| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
+| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
 | https://charts.bitnami.com/bitnami | postgresql | 11.8.1 |

 # Keycloak
--- a/charts/kubezero-auth/dashboards-keycloak.yaml
+++ b/charts/kubezero-auth/dashboards-keycloak.yaml
@ -1,4 +1,4 @@
-configmap: grafana-dashboards-keycloak
+configmap: grafana-dashboards
 condition: '.Values.keycloak.metrics.enabled'
 gzip: true
 # folder: 
--- a/charts/kubezero-auth/templates/keycloak/grafana-dashboards.yaml
+++ b/charts/kubezero-auth/templates/keycloak/grafana-dashboards.yaml
@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboards-keycloak" | trunc 63 | trimSuffix "-" }}
+  name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboards" | trunc 63 | trimSuffix "-" }}
  namespace: {{ .Release.Namespace }}
  labels:
    grafana_dashboard: "1"
--- a/charts/kubezero-auth/templates/keycloak/operator.yaml
+++ b/charts/kubezero-auth/templates/keycloak/operator.yaml
@ -4,20 +4,20 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  annotations:
-    app.quarkus.io/build-timestamp: 2022-11-01 - 13:22:44 +0000
+    app.quarkus.io/build-timestamp: 2022-12-13 - 14:29:14 +0000
  labels:
    app.kubernetes.io/name: keycloak-operator
-    app.kubernetes.io/version: 20.0.0
+    app.kubernetes.io/version: 20.0.2
  name: keycloak-operator
 ---
 apiVersion: v1
 kind: Service
 metadata:
  annotations:
-    app.quarkus.io/build-timestamp: 2022-11-01 - 13:22:44 +0000
+    app.quarkus.io/build-timestamp: 2022-12-13 - 14:29:14 +0000
  labels:
    app.kubernetes.io/name: keycloak-operator
-    app.kubernetes.io/version: 20.0.0
+    app.kubernetes.io/version: 20.0.2
  name: keycloak-operator
 spec:
  ports:
@ -26,7 +26,7 @@ spec:
      targetPort: 8080
  selector:
    app.kubernetes.io/name: keycloak-operator
-    app.kubernetes.io/version: 20.0.0
+    app.kubernetes.io/version: 20.0.2
  type: ClusterIP
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@ -179,24 +179,24 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  annotations:
-    app.quarkus.io/build-timestamp: 2022-11-01 - 13:22:44 +0000
+    app.quarkus.io/build-timestamp: 2022-12-13 - 14:29:14 +0000
  labels:
    app.kubernetes.io/name: keycloak-operator
-    app.kubernetes.io/version: 20.0.0
+    app.kubernetes.io/version: 20.0.2
  name: keycloak-operator
 spec:
  replicas: 1
  selector:
    matchLabels:
      app.kubernetes.io/name: keycloak-operator
-      app.kubernetes.io/version: 20.0.0
+      app.kubernetes.io/version: 20.0.2
  template:
    metadata:
      annotations:
-        app.quarkus.io/build-timestamp: 2022-11-01 - 13:22:44 +0000
+        app.quarkus.io/build-timestamp: 2022-12-13 - 14:29:14 +0000
      labels:
        app.kubernetes.io/name: keycloak-operator
-        app.kubernetes.io/version: 20.0.0
+        app.kubernetes.io/version: 20.0.2
    spec:
      containers:
        - env:
@ -205,8 +205,8 @@ spec:
                fieldRef:
                  fieldPath: metadata.namespace
            - name: OPERATOR_KEYCLOAK_IMAGE
-              value: quay.io/keycloak/keycloak:20.0.0
-          image: quay.io/keycloak/keycloak-operator:20.0.0
+              value: quay.io/keycloak/keycloak:20.0.2
+          image: quay.io/keycloak/keycloak-operator:20.0.2
          imagePullPolicy: Always
          livenessProbe:
            failureThreshold: 3
--- a/charts/kubezero-cert-manager/Chart.yaml
+++ b/charts/kubezero-cert-manager/Chart.yaml
@ -13,7 +13,7 @@ maintainers:
    email: stefan@zero-downtime.net
 dependencies:
  - name: kubezero-lib
-    version: ">= 0.1.5"
+    version: ">= 0.1.6"
    repository: https://cdn.zero-downtime.net/charts/
  - name: cert-manager
    version: 1.9.1
--- a/charts/kubezero-cert-manager/README.md
+++ b/charts/kubezero-cert-manager/README.md
@ -18,7 +18,7 @@ Kubernetes: `>= 1.24.0`

 | Repository | Name | Version |
 |------------|------|---------|
-| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
+| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
 | https://charts.jetstack.io | cert-manager | 1.9.1 |

 ## AWS - OIDC IAM roles
--- a/charts/kubezero-cert-manager/dashboards.yaml
+++ b/charts/kubezero-cert-manager/dashboards.yaml
@ -1,4 +1,4 @@
-configmap: cert-manager-grafana-dashboard
+configmap: grafana-dashboard
 gzip: true
 folder: KubeZero
 condition: 'index .Values "cert-manager" "prometheus" "servicemonitor" "enabled"'
--- a/charts/kubezero-cert-manager/jsonnetfile.lock.json
+++ b/charts/kubezero-cert-manager/jsonnetfile.lock.json
@ -18,7 +18,7 @@
          "subdir": "contrib/mixin"
        }
      },
-      "version": "b872757492ca70f350abd44eb95d81b95339f581",
+      "version": "f1842b6ecf67a8102766cc914eaa2a8c7ad97314",
      "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
    },
    {
@ -28,8 +28,8 @@
          "subdir": "grafonnet"
        }
      },
-      "version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
-      "sum": "gF8foHByYcB25jcUOBqP6jxk0OPifQMjPvKY0HaCk6w="
+      "version": "30280196507e0fe6fa978a3e0eaca3a62844f817",
+      "sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc="
    },
    {
      "source": {
@ -38,8 +38,8 @@
          "subdir": "grafana-builder"
        }
      },
-      "version": "5fb2525651cc6e5100e081b10ad9fbe7e3595231",
-      "sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
+      "version": "15484ab1cb78eb7588e6b79ac52fc04e63f552b4",
+      "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
    },
    {
      "source": {
@ -48,8 +48,8 @@
          "subdir": ""
        }
      },
-      "version": "b538a10c89508f8d12885680cca72a134d3127f5",
-      "sum": "GLt5T2k4RKg36Gfcaf9qlTfVumDitqotVD0ipz/bPJ4="
+      "version": "ab104c5c406b91078d676475c14ab18644f84f2d",
+      "sum": "tRpIInEClWUNe5IS6uIjucFN/KqDFgg19+yo78VrLfU="
    },
    {
      "source": {
@ -58,7 +58,7 @@
          "subdir": "lib/promgrafonnet"
        }
      },
-      "version": "62ad10fe9ceb53c6b846871997abbfe8e0bd7cf5",
+      "version": "3c386687c1f8ceb6b79ff887c4a934e9cee1b90a",
      "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
    },
    {
@ -88,8 +88,8 @@
          "subdir": "jsonnet/kube-prometheus"
        }
      },
-      "version": "125fb56d7495e20f504e1537ae949e8261a2f812",
-      "sum": "QwH53kTe1jWCeXmQe7+U1PBs/a1p4MCTEW3B8IiIxeo="
+      "version": "e7eff18e7e70d7f1168105521451c4d7bd6a6d96",
+      "sum": "gcgf9y8wos4W8jgcJKuTDfORYDigCxx+q3QOYEijQFo="
    },
    {
      "source": {
--- a/charts/kubezero-cert-manager/templates/grafana-dashboards.yaml
+++ b/charts/kubezero-cert-manager/templates/grafana-dashboards.yaml
@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "cert-manager-grafana-dashboard" | trunc 63 | trimSuffix "-" }}
+  name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboard" | trunc 63 | trimSuffix "-" }}
  namespace: {{ .Release.Namespace }}
  labels:
    grafana_dashboard: "1"
--- a/charts/kubezero-cert-manager/templates/prometheus-rules.yaml
+++ b/charts/kubezero-cert-manager/templates/prometheus-rules.yaml
@ -1,4 +1,3 @@
-{{- if index .Values "cert-manager" "prometheus" "servicemonitor" "enabled" }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
@ -51,4 +50,4 @@ spec:
      for: 5m
      labels:
        severity: critical
-{{- end }}
+
--- a/charts/kubezero-ci/Chart.yaml
+++ b/charts/kubezero-ci/Chart.yaml
@ -15,7 +15,7 @@ maintainers:
    email: stefan@zero-downtime.net
 dependencies:
  - name: kubezero-lib
-    version: ">= 0.1.5"
+    version: ">= 0.1.6"
    repository: https://cdn.zero-downtime.net/charts/
  - name: gocd
    version: 1.40.8
--- a/charts/kubezero-ci/README.md
+++ b/charts/kubezero-ci/README.md
@ -19,7 +19,7 @@ Kubernetes: `>= 1.20.0`
 | Repository | Name | Version |
 |------------|------|---------|
 | https://aquasecurity.github.io/helm-charts/ | trivy | 0.4.17 |
-| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
+| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
 | https://charts.jenkins.io | jenkins | 4.2.13 |
 | https://dl.gitea.io/charts/ | gitea | 6.0.3 |
 | https://gocd.github.io/helm-chart | gocd | 1.40.8 |
--- a/charts/kubezero-istio/Chart.yaml
+++ b/charts/kubezero-istio/Chart.yaml
@ -13,7 +13,7 @@ maintainers:
    email: stefan@zero-downtime.net
 dependencies:
  - name: kubezero-lib
-    version: ">= 0.1.5"
+    version: ">= 0.1.6"
    repository: https://cdn.zero-downtime.net/charts/
  - name: base
    version: 1.16.1
--- a/charts/kubezero-istio/README.md
+++ b/charts/kubezero-istio/README.md
@ -20,7 +20,7 @@ Kubernetes: `>= 1.24.0`

 | Repository | Name | Version |
 |------------|------|---------|
-| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
+| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
 | https://istio-release.storage.googleapis.com/charts | base | 1.16.1 |
 | https://istio-release.storage.googleapis.com/charts | istiod | 1.16.1 |
 | https://kiali.org/helm-charts | kiali-server | 1.60.0 |
@ -32,7 +32,7 @@ Kubernetes: `>= 1.24.0`
 | global.defaultPodDisruptionBudget.enabled | bool | `false` |  |
 | global.logAsJson | bool | `true` |  |
 | global.priorityClassName | string | `"system-cluster-critical"` |  |
-| global.tag | string | `"1.14.4-distroless"` |  |
+| global.variant | string | `"distroless"` |  |
 | istiod.meshConfig.accessLogEncoding | string | `"JSON"` |  |
 | istiod.meshConfig.accessLogFile | string | `"/dev/stdout"` |  |
 | istiod.meshConfig.tcpKeepalive.interval | string | `"60s"` |  |
--- a/charts/kubezero-lib/Chart.yaml
+++ b/charts/kubezero-lib/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-lib
 description: KubeZero helm library - common helm functions and blocks
 type: library
-version: 0.1.5
+version: 0.1.6
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
--- a/charts/kubezero-lib/templates/_helpers.tpl
+++ b/charts/kubezero-lib/templates/_helpers.tpl
@ -13,7 +13,7 @@ Common naming functions
 {{- if .subchart }}
 {{- $name = default .subchart .Values.nameOverride -}}
 {{- end -}}
-{{- if contains $name .Release.Name -}}
+{{- if or (contains $name .Release.Name) (contains $name (printf "%s-%s" "kubezero" .Release.Name)) -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
--- a/charts/kubezero-logging/Chart.yaml
+++ b/charts/kubezero-logging/Chart.yaml
@ -17,7 +17,7 @@ maintainers:
    email: stefan@zero-downtime.net
 dependencies:
  - name: kubezero-lib
-    version: ">= 0.1.5"
+    version: ">= 0.1.6"
    repository: https://cdn.zero-downtime.net/charts/
  - name: eck-operator
    version: 2.4.0
--- a/charts/kubezero-logging/README.md
+++ b/charts/kubezero-logging/README.md
@ -21,7 +21,7 @@ Kubernetes: `>= 1.24.0`
 |  | eck-operator | 2.4.0 |
 |  | fluent-bit | 0.20.6 |
 |  | fluentd | 0.3.9 |
-| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
+| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |

 ## Changes from upstream
 ### ECK
--- a/charts/kubezero-metrics/Chart.yaml
+++ b/charts/kubezero-metrics/Chart.yaml
@ -15,7 +15,7 @@ maintainers:
    email: stefan@zero-downtime.net
 dependencies:
  - name: kubezero-lib
-    version: ">= 0.1.5"
+    version: ">= 0.1.6"
    repository: https://cdn.zero-downtime.net/charts/
    # https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack
  - name: kube-prometheus-stack
--- a/charts/kubezero-metrics/README.md
+++ b/charts/kubezero-metrics/README.md
@ -19,7 +19,7 @@ Kubernetes: `>= 1.24.0`
 | Repository | Name | Version |
 |------------|------|---------|
 |  | kube-prometheus-stack | 42.2.1 |
-| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
+| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
 | https://prometheus-community.github.io/helm-charts | prometheus-adapter | 3.4.2 |
 | https://prometheus-community.github.io/helm-charts | prometheus-pushgateway | 2.0.2 |

--- a/charts/kubezero-metrics/jsonnet/jsonnetfile.lock.json
+++ b/charts/kubezero-metrics/jsonnet/jsonnetfile.lock.json
@ -18,7 +18,7 @@
          "subdir": "contrib/mixin"
        }
      },
-      "version": "127e9c05b0c1405d0ab395b899939430226e76ff",
+      "version": "f1842b6ecf67a8102766cc914eaa2a8c7ad97314",
      "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
    },
    {
@ -48,7 +48,7 @@
          "subdir": "grafana-builder"
        }
      },
-      "version": "e6a0083d9cc0f0ec79507397ce0e156d558f6efb",
+      "version": "ae961c84758825e4e3fd7b70a3b391ffec76e4ae",
      "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
    },
    {
--- a/charts/kubezero-mq/Chart.yaml
+++ b/charts/kubezero-mq/Chart.yaml
@ -15,7 +15,7 @@ maintainers:
    email: stefan@zero-downtime.net
 dependencies:
  - name: kubezero-lib
-    version: ">= 0.1.5"
+    version: ">= 0.1.6"
    repository: https://cdn.zero-downtime.net/charts/
  - name: nats
    version: 0.8.4
--- a/charts/kubezero-mq/README.md
+++ b/charts/kubezero-mq/README.md
@ -19,7 +19,7 @@ Kubernetes: `>= 1.20.0`
 | Repository | Name | Version |
 |------------|------|---------|
 |  | nats | 0.8.4 |
-| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
+| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
 | https://charts.bitnami.com/bitnami | rabbitmq | 11.1.5 |
 | https://charts.bitnami.com/bitnami | rabbitmq-cluster-operator | 3.1.4 |

--- a/charts/kubezero-redis/Chart.yaml
+++ b/charts/kubezero-redis/Chart.yaml
@ -14,7 +14,7 @@ maintainers:
    email: stefan@zero-downtime.net
 dependencies:
  - name: kubezero-lib
-    version: ">= 0.1.4"
+    version: ">= 0.1.6"
    repository: https://cdn.zero-downtime.net/charts/
  - name: redis
    version: 16.10.1
--- a/charts/kubezero-redis/README.md
+++ b/charts/kubezero-redis/README.md
@ -18,7 +18,7 @@ Kubernetes: `>= 1.20.0`

 | Repository | Name | Version |
 |------------|------|---------|
-| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 |
+| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
 | https://charts.bitnami.com/bitnami | redis | 16.10.1 |
 | https://charts.bitnami.com/bitnami | redis-cluster | 7.6.1 |

--- a/charts/kubezero-storage/Chart.yaml
+++ b/charts/kubezero-storage/Chart.yaml
@ -17,7 +17,7 @@ maintainers:
    email: stefan@zero-downtime.net
 dependencies:
  - name: kubezero-lib
-    version: ">= 0.1.5"
+    version: ">= 0.1.6"
    repository: https://cdn.zero-downtime.net/charts/
  - name: lvm-localpv
    version: 1.0.0
--- a/charts/kubezero-storage/README.md
+++ b/charts/kubezero-storage/README.md
@ -21,7 +21,7 @@ Kubernetes: `>= 1.24.0`
 |  | aws-efs-csi-driver | 2.3.2 |
 |  | gemini | 1.0.0 |
 |  | lvm-localpv | 1.0.0 |
-| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
+| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
 | https://kubernetes-sigs.github.io/aws-ebs-csi-driver | aws-ebs-csi-driver | 2.13.0 |

 ## Values
@ -118,7 +118,7 @@ Kubernetes: `>= 1.24.0`
 | lvm-localpv.prometheus.enabled | bool | `false` |  |
 | lvm-localpv.storageClass.default | bool | `false` |  |
 | lvm-localpv.storageClass.vgpattern | string | `""` |  |
-| snapshotController.enabled | bool | `true` |  |
+| snapshotController.enabled | bool | `false` |  |
 | snapshotController.logLevel | int | `2` |  |
 | snapshotController.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` |  |
 | snapshotController.replicas | int | `1` |  |
--- a/charts/kubezero-storage/crds/volumesnapshotclasses.yaml
+++ b/charts/kubezero-storage/crds/volumesnapshotclasses.yaml
@ -1,4 +1,4 @@
-{{- if .Values.snapshotController.enabled }}
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@ -108,4 +108,5 @@ status:
    plural: ""
  conditions: []
  storedVersions: []
-{{- end }}
+
+
--- a/charts/kubezero-storage/crds/volumesnapshotcontents.yaml
+++ b/charts/kubezero-storage/crds/volumesnapshotcontents.yaml
@ -1,4 +1,4 @@
-{{- if .Values.snapshotController.enabled }}
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@ -289,4 +289,3 @@ status:
    plural: ""
  conditions: []
  storedVersions: []
-{{- end }}
--- a/charts/kubezero-storage/jsonnet/dashboards.yaml
+++ b/charts/kubezero-storage/jsonnet/dashboards.yaml
@ -1,4 +1,4 @@
-configmap: openebs-lvmlocalpv-grafana-dashboard
+configmap: grafana-dashboard-lvmlocalpv
 gzip: true
 folder: KubeZero
 condition: 'index .Values "lvm-localpv" "prometheus" "enabled"'
--- a/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json
+++ b/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json
@ -18,7 +18,7 @@
          "subdir": "contrib/mixin"
        }
      },
-      "version": "c2378be1b552663ac6c5278148aefbeb281b7228",
+      "version": "f1842b6ecf67a8102766cc914eaa2a8c7ad97314",
      "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
    },
    {
@ -38,7 +38,7 @@
          "subdir": "grafana-builder"
        }
      },
-      "version": "fd5379a1fba2d572fc314a0395dd61e7df335948",
+      "version": "ae961c84758825e4e3fd7b70a3b391ffec76e4ae",
      "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
    },
    {
@ -58,7 +58,7 @@
          "subdir": "lib/promgrafonnet"
        }
      },
-      "version": "05a58f765eda05902d4f7dd22098a2b870f7ca1e",
+      "version": "3c386687c1f8ceb6b79ff887c4a934e9cee1b90a",
      "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
    },
    {
--- a/charts/kubezero-storage/templates/lvm/grafana-dashboards.yaml
+++ b/charts/kubezero-storage/templates/lvm/grafana-dashboards.yaml
@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "openebs-lvmlocalpv-grafana-dashboard" | trunc 63 | trimSuffix "-" }}
+  name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboard-lvmlocalpv" | trunc 63 | trimSuffix "-" }}
  namespace: {{ .Release.Namespace }}
  labels:
    grafana_dashboard: "1"
--- a/charts/kubezero/README.md
+++ b/charts/kubezero/README.md
@ -30,7 +30,8 @@ Kubernetes: `>= 1.24.0`
 | addons.enabled | bool | `true` |  |
 | addons.external-dns.enabled | bool | `false` |  |
 | addons.forseti.enabled | bool | `false` |  |
-| addons.targetRevision | string | `"0.7.1"` |  |
+| addons.sealed-secrets.enabled | bool | `false` |  |
+| addons.targetRevision | string | `"0.7.2"` |  |
 | argocd.argocd-image-updater.enabled | bool | `false` |  |
 | argocd.enabled | bool | `false` |  |
 | argocd.istio.enabled | bool | `false` |  |
@ -73,6 +74,8 @@ Kubernetes: `>= 1.24.0`
 | storage.aws-ebs-csi-driver.enabled | bool | `false` |  |
 | storage.aws-efs-csi-driver.enabled | bool | `false` |  |
 | storage.enabled | bool | `false` |  |
+| storage.gemini.enabled | bool | `false` |  |
+| storage.snapshotController.enabled | bool | `false` |  |
 | storage.targetRevision | string | `"0.7.4"` |  |

 ----------------------------------------------
--- a/charts/kubezero/templates/addons.yaml
+++ b/charts/kubezero/templates/addons.yaml
@ -146,6 +146,17 @@ nvidia-device-plugin:
  {{- toYaml . | nindent 2 }}
 {{- end }}

+{{- with index .Values "addons" "sealed-secrets" }}
+sealed-secrets:
+  {{- toYaml . | nindent 2 }}
+
+  {{- with $.Values.metrics }}
+  metrics:
+    serviceMonitor:
+      enabled: {{ .enabled }}
+  {{- end }}
+{{- end }}
+
 {{- end }}

 {{- define "addons-argo" }}
--- a/charts/kubezero/templates/storage.yaml
+++ b/charts/kubezero/templates/storage.yaml
@ -12,6 +12,14 @@ gemini:
  {{- toYaml . | nindent 2 }}
 {{- end }}

+{{- with .Values.storage.velero }}
+velero:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+
+snapshotController:
+  enabled: {{ default false (or (index .Values "storage" "velero" "enabled") (index .Values "storage" "gemini" "enabled")) }}
+
 aws-ebs-csi-driver:
  enabled: {{ default false (index .Values "storage" "aws-ebs-csi-driver" "enabled")}}
  controller:
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@ -10,7 +10,7 @@ global:

 addons:
  enabled: true
-  targetRevision: 0.7.1
+  targetRevision: 0.7.2
  external-dns:
    enabled: false
  forseti:
@ -21,6 +21,8 @@ addons:
    enabled: false
  cluster-autoscaler:
    enabled: false
+  sealed-secrets:
+    enabled: false

 network:
  enabled: true
@ -41,6 +43,12 @@ storage:
    enabled: false
  aws-efs-csi-driver:
    enabled: false
+  velero:
+    enabled: false
+  gemini:
+    enabled: false
+  snapshotController:
+    enabled: false

 istio:
  enabled: false
--- a/scripts/update_helm.sh
+++ b/scripts/update_helm.sh
@ -5,16 +5,23 @@ CHARTS=${1:-'.*'}

 SRCROOT="$(cd "$(dirname "$0")/.." && pwd)"

+helm repo update
+
 for dir in $(find -L $SRCROOT/charts -mindepth 1 -maxdepth 1 -type d);
 do
    name=$(basename $dir)
    [[ $name =~ $CHARTS ]] || continue
-    if [ $(helm dep list $dir 2>/dev/null| wc -l) -gt 1 ]
-    then
-        echo "Processing chart dependencies"
-        rm -rf $dir/tmpcharts
-        rm -rf $dir/charts/*.tgz
-        helm dependency update --skip-refresh $dir
+
+    if [ -x $dir/update.sh ]; then
+        { cd $dir && ./update.sh; }
+    else
+        if [ $(helm dep list $dir 2>/dev/null| wc -l) -gt 1 ]
+        then
+            echo "Processing chart dependencies"
+            rm -rf $dir/tmpcharts
+            rm -rf $dir/charts/*.tgz
+            helm dependency update --skip-refresh $dir
+        fi
    fi

    echo "Processing $dir"