From 5b317db25142d7696c6e2d08e577cf07e114fa4f Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 24 Nov 2020 07:18:14 -0800
Subject: [PATCH] Bug fixes and argo tweaks

---
 charts/kubezero-logging/values.yaml  | 1 -
 charts/kubezero/templates/istio.yaml | 6 ++++++
 deploy/bootstrap.sh                  | 4 ++--
 deploy/templates/values.yaml         | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml
index 5b76faac..d3fa2e34 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 d1cdf8cb..00233d07 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 f80d653e..370a16cf 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 4c1e90ed..718ecf48 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: