Merge pull request 'Version bump cert-manager, argo-cd, new EFS multi PVC feature and switch to new kube-prometheus charts' (#28) from kube-prometheus into master

Reviewed-on: ZeroDownTime/kubezero#28

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.5.6
+version: 0.5.7
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -15,6 +15,6 @@ dependencies:
     version: ">= 0.1.3"
     repository: https://zero-down-time.github.io/kubezero/
   - name: argo-cd
-    version: 2.8.0
+    version: 2.9.3
     repository: https://argoproj.github.io/argo-helm
 kubeVersion: ">= 1.17.0"

charts/kubezero-argo-cd/values.yaml

@@ -31,14 +31,14 @@ argo-cd:
 
   global:
     image:
-      tag: v1.7.7
+      tag: v1.7.8
 
   controller:
     args:
       statusProcessors: "4"
       operationProcessors: "2"
       appResyncPeriod: "300"
-    # logFormat: json
+    logFormat: json
 
     metrics:
       enabled: false
@@ -63,7 +63,7 @@ argo-cd:
         memory: 256Mi
 
   repoServer:
-    # logFormat: json
+    logFormat: json
     metrics:
       enabled: false
       serviceMonitor:
@@ -79,7 +79,7 @@ argo-cd:
       effect: NoSchedule
 
   server:
-    # logFormat: json
+    logFormat: json
     config:
       # argo-cd.server.config.url -- ArgoCD hostname to be exposed via Istio
       url: argocd.example.com

charts/kubezero-aws-efs-csi-driver/templates/efs_pv.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.PersistentVolume }}
 {{- if .Values.PersistentVolume.create }}
 apiVersion: v1
 kind: PersistentVolume
@@ -17,3 +18,4 @@ spec:
     driver: efs.csi.aws.com
     volumeHandle: {{ .Values.PersistentVolume.EfsId }}
 {{- end }}
+{{- end }}

charts/kubezero-aws-efs-csi-driver/values.yaml

@@ -19,7 +19,7 @@ StorageClass:
 #    volumeHandle: "<efs-id>:/path2"
 
 # Deprecated and removed with next release
-PersistentVolume:
-  create: false
-  EfsId: ""
-  Name: ""
+# PersistentVolume:
+#   create: false
+#   EfsId: ""
+#   Name: ""

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.6
+version: 0.4.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -15,6 +15,6 @@ dependencies:
     version: ">= 0.1.3"
     repository: https://zero-down-time.github.io/kubezero/
   - name: cert-manager
-    version: 0.15.1
+    version: 1.0.3
     repository: https://charts.jetstack.io
 kubeVersion: ">= 1.16.0"

charts/kubezero-metrics/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-metrics
 description: KubeZero Umbrella Chart for prometheus-operator
 type: application
-version: 0.1.4
+version: 0.2.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -15,10 +15,10 @@ dependencies:
   - name: kubezero-lib
     version: ">= 0.1.3"
     repository: https://zero-down-time.github.io/kubezero/
-  - name: prometheus-operator
-    version: 9.3.1
-    repository: https://kubernetes-charts.storage.googleapis.com/
+  - name: kube-prometheus-stack
+    version: 10.0.1
+    repository: https://prometheus-community.github.io/helm-charts
   - name: prometheus-adapter
-    version: 2.5.0
-    repository: https://kubernetes-charts.storage.googleapis.com/
+    version: 2.7.0
+    repository: https://prometheus-community.github.io/helm-charts
 kubeVersion: ">= 1.16.0"

charts/kubezero-metrics/templates/istio-service.yaml

@@ -31,5 +31,5 @@ spec:
   http:
   - route:
     - destination:
-        host: metrics-prometheus-operato-prometheus
+        host: metrics-kube-prometheus-st-prometheus
 {{- end }}

charts/kubezero-metrics/values.yaml

@@ -11,7 +11,7 @@ prometheus:
     url: ""
     gateway: istio-system/ingressgateway
 
-prometheus-operator:
+kube-prometheus-stack:
   defaultRules:
     create: true
 
@@ -60,9 +60,9 @@ prometheus-operator:
   prometheusOperator:
     enabled: true
     #image:
-    #  tag: v0.41.0
+    #  tag: v0.42.1
     #prometheusConfigReloaderImage:
-    #  tag: v0.41.0
+    #  tag: v0.42.1
 
     # Run on controller nodes
     tolerations:
@@ -148,7 +148,7 @@ prometheus-operator:
 # Metrics adapter
 prometheus-adapter:
   prometheus:
-    url: http://metrics-prometheus-operato-prometheus
+    url: http://metrics-kube-prometheus-st-prometheus
   tolerations:
   - key: node-role.kubernetes.io/master
     effect: NoSchedule
@@ -160,8 +160,8 @@ prometheus-adapter:
     default: false
     resource:
       cpu:
-        containerQuery: sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[5m])) by (<<.GroupBy>>)
-        nodeQuery: sum(1 - irate(node_cpu_seconds_total{mode="idle"}[5m]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)
+        containerQuery: sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[3m])) by (<<.GroupBy>>)
+        nodeQuery: sum(1 - irate(node_cpu_seconds_total{mode="idle"}[3m]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)
         resources:
           overrides:
             node:
@@ -183,4 +183,4 @@ prometheus-adapter:
             pod:
               resource: pod
         containerLabel: container
-      window: 5m
+      window: 3m

deploy/templates/values.yaml

@@ -78,17 +78,21 @@ kubezero:
   aws-efs-csi-driver:
     enabled: {{ index .Values "aws-efs-csi-driver" "enabled" }}
     values:
+      {{- with index .Values "aws-efs-csi-driver" "nodeSelector" }}
       aws-efs-csi-driver:
         nodeSelector:
-          node.kubernetes.io/csi.efs.fs: {{ index .Values "aws-efs-csi-driver" "EfsId" }}
+        {{- toYaml . | nindent 10 }}
+      {{- end }}
       {{- with index .Values "aws-efs-csi-driver" "PersistentVolumes" }}
       PersistentVolumes:
       {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if index .Values "aws-efs-csi-driver" "PersistentVolume" }}
       PersistentVolume:
         create: true
         EfsId: {{ index .Values "aws-efs-csi-driver" "EfsId" }}
         Name: {{ default "kubezero-efs-pv" ( index .Values "aws-efs-csi-driver" "PVName" ) }}
+      {{- end }}
   {{- end }}
 
   istio: