diff --git a/bundle/manifests/rhdh.redhat.com_orchestrators.yaml b/bundle/manifests/rhdh.redhat.com_orchestrators.yaml index 8cf1c217..639590cd 100644 --- a/bundle/manifests/rhdh.redhat.com_orchestrators.yaml +++ b/bundle/manifests/rhdh.redhat.com_orchestrators.yaml @@ -157,9 +157,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 diff --git a/config/crd/bases/rhdh.redhat.com_orchestrators.yaml b/config/crd/bases/rhdh.redhat.com_orchestrators.yaml index 39ec5439..ac1a62c4 100644 --- a/config/crd/bases/rhdh.redhat.com_orchestrators.yaml +++ b/config/crd/bases/rhdh.redhat.com_orchestrators.yaml @@ -136,8 +136,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 diff --git a/docs/main/existing-rhdh.md b/docs/main/existing-rhdh.md index de6422c7..2e3469a2 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/parodos-dev/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/parodos-dev/orchestrator-helm-operator/blob/main/docs/gitops/README.md) +- For using the Orchestrator's [software templates](https://github.com/parodos-dev/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/parodos-dev/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/parodos-dev/workflow-software-templates/blob/v1.3.x/entities/workflow-resources.yaml) (optional) -- [Basic template](https://github.com/parodos-dev/workflow-software-templates/blob/v1.3.x/scaffolder-templates/basic-workflow/template.yaml) -- [Complex template - workflow with custom Java code](https://github.com/parodos-dev/workflow-software-templates/blob/v1.3.x/scaffolder-templates/complex-assessment-workflow/template.yaml) +- [Workflow resources (group and system)](https://github.com/parodos-dev/workflow-software-templates/blob/v1.4.x/entities/workflow-resources.yaml) (optional) +- [Basic template](https://github.com/parodos-dev/workflow-software-templates/blob/v1.4.x/scaffolder-templates/basic-workflow/template.yaml) +- [Complex template - workflow with custom Java code](https://github.com/parodos-dev/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 6323cea0..526a6095 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/parodos-dev/workflow-software-templates used to import software templates resources | `"v1.3.x"` | +| `rhdhOperator.catalogBranch` | The branch for https://github.com/parodos-dev/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"` | diff --git a/helm-charts/orchestrator/templates/tekton-tasks.yaml b/helm-charts/orchestrator/templates/tekton-tasks.yaml index 76c8e36a..da57fa19 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/parodos-dev/serverless-workflows/v1.3.x/pipeline/workflow-builder.Dockerfile -o flat/workflow-builder.Dockerfile + curl -L https://raw.githubusercontent.com/parodos-dev/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 8bab2d4e..65633066 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 34ba8060..726ec0d4 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/parodos-dev/workflow-software-templates used to import software templates resources + catalogBranch: v1.4.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: