diff --git a/charts/orchestrator-infra/Chart.yaml b/charts/orchestrator-infra/Chart.yaml index 91cb8cf9..3d1fd2b6 100644 --- a/charts/orchestrator-infra/Chart.yaml +++ b/charts/orchestrator-infra/Chart.yaml @@ -14,4 +14,4 @@ maintainers: type: application sources: - https://github.com/redhat-developer/rhdh-chart -version: 0.4.0 +version: 0.4.1 diff --git a/charts/orchestrator-infra/README.md b/charts/orchestrator-infra/README.md index f3a0a772..988e9293 100644 --- a/charts/orchestrator-infra/README.md +++ b/charts/orchestrator-infra/README.md @@ -1,7 +1,7 @@ # Orchestrator Infra Chart for OpenShift -![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) +![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) Helm chart to deploy the Orchestrator solution's required infrastructure suite on OpenShift, including OpenShift Serverless Operator and OpenShift Serverless Logic Operator, both required to configure Red Hat Developer Hub to use the Orchestrator. @@ -25,7 +25,7 @@ Kubernetes: `>= 1.25.0-0` ```console helm repo add redhat-developer https://redhat-developer.github.io/rhdh-chart -helm install my-orchestrator-infra redhat-developer/redhat-developer-hub-orchestrator-infra --version 0.4.0 +helm install my-orchestrator-infra redhat-developer/redhat-developer-hub-orchestrator-infra --version 0.4.1 ``` > **Tip**: List all releases using `helm list` @@ -90,7 +90,7 @@ The command removes all the Kubernetes components associated with the chart and | serverlessLogicOperator.subscription.spec.name | name of the operator package | string | `"logic-operator"` | | serverlessLogicOperator.subscription.spec.source | name of the catalog source | string | `"redhat-operators"` | | serverlessLogicOperator.subscription.spec.sourceNamespace | | string | `"openshift-marketplace"` | -| serverlessLogicOperator.subscription.spec.startingCSV | The initial version of the operator, must match CRDs installed by the chart | string | `"logic-operator.v1.37.0"` | +| serverlessLogicOperator.subscription.spec.startingCSV | The initial version of the operator, must match CRDs installed by the chart | string | `"logic-operator.v1.37.1"` | | serverlessOperator.enabled | whether the operator should be deployed by the chart | bool | `true` | | serverlessOperator.subscription.namespace | namespace where the operator should be deployed | string | `"openshift-serverless"` | | serverlessOperator.subscription.spec.channel | channel of an operator package to subscribe to | string | `"stable"` | @@ -105,13 +105,16 @@ The command removes all the Kubernetes components associated with the chart and The orchestrator-infra chart requires several CRDs for Knative Eventing and Knative Serving. These CRDs will be applied prior to installing the chart, ensuring that Knative CRs can be created as part of the chart's deployment process. This approach eliminates the need to wait for the OpenShift Serverless Operator's subscription to install them beforehand. -The KnativeEventing and KnativeServing CRDs are required for this chart to run. These CRDs need to be present under the crds/ directory before running `helm install`. +The KnativeEventing and KnativeServing CRDs are required for this chart to run. These CRDs need to be present under the `crds/` directory before running `helm install`. After installing the openshift-serverless subscription, more Knative CRDs will be installed on the cluster. The versions of the CRDs present in the chart and the ones in the subscription must match. In order to verify the correct CRD, use this following command to extract the CRD: ```bash -docker run --rm --entrypoint cat registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.0 /manifests/operator_v1beta1_knativeeventing_crd.yaml > knative-eventing-crd.yaml +export osl_bundle=registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.1 +podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeeventing_crd.yaml > crds/knative-eventing/knative-eventing-crd.yaml -docker run --rm --entrypoint cat registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.0 /manifests/operator_v1beta1_knativeserving_crd.yaml > knative-serving-crd.yaml -``` \ No newline at end of file +podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeserving_crd.yaml > crds/knative-serving/knative-serving-crd.yaml +``` + +After running these commands, you may need to re-add the `helm.sh/hook` annotations. diff --git a/charts/orchestrator-infra/README.md.gotmpl b/charts/orchestrator-infra/README.md.gotmpl index 6faa317c..b3f6152a 100644 --- a/charts/orchestrator-infra/README.md.gotmpl +++ b/charts/orchestrator-infra/README.md.gotmpl @@ -80,13 +80,16 @@ The command removes all the Kubernetes components associated with the chart and The orchestrator-infra chart requires several CRDs for Knative Eventing and Knative Serving. These CRDs will be applied prior to installing the chart, ensuring that Knative CRs can be created as part of the chart's deployment process. This approach eliminates the need to wait for the OpenShift Serverless Operator's subscription to install them beforehand. -The KnativeEventing and KnativeServing CRDs are required for this chart to run. These CRDs need to be present under the crds/ directory before running `helm install`. +The KnativeEventing and KnativeServing CRDs are required for this chart to run. These CRDs need to be present under the `crds/` directory before running `helm install`. After installing the openshift-serverless subscription, more Knative CRDs will be installed on the cluster. The versions of the CRDs present in the chart and the ones in the subscription must match. In order to verify the correct CRD, use this following command to extract the CRD: -```bash -docker run --rm --entrypoint cat registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.0 /manifests/operator_v1beta1_knativeeventing_crd.yaml > knative-eventing-crd.yaml +```bash +export osl_bundle=registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.1 +podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeeventing_crd.yaml > crds/knative-eventing/knative-eventing-crd.yaml -docker run --rm --entrypoint cat registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.0 /manifests/operator_v1beta1_knativeserving_crd.yaml > knative-serving-crd.yaml -``` \ No newline at end of file +podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeserving_crd.yaml > crds/knative-serving/knative-serving-crd.yaml +``` + +After running these commands, you may need to re-add the `helm.sh/hook` annotations. diff --git a/charts/orchestrator-infra/values.schema.json b/charts/orchestrator-infra/values.schema.json index 767f9973..257f7318 100644 --- a/charts/orchestrator-infra/values.schema.json +++ b/charts/orchestrator-infra/values.schema.json @@ -46,7 +46,7 @@ "type": "string" }, "startingCSV": { - "default": "logic-operator.v1.37.0", + "default": "logic-operator.v1.37.1", "title": "The initial version of the operator", "type": "string" } diff --git a/charts/orchestrator-infra/values.schema.tmpl.json b/charts/orchestrator-infra/values.schema.tmpl.json index ad4970f1..35aa7029 100644 --- a/charts/orchestrator-infra/values.schema.tmpl.json +++ b/charts/orchestrator-infra/values.schema.tmpl.json @@ -52,7 +52,7 @@ "type": "string" }, "startingCSV": { - "default": "logic-operator.v1.37.0", + "default": "logic-operator.v1.37.1", "title": "The initial version of the operator", "type": "string" } diff --git a/charts/orchestrator-infra/values.yaml b/charts/orchestrator-infra/values.yaml index 3b27206a..aa304bef 100644 --- a/charts/orchestrator-infra/values.yaml +++ b/charts/orchestrator-infra/values.yaml @@ -15,7 +15,7 @@ serverlessLogicOperator: source: redhat-operators sourceNamespace: openshift-marketplace # -- The initial version of the operator, must match CRDs installed by the chart - startingCSV: logic-operator.v1.37.0 + startingCSV: logic-operator.v1.37.1 serverlessOperator: # -- whether the operator should be deployed by the chart