chore(deps): update kubezero-cache-dependencies

admin/libhelm.sh

@@ -83,9 +83,6 @@ function get_kubezero_secret() {
 
 
 function ensure_kubezero_secret_key() {
-  local ns=$1
-  local secret=$2
-
   local secret="$(kubectl get secret -n $ns $secret -o yaml)"
   local key
   local val
@@ -267,11 +264,6 @@ function _helm() {
 
     crds
 
-  elif [ $action == "dryrun" ]; then
-    cat $WORKDIR/values.yaml
-    render
-    cat $WORKDIR/helm.yaml
-
   elif [ $action == "apply" -o $action == "replace" ]; then
     echo "using values to $action of module $module: "
     cat $WORKDIR/values.yaml

admin/migrate_argo_values.py

@@ -10,14 +10,7 @@ def migrate(values):
 
     # 1.32
     try:
-        values["istio-ingress"]["gateway"]["service"]["extraPorts"] = values["istio-ingress"]["gateway"]["service"]["ports"]
-        values["istio-ingress"]["gateway"]["service"].pop("ports")
-    except KeyError:
         pass
-
-    try:
-        values["istio-private-ingress"]["gateway"]["service"]["extraPorts"] = values["istio-private-ingress"]["gateway"]["service"]["ports"]
-        values["istio-private-ingress"]["gateway"]["service"].pop("ports")
     except KeyError:
         pass
 

charts/kubezero-cache/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-cache
 description: KubeZero Cache module
 type: application
-version: 0.1.1
+version: 0.1.2
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -17,11 +17,11 @@ dependencies:
     version: 0.2.1
     repository: https://cdn.zero-downtime.net/charts/
   - name: redis
-    version: 20.11.5
+    version: 21.1.11
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled
   - name: redis-cluster
-    version: 11.5.0
+    version: 12.0.7
     repository: https://charts.bitnami.com/bitnami
     condition: redis-cluster.enabled
 

charts/kubezero-lib/templates/_helpers.tpl

@@ -42,3 +42,17 @@ helm.sh/chart: {{ include "kubezero-lib.chart" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: kubezero
 {{- end -}}
+
+{{- /*
+kubezero-lib.util.merge will merge two YAML templates and output the result.
+This takes an array of three values:
+- the top context
+- the template name of the overrides (destination)
+- the template name of the base (source)
+*/ -}}
+{{- define "kubezero-lib.util.merge" -}}
+{{- $top := first . -}}
+{{- $overrides := fromYaml (include (index . 1) $top) | default (dict ) -}}
+{{- $tpl := fromYaml (include (index . 2) $top) | default (dict ) -}}
+{{- toYaml (merge $overrides $tpl) -}}
+{{- end -}}

charts/kubezero-metrics/values.yaml

@@ -12,7 +12,7 @@ kube-prometheus-stack:
   kubeStateMetrics:
     enabled: true
   kubeProxy:
-    enabled: false
+    enabled: true
 
   kubeEtcd:
     enabled: true

charts/kubezero-network/values.yaml

@@ -33,11 +33,11 @@ cilium:
 
   resources:
     requests:
-      cpu: 50m
-      memory: 256Mi
-#   limits:
-#     memory: 1Gi
-#     cpu: 4000m
+      cpu: 10m
+      memory: 160Mi
+    limits:
+      memory: 1Gi
+      # cpu: 4000m
 
   cni:
     binPath: "/usr/libexec/cni"
@@ -68,13 +68,6 @@ cilium:
   dnsProxy:
     enableTransparentMode: true
 
-# For LB support via L2announcement or BGP - on-prem only
-# l2announcements:
-#   enabled: true
-# Not needed normally
-# externalIPs:
-#   enabled: true
-
   k8sServiceHost: ""
   k8sServicePort: 6443
 # k8s:
@@ -87,9 +80,8 @@ cilium:
       enabled: false
     hostRoot: "/sys/fs/cgroup"
 
-  bpf:
-    preallocateMaps: true
   # we need biDirectional so use helm init-container
+  #bpf:
   # autoMount:
   #   enabled: false
 

charts/kubezero/templates/_app.tpl

@@ -28,7 +28,7 @@ spec:
     helm:
       skipTests: true
       valuesObject:
-        {{- toYaml (merge (omit (index .Values $name) "enabled" "namespace" "retain" "targetRevision") (fromYaml (include (print $name "-values") $ ))) | nindent 8 }}
+        {{- include (print $name "-values") $ | nindent 8 }}
 
   destination:
     server: "https://kubernetes.default.svc"

charts/kubezero/templates/istio-ingress.yaml

@@ -67,7 +67,7 @@ gateway:
       gatewayProtocol: HTTPS
       tls:
         mode: SIMPLE
-    {{- with index .Values "istio-ingress" "gateway" "service" "extraPorts" }}
+    {{- with index .Values "istio-ingress" "gateway" "service" "ports" }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 
@@ -93,6 +93,7 @@ certificates:
   {{- toYaml $cert.dnsNames | nindent 4 }}
 {{- end }}
 {{- end }}
+proxyProtocol: {{ default true (index .Values "istio-ingress" "proxyProtocol") }}
 {{- with (index .Values "istio-ingress" "hardening") }}
 hardening:
   {{- toYaml . | nindent 2 }}

charts/kubezero/templates/istio-private-ingress.yaml

@@ -64,7 +64,7 @@ gateway:
       gatewayProtocol: HTTPS
       tls:
         mode: SIMPLE
-  {{- with index .Values "istio-private-ingress" "gateway" "service" "extraPorts" }}
+  {{- with index .Values "istio-private-ingress" "gateway" "service" "ports" }}
   {{- toYaml . | nindent 4 }}
   {{- end }}
 
@@ -88,6 +88,7 @@ certificates:
   dnsNames:
   {{- toYaml $cert.dnsNames | nindent 4 }}
 {{- end }}
+proxyProtocol: {{ default true (index .Values "istio-private-ingress" "proxyProtocol") }}
 {{- with (index .Values "istio-private-ingress" "hardening") }}
 hardening:
   {{- toYaml . | nindent 2 }}

charts/kubezero/templates/network.yaml

@@ -9,23 +9,25 @@ multus:
 # {{- end }}
 
 cilium:
-  k8sServiceHost: {{ .Values.global.apiServerUrl }}
+  enabled: true
 
 # {{- if eq .Values.global.platform "aws" }}
 # image:
 #   pullPolicy: Never
 # {{- end }}
+  k8sServiceHost: {{ .Values.global.apiServerUrl }}
 # k8s:
 #   apiServerURLs: "https://{{ .Values.global.apiServerUrl }}"
 
   cluster:
     name: {{ .Values.global.clusterName }}
-  {{- with .Values.network.cilium.cluster.id }}
+    {{- with .Values.network.cilium.cluster.id }}
+    id: {{ . }}
   ipam:
     operator:
       clusterPoolIPv4PodCIDRList:
         - 10.{{ . }}.0.0/16
-  {{- end }}
+    {{- end }}
 
   prometheus:
     enabled: {{ .Values.metrics.enabled }}

charts/kubezero/values.yaml

@@ -61,13 +61,13 @@ storage:
 istio:
   enabled: false
   namespace: istio-system
-  targetRevision: 0.24.6
+  targetRevision: 0.24.3
 
 istio-ingress:
   enabled: false
   chart: kubezero-istio-gateway
   namespace: istio-ingress
-  targetRevision: 0.24.6
+  targetRevision: 0.24.3
   gateway:
     service: {}
 
@@ -75,7 +75,7 @@ istio-private-ingress:
   enabled: false
   chart: kubezero-istio-gateway
   namespace: istio-ingress
-  targetRevision: 0.24.6
+  targetRevision: 0.24.3
   gateway:
     service: {}