rhdhorchestrator · jenniferubah · Dec 19, 2024 · Dec 12, 2024 · Dec 16, 2024 · Dec 16, 2024
diff --git a/bundle/manifests/orchestrator-operator.clusterserviceversion.yaml b/bundle/manifests/orchestrator-operator.clusterserviceversion.yaml
@@ -5,7 +5,7 @@ metadata:
     alm-examples: |-
       [
         {
-          "apiVersion": "rhdh.redhat.com/v1alpha1",
+          "apiVersion": "rhdh.redhat.com/v1alpha2",
           "kind": "Orchestrator",
           "metadata": {
             "name": "orchestrator-sample"
@@ -83,18 +83,8 @@ metadata:
               }
             },
             "rhdhPlugins": {
-              "notifications": {
-                "integrity": "sha512-iYLgIy0YdP/CdTLol07Fncmo9n0J8PdIZseiwAyUt9RFJzKIXmoi2CpQLPKMx36lEgPYUlT0rFO81Ie2CSis4Q==",
-                "package": "[email protected]"
-              },
-              "notificationsBackend": {
-                "integrity": "sha512-Pw9Op/Q+1MctmLiVvQ3M+89tkbWkw8Lw0VfcwyGSMiHpK/Xql1TrSFtThtLlymRgeCSBgxHYhh3MUusNQX08VA==",
-                "package": "[email protected]"
-              },
               "notificationsEmail": {
                 "enabled": false,
-                "integrity": "sha512-sm7yRoO6Nkk3B7+AWKb10maIrb2YBNSiqQaWmFDVg2G9cbDoWr9wigqqeQ32+b6o2FenfNWg8xKY6PPyZGh8BA==",
-                "package": "[email protected]",
                 "port": 587,
                 "replyTo": "",
                 "sender": ""
@@ -108,15 +98,7 @@ metadata:
                 "integrity": "sha512-Th5vmwyhHyhURwQo28++PPHTvxGSFScSHPJyofIdE5gTAb87ncyfyBkipSDq7fwj4L8CQTXa4YP6A2EkHW1npg==",
                 "package": "[email protected]"
               },
-              "scope": "@redhat",
-              "signals": {
-                "integrity": "sha512-+E8XeTXcG5oy+aNImGj/MY0dvEkP7XAsu4xuZjmAqOHyVfiIi0jnP/QDz8XMbD1IjCimbr/DMUZdjmzQiD0hSQ==",
-                "package": "[email protected]"
-              },
-              "signalsBackend": {
-                "integrity": "sha512-5Bl6C+idPXtquQxMZW+bjRMcOfFYcKxcGZZFv2ITkPVeY2zzxQnAz3vYHnbvKRSwlQxjIyRXY6YgITGHXWT0nw==",
-                "package": "[email protected]"
-              }
+              "scope": "@redhat"
             },
             "serverlessOperator": {
               "enabled": true,
@@ -186,7 +168,7 @@ spec:
       displayName: Orchestrator
       kind: Orchestrator
       name: orchestrators.rhdh.redhat.com
-      version: v1alpha1
+      version: v1alpha2
   description: |
     Red Hat Developer Hub Orchestrator is a plugin that enables serverless asynchronous workflows to Backstage.
 

diff --git a/bundle/manifests/rhdh.redhat.com_orchestrators.yaml b/bundle/manifests/rhdh.redhat.com_orchestrators.yaml
@@ -19,7 +19,7 @@ spec:
     - jsonPath: .status.conditions[-1:].reason
       name: Reason
       type: string
-    name: v1alpha1
+    name: v1alpha2
     schema:
       openAPIV3Schema:
         description: Orchestrator is the Schema for the orchestrators API
@@ -369,30 +369,6 @@ spec:
               rhdhPlugins:
                 description: Backstage plugins
                 properties:
-                  notifications:
-                    description: Notification plugin information
-                    properties:
-                      integrity:
-                        default: sha512-iYLgIy0YdP/CdTLol07Fncmo9n0J8PdIZseiwAyUt9RFJzKIXmoi2CpQLPKMx36lEgPYUlT0rFO81Ie2CSis4Q==
-                        description: Package SHA integrity
-                        type: string
-                      package:
-                        default: [email protected]
-                        description: Package name
-                        type: string
-                    type: object
-                  notificationsBackend:
-                    description: Notification backend plugin information
-                    properties:
-                      integrity:
-                        default: sha512-Pw9Op/Q+1MctmLiVvQ3M+89tkbWkw8Lw0VfcwyGSMiHpK/Xql1TrSFtThtLlymRgeCSBgxHYhh3MUusNQX08VA==
-                        description: Package SHA integrity
-                        type: string
-                      package:
-                        default: [email protected]
-                        description: Package name
-                        type: string
-                    type: object
                   notificationsEmail:
                     description: Notification email plugin information
                     properties:
@@ -403,14 +379,6 @@ spec:
                           secret to enable. See value backstage-backend-auth-secret.
                           See plugin configuration at https://github.com/backstage/backstage/blob/master/plugins/notifications-backend-module-email/config.d.ts
                         type: boolean
-                      integrity:
-                        default: sha512-sm7yRoO6Nkk3B7+AWKb10maIrb2YBNSiqQaWmFDVg2G9cbDoWr9wigqqeQ32+b6o2FenfNWg8xKY6PPyZGh8BA==
-                        description: Package SHA integrity
-                        type: string
-                      package:
-                        default: [email protected]
-                        description: Package name
-                        type: string
                       port:
                         default: 587
                         description: SMTP server port
@@ -459,30 +427,6 @@ spec:
                     default: '@redhat'
                     description: Scope of the plugins
                     type: string
-                  signals:
-                    description: Signals plugin information
-                    properties:
-                      integrity:
-                        default: sha512-+E8XeTXcG5oy+aNImGj/MY0dvEkP7XAsu4xuZjmAqOHyVfiIi0jnP/QDz8XMbD1IjCimbr/DMUZdjmzQiD0hSQ==
-                        description: Package SHA integrity
-                        type: string
-                      package:
-                        default: [email protected]
-                        description: Package name
-                        type: string
-                    type: object
-                  signalsBackend:
-                    description: Signals backend plugin information
-                    properties:
-                      integrity:
-                        default: sha512-5Bl6C+idPXtquQxMZW+bjRMcOfFYcKxcGZZFv2ITkPVeY2zzxQnAz3vYHnbvKRSwlQxjIyRXY6YgITGHXWT0nw==
-                        description: Package SHA integrity
-                        type: string
-                      package:
-                        default: [email protected]
-                        description: Package name
-                        type: string
-                    type: object
                 type: object
               serverlessOperator:
                 properties:

diff --git a/config/crd/bases/rhdh.redhat.com_orchestrators.yaml b/config/crd/bases/rhdh.redhat.com_orchestrators.yaml
@@ -12,14 +12,16 @@ spec:
     singular: orchestrator
   scope: Namespaced
   versions:
-  - additionalPrinterColumns:
-    - jsonPath: .status.conditions[-1:].status
-      name: Ready
-      type: string
-    - jsonPath: .status.conditions[-1:].reason
-      name: Reason
-      type: string
-    name: v1alpha1
+  - name: v1alpha2
+    served: true
+    storage: true
+    additionalPrinterColumns:
+      - jsonPath: .status.conditions[-1:].status
+        name: Ready
+        type: string
+      - jsonPath: .status.conditions[-1:].reason
+        name: Reason
+        type: string
     schema:
       openAPIV3Schema:
         description: Orchestrator is the Schema for the orchestrators API
@@ -297,69 +299,13 @@ spec:
                         type: string
                         default: sha512-Th5vmwyhHyhURwQo28++PPHTvxGSFScSHPJyofIdE5gTAb87ncyfyBkipSDq7fwj4L8CQTXa4YP6A2EkHW1npg==
                     type: object
-                  notifications:
-                    description: Notification plugin information
-                    properties:
-                      package:
-                        description: Package name
-                        type: string
-                        default: [email protected]
-                      integrity:
-                        description: Package SHA integrity
-                        type: string
-                        default: sha512-iYLgIy0YdP/CdTLol07Fncmo9n0J8PdIZseiwAyUt9RFJzKIXmoi2CpQLPKMx36lEgPYUlT0rFO81Ie2CSis4Q==
-                    type: object
-                  notificationsBackend:
-                    description: Notification backend plugin information
-                    properties:
-                      package:
-                        description: Package name
-                        type: string
-                        default: [email protected]
-                      integrity:
-                        description: Package SHA integrity
-                        type: string
-                        default: sha512-Pw9Op/Q+1MctmLiVvQ3M+89tkbWkw8Lw0VfcwyGSMiHpK/Xql1TrSFtThtLlymRgeCSBgxHYhh3MUusNQX08VA==
-                    type: object
-                  signals:
-                    description: Signals plugin information
-                    properties:
-                      package:
-                        description: Package name
-                        type: string
-                        default: [email protected]
-                      integrity:
-                        description: Package SHA integrity
-                        type: string
-                        default: sha512-+E8XeTXcG5oy+aNImGj/MY0dvEkP7XAsu4xuZjmAqOHyVfiIi0jnP/QDz8XMbD1IjCimbr/DMUZdjmzQiD0hSQ==
-                    type: object
-                  signalsBackend:
-                    description: Signals backend plugin information
-                    properties:
-                      package:
-                        description: Package name
-                        type: string
-                        default: [email protected]
-                      integrity:
-                        description: Package SHA integrity
-                        type: string
-                        default: sha512-5Bl6C+idPXtquQxMZW+bjRMcOfFYcKxcGZZFv2ITkPVeY2zzxQnAz3vYHnbvKRSwlQxjIyRXY6YgITGHXWT0nw==
-                    type: object
                   notificationsEmail:
                     description: Notification email plugin information
                     properties:
                       enabled:
                         description: whether to install the notifications email plugin. requires setting of hostname and credentials in backstage secret to enable. See value backstage-backend-auth-secret. See plugin configuration at https://github.com/backstage/backstage/blob/master/plugins/notifications-backend-module-email/config.d.ts
                         type: boolean
                         default: false
-                      package:
-                        description: Package name
-                        type: string
-                        default: [email protected]
-                      integrity:
-                        description: Package SHA integrity
-                        type: string
-                        default: sha512-sm7yRoO6Nkk3B7+AWKb10maIrb2YBNSiqQaWmFDVg2G9cbDoWr9wigqqeQ32+b6o2FenfNWg8xKY6PPyZGh8BA==
                       port:
                         description: SMTP server port
                         type: integer
@@ -490,7 +436,5 @@ spec:
             type: object
             x-kubernetes-preserve-unknown-fields: true
         type: object
-    served: true
-    storage: true
     subresources:
       status: {}
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -69,6 +69,7 @@ spec:
       - args:
         - --leader-elect
         - --leader-election-id=orchestrator-operator
+        - --api-version=rhdh.redhat.com/v1alpha2
         image: controller:latest
         name: manager
         securityContext:

diff --git a/config/manifests/bases/orchestrator-operator.clusterserviceversion.yaml b/config/manifests/bases/orchestrator-operator.clusterserviceversion.yaml
@@ -40,7 +40,7 @@ spec:
       displayName: Orchestrator
       kind: Orchestrator
       name: orchestrators.rhdh.redhat.com
-      version: v1alpha1
+      version: v1alpha2
   description: |
     Red Hat Developer Hub Orchestrator is a plugin that enables serverless asynchronous workflows to Backstage.
 
@@ -80,4 +80,4 @@ spec:
   provider:
     name: Red Hat
     url: https://www.redhat.com
-  version: 1.2.0
+  version: 1.3.0
diff --git a/config/samples/_v1alpha1_orchestrator.yaml → config/samples/_v1alpha2_orchestrator.yaml b/config/samples/_v1alpha1_orchestrator.yaml → config/samples/_v1alpha2_orchestrator.yaml
@@ -1,4 +1,4 @@
-apiVersion: rhdh.redhat.com/v1alpha1
+apiVersion: rhdh.redhat.com/v1alpha2
 kind: Orchestrator
 metadata:
   name: orchestrator-sample
@@ -61,22 +61,8 @@ spec:
     orchestratorBackend:
       package: "[email protected]"
       integrity: sha512-Th5vmwyhHyhURwQo28++PPHTvxGSFScSHPJyofIdE5gTAb87ncyfyBkipSDq7fwj4L8CQTXa4YP6A2EkHW1npg==
-    notifications:
-      package: "[email protected]"
-      integrity: sha512-iYLgIy0YdP/CdTLol07Fncmo9n0J8PdIZseiwAyUt9RFJzKIXmoi2CpQLPKMx36lEgPYUlT0rFO81Ie2CSis4Q==
-    notificationsBackend:
-      package: "[email protected]"
-      integrity: sha512-Pw9Op/Q+1MctmLiVvQ3M+89tkbWkw8Lw0VfcwyGSMiHpK/Xql1TrSFtThtLlymRgeCSBgxHYhh3MUusNQX08VA==
-    signals:
-      package: "[email protected]"
-      integrity: sha512-+E8XeTXcG5oy+aNImGj/MY0dvEkP7XAsu4xuZjmAqOHyVfiIi0jnP/QDz8XMbD1IjCimbr/DMUZdjmzQiD0hSQ==
-    signalsBackend:
-      package: "[email protected]"
-      integrity: sha512-5Bl6C+idPXtquQxMZW+bjRMcOfFYcKxcGZZFv2ITkPVeY2zzxQnAz3vYHnbvKRSwlQxjIyRXY6YgITGHXWT0nw==
     notificationsEmail:
       enabled: false # whether to install the notifications email plugin. requires setting of hostname and credentials in backstage secret to enable. See value backstage-backend-auth-secret. See plugin configuration at https://github.com/backstage/backstage/blob/master/plugins/notifications-backend-module-email/config.d.ts
-      package: "[email protected]"
-      integrity: sha512-sm7yRoO6Nkk3B7+AWKb10maIrb2YBNSiqQaWmFDVg2G9cbDoWr9wigqqeQ32+b6o2FenfNWg8xKY6PPyZGh8BA==
       port: 587 # SMTP server port
       sender: "" # the email sender address
       replyTo: "" # reply-to address

diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
@@ -1,4 +1,4 @@
 ## Append samples of your project ##
 resources:
-- _v1alpha1_orchestrator.yaml
+- _v1alpha2_orchestrator.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples
diff --git a/helm-charts/orchestrator/templates/rhdh-operator.yaml b/helm-charts/orchestrator/templates/rhdh-operator.yaml
@@ -202,8 +202,7 @@ data:
                     module: OrchestratorPlugin
                     path: /orchestrator
       - disabled: false
-        package: "{{ .Values.rhdhPlugins.scope }}/{{ .Values.rhdhPlugins.notifications.package }}"
-        integrity: {{ .Values.rhdhPlugins.notifications.integrity }}
+        package: ./dynamic-plugins/dist/backstage-plugin-notifications
         pluginConfig:
           dynamicPlugins:
             frontend:
@@ -218,26 +217,22 @@ data:
                       importName: NotificationsSidebarItem
                     path: /notifications
       - disabled: false
-        package: "{{ .Values.rhdhPlugins.scope }}/{{ .Values.rhdhPlugins.signals.package }}"
-        integrity: {{ .Values.rhdhPlugins.signals.integrity }}
+        package: ./dynamic-plugins/dist/backstage-plugin-signals
         pluginConfig:
           dynamicPlugins:
             frontend:
               redhat.plugin-signals: {}
       - disabled: false
-        package: "{{ .Values.rhdhPlugins.scope }}/{{ .Values.rhdhPlugins.notificationsBackend.package }}"
-        integrity: {{ .Values.rhdhPlugins.notificationsBackend.integrity }}
+        package: ./dynamic-plugins/dist/backstage-plugin-notifications-backend-dynamic
       - disabled: false
-        package: "{{ .Values.rhdhPlugins.scope }}/{{ .Values.rhdhPlugins.signalsBackend.package }}"
-        integrity: {{ .Values.rhdhPlugins.signalsBackend.integrity }}
+        package: ./dynamic-plugins/dist/backstage-plugin-signals-backend-dynamic
       - disabled: false
         package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-github-dynamic
   {{- if and .Values.rhdhPlugins.notificationsEmail.enabled
         ( and (.Values.rhdhOperator.secretRef.notificationsEmail.hostname) (dig "data" .Values.rhdhOperator.secretRef.notificationsEmail.hostname "" $secret ) )
   }}
       - disabled: false
-        package: "{{ .Values.rhdhPlugins.scope }}/{{ .Values.rhdhPlugins.notificationsEmail.package }}"
-        integrity: {{ .Values.rhdhPlugins.notificationsEmail.integrity }}
+        package: ./dynamic-plugins/dist/backstage-plugin-notifications-backend-module-email-dynamic
         pluginConfig:
           notifications:
             processors: