provide the ability to disable features

part of: kiali/kiali#4737
kiali · Mar 23, 2022 · 3b43ebf · 3b43ebf
1 parent 8fa823a
commit 3b43ebf
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 0 deletions.
diff --git a/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml b/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml
@@ -352,6 +352,7 @@ spec:
       - "istio-ca-secret"
     clustering:
       enabled: true
+    disabled_features: []
     istio_injection_action: true
     istio_upgrade_action: false
     ui_defaults:

diff --git a/crd-docs/crd/kiali.io_kialis.yaml b/crd-docs/crd/kiali.io_kialis.yaml
@@ -958,6 +958,12 @@ spec:
                       enabled:
                         description: "Flag to enable/disable clustering and federation related features."
                         type: boolean
+                  disabled_features:
+                    description: "There may be some features that admins do not want to be accessible to users (even in 'view only' mode). In this case, this setting allows you to disable one or more of those features entirely."
+                    type: array
+                    items:
+                      type: string
+                      enum: ["log-view"]
                   istio_injection_action:
                     description: "Flag to enable/disable an Action to label a namespace for automatic Istio Sidecar injection."
                     type: boolean

diff --git a/roles/default/kiali-deploy/defaults/main.yml b/roles/default/kiali-deploy/defaults/main.yml
@@ -236,6 +236,7 @@ kiali_defaults:
       - istio-ca-secret
     clustering:
       enabled: true
+    disabled_features: []
     istio_injection_action: true
     istio_upgrade_action: false
     ui_defaults:

diff --git a/roles/default/kiali-deploy/templates/kubernetes/role-viewer.yaml b/roles/default/kiali-deploy/templates/kubernetes/role-viewer.yaml
@@ -11,7 +11,9 @@ rules:
   resources:
   - configmaps
   - endpoints
+{% if kiali_vars.kiali_feature_flags.disabled_features is defined and 'log-view' not in kiali_vars.kiali_feature_flags.disabled_features %}
   - pods/log
+{% endif %}
   verbs:
   - get
   - list

diff --git a/roles/default/kiali-deploy/templates/kubernetes/role.yaml b/roles/default/kiali-deploy/templates/kubernetes/role.yaml
@@ -11,7 +11,9 @@ rules:
   resources:
   - configmaps
   - endpoints
+{% if kiali_vars.kiali_feature_flags.disabled_features is defined and 'log-view' not in kiali_vars.kiali_feature_flags.disabled_features %}
   - pods/log
+{% endif %}
   verbs:
   - get
   - list

diff --git a/roles/default/kiali-deploy/templates/openshift/role-viewer.yaml b/roles/default/kiali-deploy/templates/openshift/role-viewer.yaml
@@ -11,7 +11,9 @@ rules:
   resources:
   - configmaps
   - endpoints
+{% if kiali_vars.kiali_feature_flags.disabled_features is defined and 'log-view' not in kiali_vars.kiali_feature_flags.disabled_features %}
   - pods/log
+{% endif %}
   verbs:
   - get
   - list

diff --git a/roles/default/kiali-deploy/templates/openshift/role.yaml b/roles/default/kiali-deploy/templates/openshift/role.yaml
@@ -11,7 +11,9 @@ rules:
   resources:
   - configmaps
   - endpoints
+{% if kiali_vars.kiali_feature_flags.disabled_features is defined and 'log-view' not in kiali_vars.kiali_feature_flags.disabled_features %}
   - pods/log
+{% endif %}
   verbs:
   - get
   - list