Patch 2.19.5 #45

Merged
stefan merged 19 commits from master into stable 2021-05-17 10:08:39 +00:00
5 changed files with 2 additions and 18 deletions
Showing only changes of commit 07293f6ed6 - Show all commits

View File

@ -1,6 +1,6 @@
{{- if not .Values.argo }}
{{- $artifacts := list "calico" "cert-manager" "kiam" "aws-node-termination-handler" "aws-ebs-csi-driver" "aws-efs-csi-driver" "local-volume-provisioner" "local-path-provisioner" "istio" "istio-ingress" "metrics" "logging" "argocd" "timecapsule" "nats" }}
{{- $artifacts := list "calico" "cert-manager" "kiam" "aws-node-termination-handler" "aws-ebs-csi-driver" "aws-efs-csi-driver" "local-volume-provisioner" "local-path-provisioner" "istio" "istio-ingress" "metrics" "logging" "argocd" "timecapsule" }}
{{- if .Values.global }}
global:

View File

@ -1,22 +1,18 @@
{{- define "istio-values" }}
istio-discovery:
telemetry:
enabled: {{ .Values.metrics.enabled }}
{{- if .Values.HighAvailableControlplane }}
pilot:
replicaCount: 2
global:
defaultPodDisruptionBudget:
enabled: true
{{- end }}
{{- end }}
{{- define "istio-argo" }}
ignoreDifferences:
- group: apiextensions.k8s.io
kind: CustomResourceDefinition

View File

@ -2,7 +2,7 @@
{{- with .Values.metrics.istio }}
istio:
{{- toYaml . | nindent 2 }}
{{- toYaml . | nindent 2 }}
{{- end }}
{{- if index .Values "metrics" "kube-prometheus-stack" }}
kube-prometheus-stack:

View File

@ -1,8 +0,0 @@
{{- define "nats-values" }}
{{- end }}
{{- define "nats-argo" }}
{{- end }}
{{ include "kubezero-app.app" . }}

View File

@ -69,7 +69,3 @@ argocd:
enabled: false
argo: {}
nats:
enabled: false
namespace: nats