Bump RHDH 1.4 RC

Signed-off-by: gabriel-farache <[email protected]>
rhdhorchestrator · Dec 9, 2024 · 3bb886c · 3bb886c
1 parent e43d2bc
commit 3bb886c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/config/crd/bases/rhdh.redhat.com_orchestrators.yaml b/config/crd/bases/rhdh.redhat.com_orchestrators.yaml
@@ -40,6 +40,14 @@ spec:
             description: Spec defines the desired state of Orchestrator
             type: object
             properties:
+              rhdh:
+                description: rhdh contains the configuration fields for the RHDH when using release candidate
+                properties:
+                  images:
+                    description: Indicates RC builds images that should be used by the chart to install RHDH
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                type: object
               sonataflow:
                 description: SonatafFlow contains the configuration fields for the SonataFlow when using release candidate
                 properties:
@@ -240,6 +248,10 @@ spec:
                         default: "redhat-operators"
                         description: SourceName captures the name of the catalog source
                         type: string
+                      source:
+                        default: "redhat-operators"
+                        description: SourceName captures the name of the catalog source
+                        type: string
                       startingCSV:
                         default: ""
                         description: The initial version of the operator

diff --git a/config/samples/_v1alpha1_orchestrator-rc.yaml b/config/samples/_v1alpha1_orchestrator-rc.yaml
@@ -3,6 +3,14 @@ kind: Orchestrator
 metadata:
   name: orchestrator-sample
 spec:
+  rhdh:
+    images:
+      4.13: quay.io/rhdh/iib:1.4-v4.14-x86_64
+      4.14: quay.io/rhdh/iib:1.4-v4.14-x86_64
+      4.15: quay.io/rhdh/iib:1.4-v4.14-x86_64
+      4.16: quay.io/rhdh/iib:1.4-v4.14-x86_64
+      4.17: quay.io/rhdh/iib:1.4-v4.14-x86_64
+
   sonataflow:
     images:
       4.13: brew.registry.redhat.io/rh-osbs/iib:878684
@@ -29,7 +37,7 @@ spec:
       name: serverless-operator # name of the operator package
       sourceName: redhat-operators # name of the catalog source
   rhdhOperator:
-    isReleaseCandidate: false # Indicates RC builds should be used by the chart to install RHDH
+    isReleaseCandidate: true # Indicates RC builds should be used by the chart to install RHDH
     enabled: true # whether the operator should be deployed by the chart
     enableGuestProvider: false # whether to enable guest provider
     secretRef:
@@ -53,10 +61,10 @@ spec:
         password: NOTIFICATIONS_EMAIL_PASSWORD # Key in the secret with name defined in the 'name' field that contains the value of the password of the SMTP server for the notifications plugin. Defaults to 'NOTIFICATIONS_EMAIL_PASSWORD', empty for not available.
     subscription:
       namespace: rhdh-operator # namespace where the operator should be deployed
-      channel: fast-1.3 # channel of an operator package to subscribe to
+      channel: fast # channel of an operator package to subscribe to
       installPlanApproval: Automatic # whether the update should be installed automatically
       name: rhdh # name of the operator package
-      source: redhat-operators # name of the catalog source
+      source: redhat-brew # name of the catalog source, in case of RC will be used to name the CatalogSource
       startingCSV: "" # The initial version of the operator
       targetNamespace: rhdh-operator # the target namespace for the backstage CR in which RHDH instance is created
   rhdhPlugins: # RHDH plugins required for the Orchestrator

diff --git a/helm-charts/orchestrator/values-rc.yaml b/helm-charts/orchestrator/values-rc.yaml
@@ -10,15 +10,15 @@ sonataFlowOperator:
     startingCSV: logic-operator-rhel8.v1.35.0 # The initial version of the operator
 
 rhdhOperator:
-  isReleaseCandidate: false # Indicates RC builds should be used by the chart to install RHDH
+  isReleaseCandidate: true # Indicates RC builds should be used by the chart to install RHDH
   enabled: true # whether the operator should be deployed by the chart
   subscription:
     namespace: rhdh-operator # namespace where the operator should be deployed
     channel: fast # channel of an operator package to subscribe to
     name: rhdh # name of the operator package
-    source: rhdh-brew # name of the catalog source
-    startingCSV: rhdh-operator.v1.3.0 # The initial version of the operator
-
+    source: redhat-brew # name of the catalog source, in case of RC will be used to name the CatalogSource
+    startingCSV: "" # The initial version of the operator
+    targetNamespace: rhdh-operator # the target namespace for the backstage CR in which RHDH instance is created
 sonataflow:
   images:
       4.13: brew.registry.redhat.io/rh-osbs/iib:878684
@@ -29,10 +29,11 @@ sonataflow:
 
 rhdh:
   images:
-    4.13: quay.io/rhdh/iib:1.2.0.RC-06-18-v4.13-x86_64
-    4.14: quay.io/rhdh/iib:1.2.0.RC-06-18-v4.14-x86_64
-    4.15: quay.io/rhdh/iib:1.2.0.RC-06-18-v4.15-x86_64
-    4.16: quay.io/rhdh/iib:1.2.0.RC-06-18-v4.16-x86_64
+    4.13: quay.io/rhdh/iib:1.4-v4.14-x86_64
+    4.14: quay.io/rhdh/iib:1.4-v4.14-x86_64
+    4.15: quay.io/rhdh/iib:1.4-v4.14-x86_64
+    4.16: quay.io/rhdh/iib:1.4-v4.14-x86_64
+    4.17: quay.io/rhdh/iib:1.4-v4.14-x86_64
 
 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`.