From ede6d6513f090abbc0811ff183117fbfb806bc41 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 7 Aug 2020 17:02:22 +0100 Subject: [PATCH] Update all charts to use latest lib --- charts/kubezero-argo-cd/Chart.yaml | 2 +- charts/kubezero-argo-cd/README.md | 6 +++--- charts/kubezero-aws-ebs-csi-driver/Chart.yaml | 4 ++-- charts/kubezero-aws-efs-csi-driver/Chart.yaml | 4 ++-- charts/kubezero-calico/Chart.yaml | 4 ++-- charts/kubezero-cert-manager/Chart.yaml | 4 ++-- charts/kubezero-istio/delete_istio_14.sh | 7 +++++++ charts/kubezero-istio/upgrade_from_14.sh | 15 --------------- charts/kubezero-kiam/Chart.yaml | 4 ++-- .../kubezero-local-volume-provisioner/Chart.yaml | 4 ++-- charts/kubezero-metrics/README.md | 6 +++--- charts/kubezero-metrics/delete_kube-prometheus.sh | 9 +++++++++ charts/kubezero/Chart.yaml | 4 ++-- 13 files changed, 37 insertions(+), 36 deletions(-) create mode 100755 charts/kubezero-istio/delete_istio_14.sh delete mode 100755 charts/kubezero-istio/upgrade_from_14.sh create mode 100755 charts/kubezero-metrics/delete_kube-prometheus.sh diff --git a/charts/kubezero-argo-cd/Chart.yaml b/charts/kubezero-argo-cd/Chart.yaml index 4ff15ca3..45a1a1a7 100644 --- a/charts/kubezero-argo-cd/Chart.yaml +++ b/charts/kubezero-argo-cd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application name: kubezero-argo-cd -version: 0.3.8 +version: 0.3.9 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero-argo-cd/README.md b/charts/kubezero-argo-cd/README.md index 3f3ff38b..199bde57 100644 --- a/charts/kubezero-argo-cd/README.md +++ b/charts/kubezero-argo-cd/README.md @@ -2,7 +2,7 @@ kubezero-argo-cd ================ KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application -Current chart version is `0.3.8` +Current chart version is `0.3.9` Source code can be found [here](https://kubezero.com) @@ -11,7 +11,7 @@ Source code can be found [here](https://kubezero.com) | Repository | Name | Version | |------------|------|---------| | https://argoproj.github.io/argo-helm | argo-cd | 2.6.0 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.1 | +| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | ## Chart Values @@ -23,7 +23,7 @@ Source code can be found [here](https://kubezero.com) | argo-cd.dex.enabled | bool | `false` | | | argo-cd.installCRDs | bool | `false` | | | argo-cd.istio.enabled | bool | `false` | Deploy Istio VirtualService to expose ArgoCD | -| argo-cd.istio.gateway | string | `"ingressgateway.istio-system.svc.cluster.local"` | Name of the Istio gateway to add the VirtualService to | +| argo-cd.istio.gateway | string | `"istio-system/ingressgateway"` | Name of the Istio gateway to add the VirtualService to | | argo-cd.istio.ipBlocks | list | `[]` | | | argo-cd.redis.nodeSelector."node-role.kubernetes.io/master" | string | `""` | | | argo-cd.redis.tolerations[0].effect | string | `"NoSchedule"` | | diff --git a/charts/kubezero-aws-ebs-csi-driver/Chart.yaml b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml index c8a36542..fbde476d 100644 --- a/charts/kubezero-aws-ebs-csi-driver/Chart.yaml +++ b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-aws-ebs-csi-driver description: KubeZero Umbrella Chart for aws-ebs-csi-driver type: application -version: 0.2.0 +version: 0.2.1 appVersion: 0.5.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png @@ -18,6 +18,6 @@ maintainers: - name: Quarky9 dependencies: - name: kubezero-lib - version: ">= 0.1.1" + version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ kubeVersion: ">= 1.16.0" diff --git a/charts/kubezero-aws-efs-csi-driver/Chart.yaml b/charts/kubezero-aws-efs-csi-driver/Chart.yaml index 15bec190..57809d31 100644 --- a/charts/kubezero-aws-efs-csi-driver/Chart.yaml +++ b/charts/kubezero-aws-efs-csi-driver/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: kubezero-aws-efs-csi-driver description: KubeZero Umbrella Chart for aws-efs-csi-driver -version: 0.1.0 +version: 0.1.1 appVersion: 1.0.0 kubeVersion: ">=1.16.0-0" home: https://kubezero.com @@ -18,7 +18,7 @@ maintainers: - name: Quarky9 dependencies: - name: kubezero-lib - version: ">= 0.1.1" + version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ # Once they properly update upstream # - name: aws-ebs-csi-driver diff --git a/charts/kubezero-calico/Chart.yaml b/charts/kubezero-calico/Chart.yaml index 625bbac6..afc43846 100644 --- a/charts/kubezero-calico/Chart.yaml +++ b/charts/kubezero-calico/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-calico description: KubeZero Umbrella Chart for Calico type: application -version: 0.1.7 +version: 0.1.8 appVersion: 3.15 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png @@ -13,6 +13,6 @@ maintainers: - name: Quarky9 dependencies: - name: kubezero-lib - version: ">= 0.1.1" + version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ kubeVersion: ">= 1.16.0" diff --git a/charts/kubezero-cert-manager/Chart.yaml b/charts/kubezero-cert-manager/Chart.yaml index c21b7f4a..8a15bf22 100644 --- a/charts/kubezero-cert-manager/Chart.yaml +++ b/charts/kubezero-cert-manager/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-cert-manager description: KubeZero Umbrella Chart for cert-manager type: application -version: 0.3.5 +version: 0.3.6 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -12,7 +12,7 @@ maintainers: - name: Quarky9 dependencies: - name: kubezero-lib - version: ">= 0.1.1" + version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ - name: cert-manager version: 0.15.1 diff --git a/charts/kubezero-istio/delete_istio_14.sh b/charts/kubezero-istio/delete_istio_14.sh new file mode 100755 index 00000000..3078179a --- /dev/null +++ b/charts/kubezero-istio/delete_istio_14.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# First delete old 1.4 +kubectl delete -f ingress-gateway.yaml +kubectl delete -f istio.yaml +kubectl delete -f istio-init.yaml +kubectl delete -f namespace.yaml diff --git a/charts/kubezero-istio/upgrade_from_14.sh b/charts/kubezero-istio/upgrade_from_14.sh deleted file mode 100755 index 49467fdb..00000000 --- a/charts/kubezero-istio/upgrade_from_14.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# First delete old 1.4 -kubectl delete -f ingress-gateway.yaml -kubectl delete -f istio.yaml -kubectl delete -f istio-init.yaml -kubectl delete -f namespace.yaml - -# Now we need to install the new Istio Operator via KubeZero - -# deploy the CR for 1.6 -kubectl apply -f istio-1.6.yaml - -# add the additiona private ingress gateway as dedicated CR -kubectl apply -f istio-1.6-private-ingress.yaml diff --git a/charts/kubezero-kiam/Chart.yaml b/charts/kubezero-kiam/Chart.yaml index f78a914f..7bc63b86 100644 --- a/charts/kubezero-kiam/Chart.yaml +++ b/charts/kubezero-kiam/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-kiam description: KubeZero Umbrella Chart for Kiam type: application -version: 0.2.6 +version: 0.2.7 appVersion: 3.6 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png @@ -13,7 +13,7 @@ maintainers: - name: Quarky9 dependencies: - name: kubezero-lib - version: ">= 0.1.1" + version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ - name: kiam version: 5.8.1 diff --git a/charts/kubezero-local-volume-provisioner/Chart.yaml b/charts/kubezero-local-volume-provisioner/Chart.yaml index 328614c3..303887f3 100644 --- a/charts/kubezero-local-volume-provisioner/Chart.yaml +++ b/charts/kubezero-local-volume-provisioner/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-local-volume-provisioner description: KubeZero Umbrella Chart for local-static-provisioner type: application -version: 0.0.1 +version: 0.1.0 appVersion: 2.3.4 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png @@ -13,6 +13,6 @@ maintainers: - name: Quarky9 dependencies: - name: kubezero-lib - version: ">= 0.1.1" + version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ kubeVersion: ">= 1.16.0" diff --git a/charts/kubezero-metrics/README.md b/charts/kubezero-metrics/README.md index 5f421250..62b70401 100644 --- a/charts/kubezero-metrics/README.md +++ b/charts/kubezero-metrics/README.md @@ -12,14 +12,14 @@ Source code can be found [here](https://kubezero.com) |------------|------|---------| | https://kubernetes-charts.storage.googleapis.com/ | prometheus-adapter | 2.5.0 | | https://kubernetes-charts.storage.googleapis.com/ | prometheus-operator | 9.3.0 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.1 | +| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | ## Chart Values | Key | Type | Default | Description | |-----|------|---------|-------------| | grafana.istio.enabled | bool | `false` | | -| grafana.istio.gateway | string | `"ingressgateway.istio-system.svc.cluster.local"` | | +| grafana.istio.gateway | string | `"istio-system/ingressgateway"` | | | grafana.istio.ipBlocks | list | `[]` | | | grafana.istio.url | string | `""` | | | prometheus-adapter.nodeSelector."node-role.kubernetes.io/master" | string | `""` | | @@ -93,5 +93,5 @@ Source code can be found [here](https://kubezero.com) | prometheus-operator.prometheusOperator.tolerations[0].effect | string | `"NoSchedule"` | | | prometheus-operator.prometheusOperator.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | | prometheus.istio.enabled | bool | `false` | | -| prometheus.istio.gateway | string | `"ingressgateway.istio-system.svc.cluster.local"` | | +| prometheus.istio.gateway | string | `"istio-system/ingressgateway"` | | | prometheus.istio.url | string | `""` | | diff --git a/charts/kubezero-metrics/delete_kube-prometheus.sh b/charts/kubezero-metrics/delete_kube-prometheus.sh new file mode 100755 index 00000000..e7de5b41 --- /dev/null +++ b/charts/kubezero-metrics/delete_kube-prometheus.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +[ -f istio-authorization-policy.yaml ] && kubectl delete -f istio-authorization-policy.yaml +[ -f istio-service.yaml ] && kubectl delete -f istio-service.yaml + +kubectl delete -f manifests +kubectl delete -f manifests/setup + +kubectl delete namespace monitoring diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml index 1bd3f94e..ef983386 100644 --- a/charts/kubezero/Chart.yaml +++ b/charts/kubezero/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero description: KubeZero ArgoCD Application - Root App of Apps chart of KubeZero type: application -version: 0.4.1 +version: 0.4.2 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -13,6 +13,6 @@ maintainers: - name: Quarky9 dependencies: - name: kubezero-lib - version: ">= 0.1.1" + version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ kubeVersion: ">= 1.16.0"