diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml index 5b76faa..d3fa2e3 100644 --- a/charts/kubezero-logging/values.yaml +++ b/charts/kubezero-logging/values.yaml @@ -295,7 +295,6 @@ fluent-bit: serviceMonitor: enabled: true - namespace: monitoring selector: release: metrics diff --git a/charts/kubezero/templates/istio.yaml b/charts/kubezero/templates/istio.yaml index d1cdf8c..00233d0 100644 --- a/charts/kubezero/templates/istio.yaml +++ b/charts/kubezero/templates/istio.yaml @@ -12,6 +12,12 @@ jsonPointers: - /webhooks/0/clientConfig/caBundle - /webhooks/0/failurePolicy + - group: admissionregistration.k8s.io + kind: MutatingWebhookConfiguration + jsonPointers: + - /webhooks/0/clientConfig/caBundle + - /webhooks/0/failurePolicy + --- apiVersion: v1 kind: Namespace diff --git a/deploy/bootstrap.sh b/deploy/bootstrap.sh index f80d653..370a16c 100755 --- a/deploy/bootstrap.sh +++ b/deploy/bootstrap.sh @@ -232,7 +232,7 @@ function istio() { ################# function istio-ingress() { local chart="kubezero-istio-ingress" - local release="istio" + local release="istio-ingress" local namespace="istio-ingress" local task=$1 @@ -284,7 +284,7 @@ function logging() { local task=$1 if [ $task == "deploy" ]; then - deploy $chart $release $namespace -f $TMPDIR/values.yaml + deploy $chart $release $namespace -a "monitoring.coreos.com/v1" -f $TMPDIR/values.yaml kubectl annotate --overwrite namespace logging 'iam.amazonaws.com/permitted=.*ElasticSearchSnapshots.*' diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml index 4c1e90e..718ecf4 100644 --- a/deploy/templates/values.yaml +++ b/deploy/templates/values.yaml @@ -222,7 +222,7 @@ logging: fluent-bit: enabled: {{ index .Values.logging "fluent-bit" "enabled" }} - metrics: + serviceMonitor: enabled: {{ .Values.metrics.enabled }} {{- if index .Values.logging "fluent-bit" "config" }} config: