From 2ece5d4fb1ee665a13d5a81237a1c08fb6cd4ce0 Mon Sep 17 00:00:00 2001 From: gabriel-farache Date: Thu, 10 Oct 2024 11:57:52 +0200 Subject: [PATCH 1/2] Bump RHDH to 1.3 and update argocd plugin Signed-off-by: gabriel-farache --- Dockerfile | 4 ++-- Makefile | 2 +- bundle.konflux.Dockerfile | 4 ++-- config/samples/_v1alpha1_orchestrator.yaml | 2 +- helm-charts/orchestrator/Chart.yaml | 2 +- helm-charts/orchestrator/templates/rhdh-operator.yaml | 2 +- helm-charts/orchestrator/values-rc.yaml | 2 +- helm-charts/orchestrator/values.yaml | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6aa4617c..fb8a18df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ FROM quay.io/orchestrator/helm-operator:v1.35.0-cve-fixes LABEL com.redhat.component="RHDH Orchestrator Helm Operator" LABEL distribution-scope="public" LABEL name="rhdh-orchestrator-helm-operator-bundle" -LABEL release="1.2.0" -LABEL version="1.2.0" +LABEL release="1.3.0" +LABEL version="1.3.0" LABEL maintainer="Red Hat jgil@redhat.com" LABEL url="https://github.com/parodos-dev/orchestrator-helm-operator" LABEL vendor="Red Hat, Inc." diff --git a/Makefile b/Makefile index ee45e08b..61f3c598 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 1.2.0 +VERSION ?= 1.3.0 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") diff --git a/bundle.konflux.Dockerfile b/bundle.konflux.Dockerfile index 79272268..b483b525 100644 --- a/bundle.konflux.Dockerfile +++ b/bundle.konflux.Dockerfile @@ -18,8 +18,8 @@ LABEL controller="registry.redhat.io/rhdh-orchestrator-dev-preview-beta/controll LABEL com.redhat.component="RHDH Orchestrator Helm Operator" LABEL distribution-scope="public" LABEL name="rhdh-orchestrator-helm-operator-bundle" -LABEL release="1.2.0" -LABEL version="1.2.0" +LABEL release="1.3.0" +LABEL version="1.3.0" LABEL maintainer="Red Hat jgil@redhat.com" LABEL url="https://github.com/parodos-dev/orchestrator-helm-operator" LABEL vendor="Red Hat, Inc." diff --git a/config/samples/_v1alpha1_orchestrator.yaml b/config/samples/_v1alpha1_orchestrator.yaml index e5bc2464..0b246575 100644 --- a/config/samples/_v1alpha1_orchestrator.yaml +++ b/config/samples/_v1alpha1_orchestrator.yaml @@ -46,7 +46,7 @@ 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.2 # channel of an operator package to subscribe to + channel: fast-1.3 # 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 diff --git a/helm-charts/orchestrator/Chart.yaml b/helm-charts/orchestrator/Chart.yaml index 2bfd6b73..53a796e7 100644 --- a/helm-charts/orchestrator/Chart.yaml +++ b/helm-charts/orchestrator/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.0-rc23 +version: 1.3.0-rc1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/helm-charts/orchestrator/templates/rhdh-operator.yaml b/helm-charts/orchestrator/templates/rhdh-operator.yaml index 52ce1de0..5de54202 100644 --- a/helm-charts/orchestrator/templates/rhdh-operator.yaml +++ b/helm-charts/orchestrator/templates/rhdh-operator.yaml @@ -170,7 +170,7 @@ data: ) }} - disabled: false - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-argocd + package: ./dynamic-plugins/dist/backstage-community-plugin-redhat-argocd - disabled: false package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic - disabled: false diff --git a/helm-charts/orchestrator/values-rc.yaml b/helm-charts/orchestrator/values-rc.yaml index 27a83ba5..1a257ead 100644 --- a/helm-charts/orchestrator/values-rc.yaml +++ b/helm-charts/orchestrator/values-rc.yaml @@ -17,7 +17,7 @@ rhdhOperator: 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.2.0 # The initial version of the operator + startingCSV: rhdh-operator.v1.3.0 # The initial version of the operator sonataflow: images: diff --git a/helm-charts/orchestrator/values.yaml b/helm-charts/orchestrator/values.yaml index c04f8ebd..10f447f9 100644 --- a/helm-charts/orchestrator/values.yaml +++ b/helm-charts/orchestrator/values.yaml @@ -22,7 +22,7 @@ rhdhOperator: isReleaseCandidate: false # 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 - catalogBranch: v1.2.x # The branch for https://github.com/parodos-dev/workflow-software-templates used to import software templates resources + catalogBranch: v1.3.x # The branch for https://github.com/parodos-dev/workflow-software-templates used to import software templates resources secretRef: name: backstage-backend-auth-secret # name of the secret that contains the credentials for the plugin to establish a communication channel with the Kubernetes API, ArgoCD, GitHub servers and SMTP mail server. backstage: @@ -45,7 +45,7 @@ rhdhOperator: subscription: namespace: rhdh-operator # namespace where the operator should be deployed - channel: fast-1.2 # channel of an operator package to subscribe to + channel: fast-1.3 # 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 From fa493331d8c1b5180fc347186bc9f8886f553037 Mon Sep 17 00:00:00 2001 From: gabriel-farache Date: Tue, 15 Oct 2024 18:30:54 +0200 Subject: [PATCH 2/2] Update sample plugins Signed-off-by: gabriel-farache --- config/samples/_v1alpha1_orchestrator.yaml | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/config/samples/_v1alpha1_orchestrator.yaml b/config/samples/_v1alpha1_orchestrator.yaml index 0b246575..a9406e93 100644 --- a/config/samples/_v1alpha1_orchestrator.yaml +++ b/config/samples/_v1alpha1_orchestrator.yaml @@ -56,27 +56,27 @@ spec: npmRegistry: "https://npm.registry.redhat.com" # NPM registry is defined already in the container, but sometimes the registry need to be modified to use different versions of the plugin, for example: staging(https://npm.stage.registry.redhat.com) or development repositories scope: "@redhat" orchestrator: - package: "backstage-plugin-orchestrator@1.2.0" - integrity: sha512-FhM13wVXjjF39syowc4RnMC/gKm4TRlmh8lBrMwPXAw1VzgIADI8H6WVEs837poVX/tYSqj2WhehwzFqU6PuhA== + package: "backstage-plugin-orchestrator@1.3.0-rc.0" + integrity: sha512-rg+VX81ILTXhfyZqyff0rSmoeEse47ICjKcdavxvfKiG+Rd4uxo80P6o5ca2ZLzsJhYPiKk9Jl3HPtcmLCGzPg== orchestratorBackend: - package: "backstage-plugin-orchestrator-backend-dynamic@1.2.0" - integrity: sha512-lyw7IHuXsakTa5Pok8S2GK0imqrmXe3z+TcL7eB2sJYFqQPkCP5la1vqteL9/1EaI5eI6nKZ60WVRkPEldKBTg== + package: "backstage-plugin-orchestrator-backend-dynamic@1.3.0-rc.0" + integrity: sha512-vFF3jQ3VAo4CvQxO9Q/B+4epp7J9tgAIh54h5JAO8S58EaM6oXwc+A5ClK8xPey6QtBOX0mA5yaJ2UgqamtQ+Q== notifications: - package: "plugin-notifications-dynamic@1.2.0" - integrity: sha512-1mhUl14v+x0Ta1o8Sp4KBa02izGXHd+wsiCVsDP/th6yWDFJsfSMf/DyMIn1Uhat1rQgVFRUMg8QgrvbgZCR/w== + package: "plugin-notifications-dynamic@1.3.0-rc.3" + integrity: sha512-zqwK318o+Lc16pV5wvN6IWMLFqImOWr0xbsGBI69YNVGpXA6AOccXInGbn1RA1QKXfV5sNo8xc5N0WIIgx43Iw== notificationsBackend: - package: "plugin-notifications-backend-dynamic@1.2.0" - integrity: sha512-pCFB/jZIG/Ip1wp67G0ZDJPp63E+aw66TX1rPiuSAbGSn+Mcnl8g+XlHLOMMTz+NPloHwj2/Tp4fSf59w/IOSw== + package: "plugin-notifications-backend-dynamic@1.3.0-rc.3" + integrity: sha512-2qai8t66dyHEIaPFjdJ9M5nPh53vkH5O7Keed/lFNH0TbPoxamql9V0tdOwdx5Mb7bJwj9N1ulin/mCNniFuTA== signals: - package: "plugin-signals-dynamic@1.2.0" - integrity: sha512-5tbZyRob0JDdrI97HXb7JqFIzNho1l7JuIkob66J+ZMAPCit+pjN1CUuPbpcglKyyIzULxq63jMBWONxcqNSXw== + package: "plugin-signals-dynamic@1.3.0-rc.3" + integrity: sha512-WRUi5xpJDD5Jd2p+juCIpsXCnXfHLoSwPZ/N7a7ZnqarfajTkL8qOglhIJh+lVTbe65S8v1rtQLGj9bTCXuPlA== signalsBackend: - package: "plugin-signals-backend-dynamic@1.2.0" - integrity: sha512-DIISzxtjeJ4a9mX3TLcuGcavRHbCtQ5b52wHn+9+uENUL2IDbFoqmB4/9BQASaKIUSFkRKLYpc5doIkrnTVyrA== + package: "plugin-signals-backend-dynamic@1.3.0-rc.3" + integrity: sha512-FgmPouKc2FuHSMfmkdXCVx0/1kPlT6OVbRUNFzOJGSjZAj0nvxSg+W3pt15dSOC5Fe5j2FLSuevCx34YVA+VzQ== 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: "plugin-notifications-backend-module-email-dynamic@1.2.0" - integrity: sha512-dtmliahV5+xtqvwdxP2jvyzd5oXTbv6lvS3c9nR8suqxTullxxj0GFg1uU2SQ2uKBQWhOz8YhSmrRwxxLa9Zqg== + package: "plugin-notifications-backend-module-email-dynamic@1.3.0-rc.3" + integrity: sha512-uIGPDdSha9H1kWwofYJXg/GgrGZuF9WZTXgRb8YtN4iKAAZ9FLAD9BuLobUKYXbzO6jGaNzIw82kTJa1VhvEzg== port: 587 # SMTP server port sender: "" # the email sender address replyTo: "" # reply-to address