more work on the kiali operator integration

istio · Nov 19, 2019 · 78d2a80 · 78d2a80
1 parent d0d4ab6
commit 78d2a80
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/data/profiles/default.yaml b/data/profiles/default.yaml
@@ -690,18 +690,22 @@ spec:
       coreDNSTag: 1.6.2
       coreDNSPluginImage: istio/coredns-plugin:0.2-istio-1.1
 
+    kialiOperator:
+      enabled: false
+      namespace: kiali-operator
+
     kiali:
-      operator:
-        enabled: false
-        replicaCount: 1
-        hub: quay.io/kiali
-        tag: v1.9
-        namespace: kiali-operator
+      enabled: false
+      replicaCount: 1
+      hub: quay.io/kiali
+      tag: v1.9
 
       contextPath: /kiali
       nodeSelector: {}
       podAntiAffinityLabelSelector: []
       podAntiAffinityTermLabelSelector: []
+      resources: {}
+      tolerations: []
 
       ingress:
         enabled: false
@@ -711,17 +715,13 @@ spec:
         tls:
       dashboard:
         secretName: kiali
-        usernameKey: username
-        passphraseKey: passphrase
         viewOnlyMode: false
         grafanaURL:
         jaegerURL:
       prometheusNamespace:
       createDemoSecret: false
       security:
         enabled: false
-        cert_file: /kiali-cert/cert-chain.pem
-        private_key_file: /kiali-cert/key.pem
 
     # TODO: derive from operator API
     version: ""

diff --git a/data/profiles/demo.yaml b/data/profiles/demo.yaml
@@ -107,8 +107,10 @@ spec:
     tracing:
       enabled: true
 
+    kialiOperator:
+      enabled: true
+      namespace: kiali-operator
+
     kiali:
-      operator:
-        enabled: true
-        namespace: kiali-operator
+      enabled: true
       createDemoSecret: true