diff --git a/charts/kubezero/templates/argoless.yaml b/charts/kubezero/templates/argoless.yaml index 6fb2f258..b6796fa3 100644 --- a/charts/kubezero/templates/argoless.yaml +++ b/charts/kubezero/templates/argoless.yaml @@ -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: diff --git a/charts/kubezero/templates/istio.yaml b/charts/kubezero/templates/istio.yaml index f07e0df9..021a36af 100644 --- a/charts/kubezero/templates/istio.yaml +++ b/charts/kubezero/templates/istio.yaml @@ -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 diff --git a/charts/kubezero/templates/metrics.yaml b/charts/kubezero/templates/metrics.yaml index 906bad90..02c3409d 100644 --- a/charts/kubezero/templates/metrics.yaml +++ b/charts/kubezero/templates/metrics.yaml @@ -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: diff --git a/charts/kubezero/templates/nats.yaml b/charts/kubezero/templates/nats.yaml deleted file mode 100644 index 9d1bc428..00000000 --- a/charts/kubezero/templates/nats.yaml +++ /dev/null @@ -1,8 +0,0 @@ -{{- define "nats-values" }} -{{- end }} - - -{{- define "nats-argo" }} -{{- end }} - -{{ include "kubezero-app.app" . }} diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml index eb266c6e..826642bc 100644 --- a/charts/kubezero/values.yaml +++ b/charts/kubezero/values.yaml @@ -69,7 +69,3 @@ argocd: enabled: false argo: {} - -nats: - enabled: false - namespace: nats