support for OSSMC in the Kiali Operator (kiali#226)

giffgaff · Nov 29, 2023 · 79f44d0 · 79f44d0
1 parent 13b2546
commit 79f44d0
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 0 deletions.
diff --git a/kiali-operator/crds/crds.yaml b/kiali-operator/crds/crds.yaml
@@ -22,3 +22,27 @@ spec:
         type: object
         x-kubernetes-preserve-unknown-fields: true
 ...
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: ossmconsoles.kiali.io
+spec:
+  group: kiali.io
+  names:
+    kind: OSSMConsole
+    listKind: OSSMConsoleList
+    plural: ossmconsoles
+    singular: ossmconsole
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        type: object
+        x-kubernetes-preserve-unknown-fields: true
+...
diff --git a/kiali-operator/templates/clusterrole.yaml b/kiali-operator/templates/clusterrole.yaml
@@ -192,6 +192,27 @@ rules:
   - patch
   - update
   - watch
+# The permissions below are for OSSMC operator capabilities
+- apiGroups: ["console.openshift.io"]
+  resources:
+  - consoleplugins
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups: ["operator.openshift.io"]
+  resources:
+  - consoles
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
 # The permissions below are for Kiali itself; operator needs these so it can escalate when creating Kiali's roles
 - apiGroups: [""]
   resources:

diff --git a/kiali-operator/templates/deployment.yaml b/kiali-operator/templates/deployment.yaml
@@ -78,6 +78,8 @@ spec:
           value: {{ .Values.allowAdHocKialiNamespace | quote }}
         - name: ALLOW_AD_HOC_KIALI_IMAGE
           value: {{ .Values.allowAdHocKialiImage | quote }}
+        - name: ALLOW_AD_HOC_OSSMCONSOLE_IMAGE
+          value: {{ .Values.allowAdHocOSSMConsoleImage | quote }}
         - name: ALLOW_SECURITY_CONTEXT_OVERRIDE
           value: {{ .Values.allowSecurityContextOverride | quote }}
         - name: ALLOW_ALL_ACCESSIBLE_NAMESPACES
@@ -90,6 +92,8 @@ spec:
           value: {{ .Values.debug.enabled | quote }}
         - name: ANSIBLE_VERBOSITY_KIALI_KIALI_IO
           value: {{ .Values.debug.verbosity | quote }}
+        - name: ANSIBLE_VERBOSITY_OSSMCONSOLE_KIALI_IO
+          value: {{ .Values.debug.verbosity | quote }}
         - name: ANSIBLE_CONFIG
         {{- if .Values.debug.enableProfiler }}
           value: "/opt/ansible/ansible-profiler.cfg"

diff --git a/kiali-operator/values.yaml b/kiali-operator/values.yaml
@@ -70,6 +70,13 @@ allowAdHocKialiNamespace: true
 # You may want to disable this if you do not want users to install their own Kiali images.
 allowAdHocKialiImage: false
 
+# allowAdHocOSSMConsoleImage tells the operator to allow a user to be able to install a custom OSSMC image as opposed
+# to the image the operator will install by default. In other words, it will allow the
+# OSSMConsole CR spec.deployment.imageName and spec.deployment.imageVersion to be configured by the user.
+# You may want to disable this if you do not want users to install their own OSSMC images.
+# This is only applicable when running on OpenShift.
+allowAdHocOSSMConsoleImage: false
+
 # allowSecurityContextOverride tells the operator to allow a user to be able to fully override the Kiali
 # container securityContext. If this is false, certain securityContext settings must exist on the Kiali
 # container and any attempt to override them will be ignored.