diff --git a/bundle/manifests/orchestrator-operator.clusterserviceversion.yaml b/bundle/manifests/orchestrator-operator.clusterserviceversion.yaml index 96f6e141..0b7b3ce2 100644 --- a/bundle/manifests/orchestrator-operator.clusterserviceversion.yaml +++ b/bundle/manifests/orchestrator-operator.clusterserviceversion.yaml @@ -73,7 +73,7 @@ metadata: } }, "subscription": { - "channel": "fast-1.3", + "channel": "fast-1.4", "installPlanApproval": "Automatic", "name": "rhdh", "namespace": "rhdh-operator", diff --git a/bundle/manifests/rhdh.redhat.com_orchestrators.yaml b/bundle/manifests/rhdh.redhat.com_orchestrators.yaml index 03796ce6..5af4cd9b 100644 --- a/bundle/manifests/rhdh.redhat.com_orchestrators.yaml +++ b/bundle/manifests/rhdh.redhat.com_orchestrators.yaml @@ -176,9 +176,9 @@ spec: Red Hat Developer Hub operator properties: catalogBranch: - default: v1.3.x + default: v1.4.x description: CatalogBranch captures the catalog branch value. - Defaults to "v1.3.x". + Defaults to "v1.4.x". type: string enableGuestProvider: default: false @@ -328,7 +328,7 @@ spec: to use to deploy the operator. properties: channel: - default: fast-1.3 + default: fast-1.4 description: Channel defines the channel of the operator package to subscribe to type: string diff --git a/config/crd/bases/rhdh.redhat.com_orchestrators.yaml b/config/crd/bases/rhdh.redhat.com_orchestrators.yaml index fca3a780..d5f79a43 100644 --- a/config/crd/bases/rhdh.redhat.com_orchestrators.yaml +++ b/config/crd/bases/rhdh.redhat.com_orchestrators.yaml @@ -144,8 +144,8 @@ spec: description: EnableGuestProvider captures whether to enable the guest provider in RHDH. Defaults to false. type: boolean catalogBranch: - default: "v1.3.x" - description: CatalogBranch captures the catalog branch value. Defaults to "v1.3.x". + default: "v1.4.x" + description: CatalogBranch captures the catalog branch value. Defaults to "v1.4.x". type: string secretRef: description: Backstage secret reference information @@ -227,7 +227,7 @@ spec: description: Subscription specifies the subscription attributes to use to deploy the operator. properties: channel: - default: fast-1.3 + default: fast-1.4 description: Channel defines the channel of the operator package to subscribe to type: string installPlanApproval: diff --git a/config/samples/_v1alpha1_orchestrator.yaml b/config/samples/_v1alpha1_orchestrator.yaml index 1a26727b..2223c7b8 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.3 # channel of an operator package to subscribe to + channel: fast-1.4 # 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/docs/main/existing-rhdh.md b/docs/main/existing-rhdh.md index 0a58c83d..84c6dab1 100644 --- a/docs/main/existing-rhdh.md +++ b/docs/main/existing-rhdh.md @@ -1,6 +1,6 @@ # Prerequisites - RHDH 1.3 instance deployed with IDP configured (github, gitlab, ...) -- For using the Orchestrator's [software templates](https://github.com/rhdhorchestrator/workflow-software-templates/tree/v1.3.x), OpenShift GitOps (ArgoCD) and OpenShift Pipelines (Tekton) should be installed and configured in RHDH (to enhance the CI/CD plugins) - [Follow these steps](https://github.com/rhdhorchestrator/orchestrator-helm-operator/blob/main/docs/gitops/README.md) +- For using the Orchestrator's [software templates](https://github.com/rhdhorchestrator/workflow-software-templates/tree/v1.4.x), OpenShift GitOps (ArgoCD) and OpenShift Pipelines (Tekton) should be installed and configured in RHDH (to enhance the CI/CD plugins) - [Follow these steps](https://github.com/rhdhorchestrator/orchestrator-helm-operator/blob/main/docs/gitops/README.md) - A secret in RHDH's namespace named `dynamic-plugins-npmrc` that points to the plugins npm registry (details will be provided below) # Installation steps @@ -285,9 +285,9 @@ Orchestrator software templates rely on the following tools: To import the Orchestrator software templates into the catalog via the Backstage UI, follow the instructions outlined in this [document](https://backstage.io/docs/features/software-templates/adding-templates). Register new templates into the catalog from the -- [Workflow resources (group and system)](https://github.com/rhdhorchestrator/workflow-software-templates/blob/v1.3.x/entities/workflow-resources.yaml) (optional) -- [Basic template](https://github.com/rhdhorchestrator/workflow-software-templates/blob/v1.3.x/scaffolder-templates/basic-workflow/template.yaml) -- [Complex template - workflow with custom Java code](https://github.com/rhdhorchestrator/workflow-software-templates/blob/v1.3.x/scaffolder-templates/complex-assessment-workflow/template.yaml) +- [Workflow resources (group and system)](https://github.com/rhdhorchestrator/workflow-software-templates/blob/v1.4.x/entities/workflow-resources.yaml) (optional) +- [Basic template](https://github.com/rhdhorchestrator/workflow-software-templates/blob/v1.4.x/scaffolder-templates/basic-workflow/template.yaml) +- [Complex template - workflow with custom Java code](https://github.com/rhdhorchestrator/workflow-software-templates/blob/v1.4.x/scaffolder-templates/complex-assessment-workflow/template.yaml) ## Plugin Versions @@ -320,7 +320,7 @@ In the example output below, `.properties.integrity.default` is the integrity va ### Upgrade plugin versions - WIP To perform an upgrade of the plugin versions, start by acquiring the new plugin version along with its associated integrity value. -The following script is useful to obtain the required information for updating the plugin version, however, make sure to select plugin version compatible with the Orchestrator operator version (e.g. 1.3.x for both operator and plugins). +The following script is useful to obtain the required information for updating the plugin version, however, make sure to select plugin version compatible with the Orchestrator operator version (e.g. 1.4.x for both operator and plugins). > Note: It is recommended to use the Orchestrator Operator default plugins diff --git a/helm-charts/orchestrator/README.md b/helm-charts/orchestrator/README.md index 410fef4a..9c28c513 100644 --- a/helm-charts/orchestrator/README.md +++ b/helm-charts/orchestrator/README.md @@ -29,7 +29,7 @@ The following table lists the configurable parameters of the Orchestrator chart | `rhdhOperator.isReleaseCandidate` | Indicates RC builds should be used by the chart to install RHDH | `false` | | `rhdhOperator.enabled` | whether the operator should be deployed by the chart | `true` | | `rhdhOperator.enableGuestProvider` | whether to enable guest provider | `false` | -| `rhdhOperator.catalogBranch` | The branch for https://github.com/rhdhorchestrator/workflow-software-templates used to import software templates resources | `"v1.3.x"` | +| `rhdhOperator.catalogBranch` | The branch for https://github.com/rhdhorchestrator/workflow-software-templates used to import software templates resources | `"v1.4.x"` | | `rhdhOperator.secretRef.name` | 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-backend-auth-secret"` | | `rhdhOperator.secretRef.backstage.backendSecret` | Key in the secret with name defined in the 'name' field that contains the value of the Backstage backend secret. Defaults to 'BACKEND_SECRET'. It's required. | `"BACKEND_SECRET"` | | `rhdhOperator.secretRef.github.token` | Key in the secret with name defined in the 'name' field that contains the value of the authentication token as expected by GitHub. Required for importing resource to the catalog, launching software templates and more. Defaults to 'GITHUB_TOKEN', empty for not available. | `"GITHUB_TOKEN"` | @@ -44,7 +44,7 @@ The following table lists the configurable parameters of the Orchestrator chart | `rhdhOperator.secretRef.notificationsEmail.username` | Key in the secret with name defined in the 'name' field that contains the value of the username of the SMTP server for the notifications plugin. Defaults to 'NOTIFICATIONS_EMAIL_USERNAME', empty for not available. | `"NOTIFICATIONS_EMAIL_USERNAME"` | | `rhdhOperator.secretRef.notificationsEmail.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. | `"NOTIFICATIONS_EMAIL_PASSWORD"` | | `rhdhOperator.subscription.namespace` | namespace where the operator should be deployed | `"rhdh-operator"` | -| `rhdhOperator.subscription.channel` | channel of an operator package to subscribe to | `"fast-1.3"` | +| `rhdhOperator.subscription.channel` | channel of an operator package to subscribe to | `"fast-1.4"` | | `rhdhOperator.subscription.installPlanApproval` | whether the update should be installed automatically | `"Automatic"` | | `rhdhOperator.subscription.name` | name of the operator package | `"rhdh"` | | `rhdhOperator.subscription.source` | name of the catalog source | `"redhat-operators"` | diff --git a/helm-charts/orchestrator/templates/tekton-tasks.yaml b/helm-charts/orchestrator/templates/tekton-tasks.yaml index dd636582..92112639 100644 --- a/helm-charts/orchestrator/templates/tekton-tasks.yaml +++ b/helm-charts/orchestrator/templates/tekton-tasks.yaml @@ -195,7 +195,7 @@ spec: ls flat/$(params.workflowId) - curl -L https://raw.githubusercontent.com/rhdhorchestrator/serverless-workflows/v1.3.x/pipeline/workflow-builder.Dockerfile -o flat/workflow-builder.Dockerfile + curl -L https://raw.githubusercontent.com/rhdhorchestrator/serverless-workflows/v1.4.x/pipeline/workflow-builder.Dockerfile -o flat/workflow-builder.Dockerfile --- apiVersion: tekton.dev/v1 kind: Task diff --git a/helm-charts/orchestrator/values.schema.json b/helm-charts/orchestrator/values.schema.json index 851c70ff..f6933f3a 100644 --- a/helm-charts/orchestrator/values.schema.json +++ b/helm-charts/orchestrator/values.schema.json @@ -258,7 +258,7 @@ "default": "", "title": "The catalogBranch Schema", "examples": [ - "v1.3.x" + "v1.4.x" ] }, "secretRef": { @@ -570,7 +570,7 @@ "isReleaseCandidate": false, "enabled": true, "enableGuestProvider": false, - "catalogBranch": "v1.3.x", + "catalogBranch": "v1.4.x", "secretRef": { "name": "backstage-backend-auth-secret", "backstage": { @@ -1262,7 +1262,7 @@ "isReleaseCandidate": false, "enabled": true, "enableGuestProvider": false, - "catalogBranch": "v1.3.x", + "catalogBranch": "v1.4.x", "secretRef": { "name": "backstage-backend-auth-secret", "backstage": { diff --git a/helm-charts/orchestrator/values.yaml b/helm-charts/orchestrator/values.yaml index ad58eca7..b02d5ca5 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.3.x # The branch for https://github.com/rhdhorchestrator/workflow-software-templates used to import software templates resources + catalogBranch: v1.4.x # The branch for https://github.com/rhdhorchestrator/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.3 # channel of an operator package to subscribe to + channel: fast-1.4 # 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