FLPATH-1856 Enabling monitoring by default in Helm Based Orchestrator…

… operator
rhdhorchestrator · Dec 14, 2024 · d24dc6b · d24dc6b
1 parent 763ac46
commit d24dc6b
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 34 deletions.
diff --git a/bundle/manifests/orchestrator-operator.clusterserviceversion.yaml b/bundle/manifests/orchestrator-operator.clusterserviceversion.yaml
@@ -15,9 +15,15 @@ metadata:
               "enabled": false,
               "namespace": ""
             },
+            "networkPolicy": {
+              "rhdhNamespace": "rhdh-operator"
+            },
             "orchestrator": {
               "namespace": "sonataflow-infra",
               "sonataflowPlatform": {
+                "monitoring": {
+                  "enabled": true
+                },
                 "resources": {
                   "limits": {
                     "cpu": "500m",
@@ -70,7 +76,7 @@ metadata:
                 }
               },
               "subscription": {
-                "channel": "fast-1.2",
+                "channel": "fast-1.3",
                 "installPlanApproval": "Automatic",
                 "name": "rhdh",
                 "namespace": "rhdh-operator",
@@ -81,38 +87,38 @@ metadata:
             },
             "rhdhPlugins": {
               "notifications": {
-                "integrity": "sha512-wmISWN02G4OiBF7y8Jpl5KCbDfhzl70s+r0h2tdVh1IIwYmojH5pqXFQAhDd3FTlqYc8yqDG8gEAQ8v66qbU1g==",
-                "package": "plugin-notifications-dynamic@0.2.0-rc.0-0"
+                "integrity": "sha512-zqwK318o+Lc16pV5wvN6IWMLFqImOWr0xbsGBI69YNVGpXA6AOccXInGbn1RA1QKXfV5sNo8xc5N0WIIgx43Iw==",
+                "package": "plugin-notifications-dynamic@1.3.0-rc.3"
               },
               "notificationsBackend": {
-                "integrity": "sha512-CHTNYVGWPxT94viabzCqxKIkDxflium9vkgh9Emu+3SuJSEsrZ6G+U1UZgpQ4gO03oOeiTm3xsoTg/AfKGf7CQ==",
-                "package": "plugin-notifications-backend-dynamic@0.2.0-rc.0-0"
+                "integrity": "sha512-2qai8t66dyHEIaPFjdJ9M5nPh53vkH5O7Keed/lFNH0TbPoxamql9V0tdOwdx5Mb7bJwj9N1ulin/mCNniFuTA==",
+                "package": "plugin-notifications-backend-dynamic@1.3.0-rc.3"
               },
               "notificationsEmail": {
                 "enabled": false,
-                "integrity": "sha512-TikxFBxBHKJYZy8go+Mw+7yjfSJILgXjr4K0C0+tnKyMOn+OqIX6K8c1fq7IdXto3fftQ+mmCrBqJem25JjVnA==",
-                "package": "plugin-notifications-backend-module-email-dynamic@0.0.0-rc.0-0",
+                "integrity": "sha512-uIGPDdSha9H1kWwofYJXg/GgrGZuF9WZTXgRb8YtN4iKAAZ9FLAD9BuLobUKYXbzO6jGaNzIw82kTJa1VhvEzg==",
+                "package": "plugin-notifications-backend-module-email-dynamic@1.3.0-rc.3",
                 "port": 587,
                 "replyTo": "",
                 "sender": ""
               },
               "npmRegistry": "https://npm.registry.redhat.com",
               "orchestrator": {
-                "integrity": "sha512-uxkNFS/4nkVM6FRq0Uvnznvxcm/3MNdh11R6sRsbmKCP4KF4N9T2GF4lgfD7J+p7EuGMD4UFnjKjaR77v0NGaQ==",
-                "package": "backstage-plugin-orchestrator@1.1.0-rc.0-0"
+                "integrity": "sha512-s8SeUMLr9L9oqc2EHqn+KxQlFqXD/OIr3hS/jVUWhxfnC7cwfFNiqZG1c5Kl9vtI16zAc8MUf+qhsCd7S1MYvg==",
+                "package": "backstage-plugin-orchestrator@1.3.0-rc.3"
               },
               "orchestratorBackend": {
-                "integrity": "sha512-NIIGpwH/uJaMknTdORdnqsHfPeI/OrAl2biqELal1e9tK2r6PrVWfIWr9XoH5AfOjtQjbeAe7joiLwhM+uyVAw==",
-                "package": "backstage-plugin-orchestrator-backend-dynamic@1.1.0-rc.0-0"
+                "integrity": "sha512-08cllbcquVA6QLuO0XknxdynS5mvAazb0s9zES1AkuFn2GR7ZKIuIZMjcUwVjHEthwv4UdSNPB7W3IFDsmSDZw==",
+                "package": "backstage-plugin-orchestrator-backend-dynamic@1.3.0-rc.3"
               },
               "scope": "@redhat",
               "signals": {
-                "integrity": "sha512-5Iwp9gF6VPiMLJ5NUw5s5Z17AuJ5XYS97wghNTfcmah/OFxTmgZHWxvhcRoXDRQvyj4nc/gOZes74kp6kZ9XDg==",
-                "package": "plugin-signals-dynamic@0.0.5-rc.0-0"
+                "integrity": "sha512-WRUi5xpJDD5Jd2p+juCIpsXCnXfHLoSwPZ/N7a7ZnqarfajTkL8qOglhIJh+lVTbe65S8v1rtQLGj9bTCXuPlA==",
+                "package": "plugin-signals-dynamic@1.3.0-rc.3"
               },
               "signalsBackend": {
-                "integrity": "sha512-LlkM2Mf2QTndsS6eBzyXDhJmRTHLpAku3hhlvWhtQChSLTFCtNGRTIQA5WHG7NqLH0QqBz+UcEjX7Vca82QKKg==",
-                "package": "plugin-signals-backend-dynamic@0.1.3-rc.0-0"
+                "integrity": "sha512-FgmPouKc2FuHSMfmkdXCVx0/1kPlT6OVbRUNFzOJGSjZAj0nvxSg+W3pt15dSOC5Fe5j2FLSuevCx34YVA+VzQ==",
+                "package": "[email protected]rc.3"
               }
             },
             "serverlessOperator": {
@@ -146,7 +152,7 @@ metadata:
     capabilities: Basic Install
     categories: Developer Tools
     console.openshift.io/disable-operand-delete: "true"
-    createdAt: "2024-09-12T17:54:38Z"
+    createdAt: "2024-12-14T05:55:46Z"
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "false"
     features.operators.openshift.io/csi: "false"
@@ -170,7 +176,7 @@ metadata:
     operatorframework.io/arch.ppc64le: unsupported
     operatorframework.io/arch.s390x: unsupported
     operatorframework.io/suggested-namespace: orchestrator
-  name: orchestrator-operator.v1.2.0-rc12
+  name: orchestrator-operator.v1.3.0-rc6
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -422,6 +428,23 @@ spec:
           - delete
           - watch
           - patch
+        - apiGroups:
+          - operator.openshift.io
+          resources:
+          - imagecontentsourcepolicies
+          verbs:
+          - get
+          - create
+          - watch
+          - list
+          - update
+          - delete
+        - apiGroups:
+          - config.openshift.io
+          resources:
+          - clusterversions
+          verbs:
+          - get
         serviceAccountName: orchestrator-operator
       deployments:
       - label:
@@ -475,7 +498,7 @@ spec:
                 - --metrics-bind-address=127.0.0.1:8080
                 - --leader-elect
                 - --leader-election-id=orchestrator-operator
-                image: quay.io/orchestrator/orchestrator-operator:1.2.0-rc12
+                image: quay.io/orchestrator/orchestrator-operator:1.3.0-rc6
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -564,4 +587,4 @@ spec:
   provider:
     name: Red Hat
     url: https://www.redhat.com
-  version: 1.2.0-rc12
+  version: 1.3.0-rc6
diff --git a/bundle/manifests/rhdh.redhat.com_orchestrators.yaml b/bundle/manifests/rhdh.redhat.com_orchestrators.yaml
@@ -53,6 +53,15 @@ spec:
                       operator is deployed and is watching for argoapp CR instances
                     type: string
                 type: object
+              networkPolicy:
+                description: NetworkPolicy contains the namespace of an existing RHDH
+                  instance
+                properties:
+                  rhdhNamespace:
+                    default: ""
+                    description: Namespace of the existing RHDH instance.
+                    type: string
+                type: object
               orchestrator:
                 description: Orchestrator contains the fields for the orchestrator
                   configuration
@@ -79,6 +88,15 @@ spec:
                           Job Service container image to be used instead of the provided
                           one by SonataFlow
                         type: string
+                      monitoring:
+                        description: Contains the monitoring configuration fields
+                        properties:
+                          enabled:
+                            default: true
+                            description: Enabled determines whether monitoring should
+                              be enabled. Defaults to true.
+                            type: boolean
+                        type: object
                       resources:
                         description: Resources contains the requests and limit of
                           CPU and memory resources for the pod instance
@@ -350,23 +368,23 @@ spec:
                     description: Notification plugin information
                     properties:
                       integrity:
-                        default: sha512-1mhUl14v+x0Ta1o8Sp4KBa02izGXHd+wsiCVsDP/th6yWDFJsfSMf/DyMIn1Uhat1rQgVFRUMg8QgrvbgZCR/w==
+                        default: sha512-zqwK318o+Lc16pV5wvN6IWMLFqImOWr0xbsGBI69YNVGpXA6AOccXInGbn1RA1QKXfV5sNo8xc5N0WIIgx43Iw==
                         description: Package SHA integrity
                         type: string
                       package:
-                        default: plugin-notifications-dynamic@1.2.0
+                        default: plugin-notifications-dynamic@1.3.0-rc.3
                         description: Package name
                         type: string
                     type: object
                   notificationsBackend:
                     description: Notification backend plugin information
                     properties:
                       integrity:
-                        default: sha512-pCFB/jZIG/Ip1wp67G0ZDJPp63E+aw66TX1rPiuSAbGSn+Mcnl8g+XlHLOMMTz+NPloHwj2/Tp4fSf59w/IOSw==
+                        default: sha512-2qai8t66dyHEIaPFjdJ9M5nPh53vkH5O7Keed/lFNH0TbPoxamql9V0tdOwdx5Mb7bJwj9N1ulin/mCNniFuTA==
                         description: Package SHA integrity
                         type: string
                       package:
-                        default: plugin-notifications-backend-dynamic@1.2.0
+                        default: plugin-notifications-backend-dynamic@1.3.0-rc.3
                         description: Package name
                         type: string
                     type: object
@@ -381,11 +399,11 @@ spec:
                           See plugin configuration at https://github.com/backstage/backstage/blob/master/plugins/notifications-backend-module-email/config.d.ts
                         type: boolean
                       integrity:
-                        default: sha512-dtmliahV5+xtqvwdxP2jvyzd5oXTbv6lvS3c9nR8suqxTullxxj0GFg1uU2SQ2uKBQWhOz8YhSmrRwxxLa9Zqg==
+                        default: sha512-uIGPDdSha9H1kWwofYJXg/GgrGZuF9WZTXgRb8YtN4iKAAZ9FLAD9BuLobUKYXbzO6jGaNzIw82kTJa1VhvEzg==
                         description: Package SHA integrity
                         type: string
                       package:
-                        default: plugin-notifications-backend-module-email-dynamic@1.2.0
+                        default: plugin-notifications-backend-module-email-dynamic@1.3.0-rc.3
                         description: Package name
                         type: string
                       port:
@@ -412,23 +430,23 @@ spec:
                     description: Orchestrator plugin information
                     properties:
                       integrity:
-                        default: sha512-FhM13wVXjjF39syowc4RnMC/gKm4TRlmh8lBrMwPXAw1VzgIADI8H6WVEs837poVX/tYSqj2WhehwzFqU6PuhA==
+                        default: sha512-s8SeUMLr9L9oqc2EHqn+KxQlFqXD/OIr3hS/jVUWhxfnC7cwfFNiqZG1c5Kl9vtI16zAc8MUf+qhsCd7S1MYvg==
                         description: Package SHA integrity
                         type: string
                       package:
-                        default: backstage-plugin-orchestrator@1.2.0
+                        default: backstage-plugin-orchestrator@1.3.0-rc.3
                         description: Package name
                         type: string
                     type: object
                   orchestratorBackend:
                     description: Orchestrator backend plugin information
                     properties:
                       integrity:
-                        default: sha512-lyw7IHuXsakTa5Pok8S2GK0imqrmXe3z+TcL7eB2sJYFqQPkCP5la1vqteL9/1EaI5eI6nKZ60WVRkPEldKBTg==
+                        default: sha512-08cllbcquVA6QLuO0XknxdynS5mvAazb0s9zES1AkuFn2GR7ZKIuIZMjcUwVjHEthwv4UdSNPB7W3IFDsmSDZw==
                         description: Package SHA integrity
                         type: string
                       package:
-                        default: backstage-plugin-orchestrator-backend-dynamic@1.2.0
+                        default: backstage-plugin-orchestrator-backend-dynamic@1.3.0-rc.3
                         description: Package name
                         type: string
                     type: object
@@ -440,23 +458,23 @@ spec:
                     description: Signals plugin information
                     properties:
                       integrity:
-                        default: sha512-5tbZyRob0JDdrI97HXb7JqFIzNho1l7JuIkob66J+ZMAPCit+pjN1CUuPbpcglKyyIzULxq63jMBWONxcqNSXw==
+                        default: sha512-WRUi5xpJDD5Jd2p+juCIpsXCnXfHLoSwPZ/N7a7ZnqarfajTkL8qOglhIJh+lVTbe65S8v1rtQLGj9bTCXuPlA==
                         description: Package SHA integrity
                         type: string
                       package:
-                        default: plugin-signals-dynamic@1.2.0
+                        default: plugin-signals-dynamic@1.3.0-rc.3
                         description: Package name
                         type: string
                     type: object
                   signalsBackend:
                     description: Signals backend plugin information
                     properties:
                       integrity:
-                        default: sha512-DIISzxtjeJ4a9mX3TLcuGcavRHbCtQ5b52wHn+9+uENUL2IDbFoqmB4/9BQASaKIUSFkRKLYpc5doIkrnTVyrA==
+                        default: sha512-FgmPouKc2FuHSMfmkdXCVx0/1kPlT6OVbRUNFzOJGSjZAj0nvxSg+W3pt15dSOC5Fe5j2FLSuevCx34YVA+VzQ==
                         description: Package SHA integrity
                         type: string
                       package:
-                        default: plugin-signals-backend-dynamic@1.2.0
+                        default: plugin-signals-backend-dynamic@1.3.0-rc.3
                         description: Package name
                         type: string
                     type: object
@@ -546,6 +564,16 @@ spec:
                         type: string
                     type: object
                 type: object
+              sonataflow:
+                description: SonatafFlow contains the configuration fields for the
+                  SonataFlow when using release candidate
+                properties:
+                  images:
+                    description: Indicates RC builds images that should be used by
+                      the chart to install Sonataflow
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                type: object
               tekton:
                 description: Contains the tekton configuration fields
                 properties:

diff --git a/config/crd/bases/rhdh.redhat.com_orchestrators.yaml b/config/crd/bases/rhdh.redhat.com_orchestrators.yaml
@@ -404,6 +404,14 @@ spec:
                   sonataflowPlatform:
                     description: SonataflowPlatform contains the pod resource configuration to be used for the data index and job services
                     properties:
+                      monitoring:
+                        description: Contains the monitoring configuration fields
+                        properties:
+                          enabled:
+                            description: Enabled determines whether monitoring should be enabled. Defaults to true.
+                            default: true
+                            type: boolean
+                        type: object
                       resources:
                         description: Resources contains the requests and limit of CPU and memory resources for the pod instance
                         type: object

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/orchestrator/orchestrator-operator
-  newTag: 1.3.0
+  newTag: 1.3.0-rc6
diff --git a/config/samples/_v1alpha1_orchestrator.yaml b/config/samples/_v1alpha1_orchestrator.yaml
@@ -91,6 +91,8 @@ spec:
   orchestrator:
     namespace: "sonataflow-infra" # Namespace where sonataflow's workflows run. The value is captured when running the setup.sh script and stored as a label in the selected namespace. User can override the value by populating this field. Defaults to `sonataflow-infra`.
     sonataflowPlatform:
+      monitoring:
+        enabled: true
       resources:
         requests:
           memory: "64Mi"

diff --git a/helm-charts/orchestrator/templates/sonataflows.yaml b/helm-charts/orchestrator/templates/sonataflows.yaml
@@ -23,6 +23,8 @@ metadata:
   annotations:
     "meta.helm.sh/release-name": {{ .Release.Name}}
 spec:
+  monitoring:
+    enabled: {{ .Values.orchestrator.sonataflowPlatform.monitoring.enabled }}
   build:
     template:
       resources:

diff --git a/helm-charts/orchestrator/values.schema.json b/helm-charts/orchestrator/values.schema.json
@@ -1347,6 +1347,9 @@
         "orchestrator": {
             "namespace": "sonataflow-infra",
             "sonataflowPlatform": {
+                "monitoring": {
+                    "enabled": false
+                },
                 "resources": {
                     "requests": {
                         "memory": "64Mi",

diff --git a/helm-charts/orchestrator/values.yaml b/helm-charts/orchestrator/values.yaml
@@ -93,6 +93,8 @@ postgres:
 orchestrator:
   namespace: "sonataflow-infra" # Namespace where sonataflow's workflows run. The value is captured when running the setup.sh script and stored as a label in the selected namespace. User can override the value by populating this field. Defaults to `sonataflow-infra`.
   sonataflowPlatform:
+    monitoring:
+      enabled: true
     resources:
       requests:
         memory: "64Mi"