From ba10c14c0d6b5caafaa272e59817f4d1e08256b4 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 3 Dec 2021 22:16:22 +0100 Subject: [PATCH] chore: move helm repo to S3/CDN --- charts/clamav/Chart.yaml | 2 +- charts/kubezero-addons/Chart.yaml | 2 +- .../templates/cluster-backup/cronjob.yaml | 3 +++ charts/kubezero-addons/values.yaml | 10 +++++++--- charts/kubezero-argocd/Chart.yaml | 2 +- charts/kubezero-argocd/README.md | 4 ++-- charts/kubezero-argocd/values.yaml | 2 +- charts/kubezero-aws-ebs-csi-driver/Chart.yaml | 2 +- charts/kubezero-aws-ebs-csi-driver/README.md | 2 +- charts/kubezero-aws-efs-csi-driver/Chart.yaml | 2 +- charts/kubezero-aws-efs-csi-driver/README.md | 9 ++++++--- charts/kubezero-cert-manager/Chart.yaml | 2 +- charts/kubezero-cert-manager/README.md | 2 +- charts/kubezero-ci/Chart.yaml | 9 +++++++-- charts/kubezero-ci/values.yaml | 3 +++ charts/kubezero-istio-ingress/Chart.yaml | 2 +- charts/kubezero-istio-ingress/README.md | 2 +- charts/kubezero-istio/Chart.yaml | 2 +- charts/kubezero-istio/README.md | 2 +- charts/kubezero-kiam/Chart.yaml | 2 +- charts/kubezero-kiam/README.md | 7 +++++-- charts/kubezero-lib/Chart.yaml | 2 +- charts/kubezero-logging/Chart.yaml | 2 +- charts/kubezero-logging/README.md | 6 +++--- charts/kubezero-metrics/Chart.yaml | 2 +- charts/kubezero-metrics/README.md | 10 ++++++++-- .../templates/istio-authorization-policy.yaml | 2 +- charts/kubezero-metrics/values.yaml | 10 +++++++++- charts/kubezero-mq/Chart.yaml | 2 +- charts/kubezero-mq/README.md | 10 ++++++---- charts/kubezero-redis/Chart.yaml | 8 ++++---- charts/kubezero-redis/README.md | 18 ++++++++---------- charts/kubezero-sql/Chart.yaml | 2 +- charts/kubezero-sql/README.md | 6 +++--- charts/uptime-kuma/Chart.yaml | 2 +- 35 files changed, 95 insertions(+), 60 deletions(-) diff --git a/charts/clamav/Chart.yaml b/charts/clamav/Chart.yaml index 4b5e4399..1eddb2ec 100644 --- a/charts/clamav/Chart.yaml +++ b/charts/clamav/Chart.yaml @@ -14,5 +14,5 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.4" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ kubeVersion: ">= 1.18.0" diff --git a/charts/kubezero-addons/Chart.yaml b/charts/kubezero-addons/Chart.yaml index 9cabf833..d9601e3e 100644 --- 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.2.1 +version: 0.2.2 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero-addons/templates/cluster-backup/cronjob.yaml b/charts/kubezero-addons/templates/cluster-backup/cronjob.yaml index d4262b45..97bb5292 100644 --- a/charts/kubezero-addons/templates/cluster-backup/cronjob.yaml +++ b/charts/kubezero-addons/templates/cluster-backup/cronjob.yaml @@ -36,6 +36,9 @@ spec: secretKeyRef: name: kubezero-backup-restic key: password + {{- with .Values.clusterBackup.extraEnv }} + {{- toYaml . | nindent 12 }} + {{- end }} #securityContext: # readOnlyRootFilesystem: true hostNetwork: true diff --git a/charts/kubezero-addons/values.yaml b/charts/kubezero-addons/values.yaml index e6f30f63..a976824a 100644 --- a/charts/kubezero-addons/values.yaml +++ b/charts/kubezero-addons/values.yaml @@ -7,13 +7,20 @@ clusterBackup: repository: "" password: "" + extraEnv: [] aws-node-termination-handler: enabled: false fullnameOverride: "aws-node-termination-handler" + # -- "aws-node-termination-handler/${ClusterName}" + managedAsgTag: "aws-node-termination-handler/managed" + enableSqsTerminationDraining: true + deleteLocalData: true + ignoreDaemonSets: true + taintNode: true # -- https://sqs.${AWS::Region}.amazonaws.com/${AWS::AccountId}/${ClusterName}_Nth queueURL: "" @@ -25,9 +32,6 @@ aws-node-termination-handler: AWS_WEB_IDENTITY_TOKEN_FILE: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" AWS_STS_REGIONAL_ENDPOINTS: "regional" - deleteLocalData: true - taintNode: true - enablePrometheusServer: false podMonitor: create: false diff --git a/charts/kubezero-argocd/Chart.yaml b/charts/kubezero-argocd/Chart.yaml index 691db11b..79644932 100644 --- a/charts/kubezero-argocd/Chart.yaml +++ b/charts/kubezero-argocd/Chart.yaml @@ -13,7 +13,7 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.4" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ - name: argo-cd version: 3.26.5 repository: https://argoproj.github.io/argo-helm diff --git a/charts/kubezero-argocd/README.md b/charts/kubezero-argocd/README.md index 7c5ca3f8..4e369ea4 100644 --- a/charts/kubezero-argocd/README.md +++ b/charts/kubezero-argocd/README.md @@ -1,6 +1,6 @@ # kubezero-argocd -![Version: 0.8.7](https://img.shields.io/badge/Version-0.8.7-informational?style=flat-square) +![Version: 0.8.8](https://img.shields.io/badge/Version-0.8.8-informational?style=flat-square) KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application @@ -20,7 +20,7 @@ Kubernetes: `>= 1.18.0` |------------|------|---------| | https://argoproj.github.io/argo-helm | argo-cd | 3.26.5 | | https://argoproj.github.io/argo-helm | argocd-applicationset | 1.4.0 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.4 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | ## Values diff --git a/charts/kubezero-argocd/values.yaml b/charts/kubezero-argocd/values.yaml index 56e45e91..77c81953 100644 --- a/charts/kubezero-argocd/values.yaml +++ b/charts/kubezero-argocd/values.yaml @@ -67,7 +67,7 @@ argo-cd: url: argocd.example.com #repositories: | - # - url: https://zero-down-time.github.io/kubezero.git + # - url: https://cdn.zero-downtime.net/charts resource.customizations: | cert-manager.io/Certificate: diff --git a/charts/kubezero-aws-ebs-csi-driver/Chart.yaml b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml index aebc463d..abd37e54 100644 --- a/charts/kubezero-aws-ebs-csi-driver/Chart.yaml +++ b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml @@ -22,5 +22,5 @@ dependencies: # repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver - name: kubezero-lib version: ">= 0.1.3" - repository: https://zero-down-time.github.io/kubezero/ + 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 index b0c70fa5..da0daf1f 100644 --- a/charts/kubezero-aws-ebs-csi-driver/README.md +++ b/charts/kubezero-aws-ebs-csi-driver/README.md @@ -24,7 +24,7 @@ Kubernetes: `>= 1.18.0` | Repository | Name | Version | |------------|------|---------| | | aws-ebs-csi-driver | 1.2.4 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | +| 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: diff --git a/charts/kubezero-aws-efs-csi-driver/Chart.yaml b/charts/kubezero-aws-efs-csi-driver/Chart.yaml index 7978af0c..930566bc 100644 --- a/charts/kubezero-aws-efs-csi-driver/Chart.yaml +++ b/charts/kubezero-aws-efs-csi-driver/Chart.yaml @@ -19,7 +19,7 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.3" - repository: https://zero-down-time.github.io/kubezero/ + 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 index 01843b5e..8d9e654a 100644 --- a/charts/kubezero-aws-efs-csi-driver/README.md +++ b/charts/kubezero-aws-efs-csi-driver/README.md @@ -1,6 +1,6 @@ # kubezero-aws-efs-csi-driver -![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![AppVersion: 1.3.1](https://img.shields.io/badge/AppVersion-1.3.1-informational?style=flat-square) +![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 @@ -23,8 +23,8 @@ Kubernetes: `>=1.18.0-0` | Repository | Name | Version | |------------|------|---------| -| | aws-efs-csi-driver | 2.1.1 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | +| | 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. @@ -48,5 +48,8 @@ Details also see: [Reserve PV](https://kubernetes.io/docs/concepts/storage/persi | 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-cert-manager/Chart.yaml b/charts/kubezero-cert-manager/Chart.yaml index c99c7c61..6faa09ff 100644 --- a/charts/kubezero-cert-manager/Chart.yaml +++ b/charts/kubezero-cert-manager/Chart.yaml @@ -14,7 +14,7 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.3" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ - name: cert-manager version: 1.5.3 condition: cert-manager.enabled diff --git a/charts/kubezero-cert-manager/README.md b/charts/kubezero-cert-manager/README.md index 3ff2e6d9..6131edc2 100644 --- a/charts/kubezero-cert-manager/README.md +++ b/charts/kubezero-cert-manager/README.md @@ -12,8 +12,8 @@ Kubernetes: `>= 1.18.0` | Repository | Name | Version | |------------|------|---------| +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.3 | | https://charts.jetstack.io | cert-manager | 1.5.3 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | ## AWS - IAM Role If you use kiam or kube2iam and restrict access on nodes running cert-manager please adjust: diff --git a/charts/kubezero-ci/Chart.yaml b/charts/kubezero-ci/Chart.yaml index 5ce07322..093a9dd5 100644 --- a/charts/kubezero-ci/Chart.yaml +++ b/charts/kubezero-ci/Chart.yaml @@ -2,19 +2,21 @@ apiVersion: v2 name: kubezero-ci description: KubeZero umbrella chart for all things CI type: application -version: 0.2.0 +version: 0.2.5 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: - kubezero - jenkins - goCD + - teamcity + - gitea maintainers: - name: Quarky9 dependencies: - name: kubezero-lib version: ">= 0.1.4" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ - name: gocd version: 1.39.4 repository: https://gocd.github.io/helm-chart @@ -23,5 +25,8 @@ dependencies: version: 4.1.1 repository: https://dl.gitea.io/charts/ condition: gitea.enabled + - name: teamcity + version: 0.1.0 + condition: teamcity.enabled kubeVersion: ">= 1.18.0" diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml index fbffd81d..1ad1d655 100644 --- a/charts/kubezero-ci/values.yaml +++ b/charts/kubezero-ci/values.yaml @@ -69,3 +69,6 @@ gitea: jenkins: enabled: false + +teamcity: + enabled: false diff --git a/charts/kubezero-istio-ingress/Chart.yaml b/charts/kubezero-istio-ingress/Chart.yaml index 862b2e0b..57bd0af6 100644 --- a/charts/kubezero-istio-ingress/Chart.yaml +++ b/charts/kubezero-istio-ingress/Chart.yaml @@ -14,7 +14,7 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.4" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ - name: istio-ingress version: 1.11.3 condition: istio-ingress.enabled diff --git a/charts/kubezero-istio-ingress/README.md b/charts/kubezero-istio-ingress/README.md index e52ffbeb..a4f2f9b4 100644 --- a/charts/kubezero-istio-ingress/README.md +++ b/charts/kubezero-istio-ingress/README.md @@ -22,7 +22,7 @@ Kubernetes: `>= 1.18.0` |------------|------|---------| | | istio-ingress | 1.11.3 | | | istio-private-ingress | 1.11.3 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.4 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | ## Values diff --git a/charts/kubezero-istio/Chart.yaml b/charts/kubezero-istio/Chart.yaml index 3bd2dcd3..caa42089 100644 --- a/charts/kubezero-istio/Chart.yaml +++ b/charts/kubezero-istio/Chart.yaml @@ -14,7 +14,7 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.4" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ - name: base version: 1.11.3 - name: istio-discovery diff --git a/charts/kubezero-istio/README.md b/charts/kubezero-istio/README.md index ca88a059..64aa07f7 100644 --- a/charts/kubezero-istio/README.md +++ b/charts/kubezero-istio/README.md @@ -23,7 +23,7 @@ Kubernetes: `>= 1.18.0` | | base | 1.11.3 | | | istio-discovery | 1.11.3 | | | kiali-server | 1.38.1 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.4 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | ## Values diff --git a/charts/kubezero-kiam/Chart.yaml b/charts/kubezero-kiam/Chart.yaml index 14debcab..927fd6d4 100644 --- a/charts/kubezero-kiam/Chart.yaml +++ b/charts/kubezero-kiam/Chart.yaml @@ -14,7 +14,7 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.3" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ - name: kiam version: 6.0.0 repository: https://uswitch.github.io/kiam-helm-charts/charts/ diff --git a/charts/kubezero-kiam/README.md b/charts/kubezero-kiam/README.md index 643d6f65..0bfa4317 100644 --- a/charts/kubezero-kiam/README.md +++ b/charts/kubezero-kiam/README.md @@ -1,6 +1,6 @@ # kubezero-kiam -![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: 4.0](https://img.shields.io/badge/AppVersion-4.0-informational?style=flat-square) +![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 @@ -18,8 +18,8 @@ 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 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | ## KubeZero default configuration We run agents on the controllers as well, so we force eg. ebs csi controllers and others to assume roles etc. @@ -63,6 +63,9 @@ By default all access to the meta-data service is blocked, expect for: | 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 | diff --git a/charts/kubezero-lib/Chart.yaml b/charts/kubezero-lib/Chart.yaml index 82569d78..035cd66e 100644 --- a/charts/kubezero-lib/Chart.yaml +++ b/charts/kubezero-lib/Chart.yaml @@ -9,4 +9,4 @@ keywords: - kubezero maintainers: - name: Quarky9 -kubeVersion: ">= 1.16.0" +kubeVersion: ">= 1.18.0" diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml index 81a0c5e2..bc41a53c 100644 --- a/charts/kubezero-logging/Chart.yaml +++ b/charts/kubezero-logging/Chart.yaml @@ -17,7 +17,7 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.3" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ - name: eck-operator version: 1.6.0 # repository: https://helm.elastic.co diff --git a/charts/kubezero-logging/README.md b/charts/kubezero-logging/README.md index 26d7a92e..e9f69c86 100644 --- a/charts/kubezero-logging/README.md +++ b/charts/kubezero-logging/README.md @@ -1,6 +1,6 @@ # kubezero-logging -![Version: 0.7.15](https://img.shields.io/badge/Version-0.7.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) +![Version: 0.7.16](https://img.shields.io/badge/Version-0.7.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) KubeZero Umbrella Chart for complete EFK stack @@ -21,7 +21,7 @@ Kubernetes: `>= 1.18.0` | | eck-operator | 1.6.0 | | | fluent-bit | 0.19.2 | | | fluentd | 0.3.0 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.3 | ## Changes from upstream ### ECK @@ -114,7 +114,7 @@ Kubernetes: `>= 1.18.0` | fluentd.fileConfigs."02_filters.conf" | string | `""` | | | fluentd.fileConfigs."04_outputs.conf" | string | `""` | | | fluentd.image.repository | string | `"public.ecr.aws/zero-downtime/fluentd-concenter"` | | -| fluentd.image.tag | string | `"v1.14.1"` | | +| fluentd.image.tag | string | `"v1.14.2"` | | | fluentd.istio.enabled | bool | `false` | | | fluentd.kind | string | `"Deployment"` | | | fluentd.metrics.serviceMonitor.additionalLabels.release | string | `"metrics"` | | diff --git a/charts/kubezero-metrics/Chart.yaml b/charts/kubezero-metrics/Chart.yaml index 00061d4c..8176aae8 100644 --- a/charts/kubezero-metrics/Chart.yaml +++ b/charts/kubezero-metrics/Chart.yaml @@ -15,7 +15,7 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.4" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ - name: kube-prometheus-stack version: 18.1.0 # Switch back to upstream once all alerts are fixed eg. etcd gpcr diff --git a/charts/kubezero-metrics/README.md b/charts/kubezero-metrics/README.md index afe820fd..01634363 100644 --- a/charts/kubezero-metrics/README.md +++ b/charts/kubezero-metrics/README.md @@ -20,8 +20,8 @@ Kubernetes: `>= 1.18.0` |------------|------|---------| | | kube-prometheus-stack | 18.1.0 | | | prometheus-pushgateway | 1.10.1 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | | https://prometheus-community.github.io/helm-charts | prometheus-adapter | 2.17 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.4 | ## Values @@ -75,6 +75,12 @@ Kubernetes: `>= 1.18.0` | kube-prometheus-stack.alertmanager.alertmanagerSpec.volumes[0].projected.sources[0].serviceAccountToken.audience | string | `"sts.amazonaws.com"` | | | kube-prometheus-stack.alertmanager.alertmanagerSpec.volumes[0].projected.sources[0].serviceAccountToken.expirationSeconds | int | `86400` | | | kube-prometheus-stack.alertmanager.alertmanagerSpec.volumes[0].projected.sources[0].serviceAccountToken.path | string | `"token"` | | +| kube-prometheus-stack.alertmanager.config.global.resolve_timeout | string | `"5m"` | | +| kube-prometheus-stack.alertmanager.config.route.group_by[0] | string | `"severity"` | | +| kube-prometheus-stack.alertmanager.config.route.group_by[1] | string | `"clusterName"` | | +| kube-prometheus-stack.alertmanager.config.route.group_interval | string | `"5m"` | | +| kube-prometheus-stack.alertmanager.config.route.group_wait | string | `"30s"` | | +| kube-prometheus-stack.alertmanager.config.route.repeat_interval | string | `"6h"` | | | kube-prometheus-stack.alertmanager.enabled | bool | `false` | | | kube-prometheus-stack.coreDns.enabled | bool | `true` | | | kube-prometheus-stack.defaultRules.create | bool | `false` | | @@ -82,7 +88,7 @@ Kubernetes: `>= 1.18.0` | kube-prometheus-stack.grafana."grafana.ini"."auth.anonymous".enabled | bool | `true` | | | kube-prometheus-stack.grafana."grafana.ini".alerting.enabled | bool | `false` | | | kube-prometheus-stack.grafana."grafana.ini".analytics.check_for_updates | bool | `false` | | -| kube-prometheus-stack.grafana."grafana.ini".dashboards.default_home_dashboard_path | string | `"/tmp/dashboards/home.json"` | | +| kube-prometheus-stack.grafana."grafana.ini".dashboards.default_home_dashboard_path | string | `"/tmp/dashboards/KubeZero/home.json"` | | | kube-prometheus-stack.grafana."grafana.ini".dashboards.min_refresh_interval | string | `"30s"` | | | kube-prometheus-stack.grafana."grafana.ini".date_formats.default_timezone | string | `"UTC"` | | | kube-prometheus-stack.grafana."grafana.ini".security.cookie_secure | bool | `true` | | diff --git a/charts/kubezero-metrics/templates/istio-authorization-policy.yaml b/charts/kubezero-metrics/templates/istio-authorization-policy.yaml index 3c904c25..3ae1e257 100644 --- a/charts/kubezero-metrics/templates/istio-authorization-policy.yaml +++ b/charts/kubezero-metrics/templates/istio-authorization-policy.yaml @@ -7,7 +7,7 @@ metadata: name: {{ $name }}-deny-not-in-ipblocks namespace: istio-system labels: -{{ include "kubezero-lib.labels" $ | indent 4 }} + {{- include "kubezero-lib.labels" $ | nindent 4 }} spec: selector: matchLabels: diff --git a/charts/kubezero-metrics/values.yaml b/charts/kubezero-metrics/values.yaml index eef269a3..b50ed98b 100644 --- a/charts/kubezero-metrics/values.yaml +++ b/charts/kubezero-metrics/values.yaml @@ -149,7 +149,7 @@ kube-prometheus-stack: enabled: true dashboards: min_refresh_interval: "30s" - default_home_dashboard_path: '/tmp/dashboards/home.json' + default_home_dashboard_path: '/tmp/dashboards/KubeZero/home.json' alerting: enabled: false date_formats: @@ -196,6 +196,14 @@ kube-prometheus-stack: # Todo alertmanager: enabled: false + config: + global: + resolve_timeout: 5m + route: + group_by: ['severity', 'clusterName'] + group_wait: 30s + group_interval: 5m + repeat_interval: 6h alertmanagerSpec: # externalUrl: logFormat: json diff --git a/charts/kubezero-mq/Chart.yaml b/charts/kubezero-mq/Chart.yaml index c7caea3e..1158deb0 100644 --- a/charts/kubezero-mq/Chart.yaml +++ b/charts/kubezero-mq/Chart.yaml @@ -14,7 +14,7 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.3" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ - name: nats version: 0.8.4 #repository: https://nats-io.github.io/k8s/helm/charts/ diff --git a/charts/kubezero-mq/README.md b/charts/kubezero-mq/README.md index a28e836f..cf5b1c4b 100644 --- a/charts/kubezero-mq/README.md +++ b/charts/kubezero-mq/README.md @@ -1,6 +1,6 @@ # kubezero-mq -![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero umbrella chart for MQ systems like NATS, RabbitMQ @@ -18,9 +18,9 @@ Kubernetes: `>= 1.18.0` | Repository | Name | Version | |------------|------|---------| -| | nats | 0.8.3 | +| | nats | 0.8.4 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.3 | | https://charts.bitnami.com/bitnami | rabbitmq | 8.13.1 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | ## Values @@ -28,8 +28,10 @@ Kubernetes: `>= 1.18.0` |-----|------|---------|-------------| | nats.enabled | bool | `false` | | | nats.exporter.serviceMonitor.enabled | bool | `false` | | +| nats.istio.enabled | bool | `false` | | +| nats.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | +| nats.mqtt.enabled | bool | `false` | | | nats.nats.advertise | bool | `false` | | -| nats.nats.image | string | `"nats:2.2.1-alpine3.13"` | | | nats.nats.jetstream.enabled | bool | `true` | | | nats.natsbox.enabled | bool | `false` | | | rabbitmq.auth.erlangCookie | string | `"randomlongerlangcookie"` | | diff --git a/charts/kubezero-redis/Chart.yaml b/charts/kubezero-redis/Chart.yaml index ebd21d92..32f63ba9 100644 --- a/charts/kubezero-redis/Chart.yaml +++ b/charts/kubezero-redis/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-redis description: KubeZero Umbrella Chart for Redis HA type: application -version: 0.3.4 +version: 0.3.5 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -13,13 +13,13 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.3" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ - name: redis - version: 14.8.8 + version: 15.5.4 repository: https://charts.bitnami.com/bitnami condition: redis.enabled - name: redis-cluster - version: 6.2.7 + version: 6.3.9 repository: https://charts.bitnami.com/bitnami condition: redis-cluster.enabled diff --git a/charts/kubezero-redis/README.md b/charts/kubezero-redis/README.md index a648f7bb..4cba1a0c 100644 --- a/charts/kubezero-redis/README.md +++ b/charts/kubezero-redis/README.md @@ -1,6 +1,6 @@ # kubezero-redis -![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![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) KubeZero Umbrella Chart for Redis HA @@ -18,9 +18,9 @@ Kubernetes: `>= 1.18.0` | Repository | Name | Version | |------------|------|---------| -| https://charts.bitnami.com/bitnami | redis | 12.1.1 | -| https://charts.bitnami.com/bitnami | redis-cluster | 4.1.0 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.3 | +| https://charts.bitnami.com/bitnami | redis | 15.5.4 | +| https://charts.bitnami.com/bitnami | redis-cluster | 6.3.9 | ## Values @@ -32,18 +32,16 @@ Kubernetes: `>= 1.18.0` | redis-cluster.enabled | bool | `false` | | | redis-cluster.metrics.enabled | bool | `false` | | | redis-cluster.metrics.serviceMonitor.enabled | bool | `false` | | -| redis-cluster.metrics.serviceMonitor.selector.release | string | `"metrics"` | | | redis-cluster.persistence.enabled | bool | `false` | | -| redis-cluster.redisPort | int | `6379` | | | redis-cluster.usePassword | bool | `false` | | -| redis.cluster.slaveCount | int | `0` | | +| redis.architecture | string | `"standalone"` | | +| redis.auth.enabled | bool | `false` | | | redis.enabled | bool | `false` | | | redis.master.persistence.enabled | bool | `false` | | | redis.metrics.enabled | bool | `false` | | | redis.metrics.serviceMonitor.enabled | bool | `false` | | -| redis.metrics.serviceMonitor.selector.release | string | `"metrics"` | | -| redis.redisPort | int | `6379` | | -| redis.usePassword | bool | `false` | | +| redis.replica.replicaCount | int | `0` | | +| snapshotgroups | object | `{}` | | # Dashboards https://grafana.com/grafana/dashboards/11835 diff --git a/charts/kubezero-sql/Chart.yaml b/charts/kubezero-sql/Chart.yaml index 2c723184..5b258a23 100644 --- a/charts/kubezero-sql/Chart.yaml +++ b/charts/kubezero-sql/Chart.yaml @@ -14,7 +14,7 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.3" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ - name: mariadb-galera version: 5.11.1 repository: https://charts.bitnami.com/bitnami diff --git a/charts/kubezero-sql/README.md b/charts/kubezero-sql/README.md index f47dde68..2fffa40c 100644 --- a/charts/kubezero-sql/README.md +++ b/charts/kubezero-sql/README.md @@ -1,6 +1,6 @@ # kubezero-sql -![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero umbrella chart for SQL databases like MariaDB, PostgreSQL @@ -18,8 +18,8 @@ Kubernetes: `>= 1.18.0` | Repository | Name | Version | |------------|------|---------| -| https://charts.bitnami.com/bitnami | mariadb-galera | 5.8.0 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.3 | +| https://charts.bitnami.com/bitnami | mariadb-galera | 5.11.1 | ## Values diff --git a/charts/uptime-kuma/Chart.yaml b/charts/uptime-kuma/Chart.yaml index dd556c6b..4883d741 100644 --- a/charts/uptime-kuma/Chart.yaml +++ b/charts/uptime-kuma/Chart.yaml @@ -14,5 +14,5 @@ maintainers: dependencies: - name: kubezero-lib version: ">= 0.1.4" - repository: https://zero-down-time.github.io/kubezero/ + repository: https://cdn.zero-downtime.net/charts/ kubeVersion: ">= 1.18.0"