Skip to content

Commit bd57f9f

Browse files
authored
fix(orchestrator-infra): Bump OSL to 1.37.1 [RHIDP-11679] (#317)
1 parent 0212d7c commit bd57f9f

6 files changed

Lines changed: 22 additions & 16 deletions

File tree

charts/orchestrator-infra/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ maintainers:
1414
type: application
1515
sources:
1616
- https://github.com/redhat-developer/rhdh-chart
17-
version: 0.5.0
17+
version: 0.5.1

charts/orchestrator-infra/README.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# Orchestrator Infra Chart for OpenShift
33

4-
![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square)
4+
![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square)
55
![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
66

77
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`
2525
```console
2626
helm repo add redhat-developer https://redhat-developer.github.io/rhdh-chart
2727

28-
helm install my-orchestrator-infra redhat-developer/redhat-developer-hub-orchestrator-infra --version 0.5.0
28+
helm install my-orchestrator-infra redhat-developer/redhat-developer-hub-orchestrator-infra --version 0.5.1
2929
```
3030

3131
> **Tip**: List all releases using `helm list`
@@ -90,7 +90,7 @@ The command removes all the Kubernetes components associated with the chart and
9090
| serverlessLogicOperator.subscription.spec.name | name of the operator package | string | `"logic-operator"` |
9191
| serverlessLogicOperator.subscription.spec.source | name of the catalog source | string | `"redhat-operators"` |
9292
| serverlessLogicOperator.subscription.spec.sourceNamespace | | string | `"openshift-marketplace"` |
93-
| serverlessLogicOperator.subscription.spec.startingCSV | The initial version of the operator, must match CRDs installed by the chart | string | `"logic-operator.v1.37.0"` |
93+
| serverlessLogicOperator.subscription.spec.startingCSV | The initial version of the operator, must match CRDs installed by the chart | string | `"logic-operator.v1.37.1"` |
9494
| serverlessOperator.enabled | whether the operator should be deployed by the chart | bool | `true` |
9595
| serverlessOperator.subscription.namespace | namespace where the operator should be deployed | string | `"openshift-serverless"` |
9696
| 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
105105

106106
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.
107107

108-
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`.
108+
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`.
109109
After installing the openshift-serverless subscription, more Knative CRDs will be installed on the cluster.
110110

111111
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:
112112

113113
```bash
114-
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
114+
export osl_bundle=registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.1
115+
podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeeventing_crd.yaml > crds/knative-eventing/knative-eventing-crd.yaml
115116

116-
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
117-
```
117+
podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeserving_crd.yaml > crds/knative-serving/knative-serving-crd.yaml
118+
```
119+
120+
After running these commands, you may need to re-add the `helm.sh/hook` annotations.

charts/orchestrator-infra/README.md.gotmpl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,16 @@ The command removes all the Kubernetes components associated with the chart and
8080

8181
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.
8282

83-
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`.
83+
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`.
8484
After installing the openshift-serverless subscription, more Knative CRDs will be installed on the cluster.
8585

8686
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:
8787

88-
```bash
89-
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
88+
```bash
89+
export osl_bundle=registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.1
90+
podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeeventing_crd.yaml > crds/knative-eventing/knative-eventing-crd.yaml
9091
91-
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
92-
```
92+
podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeserving_crd.yaml > crds/knative-serving/knative-serving-crd.yaml
93+
```
94+
95+
After running these commands, you may need to re-add the `helm.sh/hook` annotations.

charts/orchestrator-infra/values.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"type": "string"
4747
},
4848
"startingCSV": {
49-
"default": "logic-operator.v1.37.0",
49+
"default": "logic-operator.v1.37.1",
5050
"title": "The initial version of the operator",
5151
"type": "string"
5252
}

charts/orchestrator-infra/values.schema.tmpl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"type": "string"
5353
},
5454
"startingCSV": {
55-
"default": "logic-operator.v1.37.0",
55+
"default": "logic-operator.v1.37.1",
5656
"title": "The initial version of the operator",
5757
"type": "string"
5858
}

charts/orchestrator-infra/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ serverlessLogicOperator:
1515
source: redhat-operators
1616
sourceNamespace: openshift-marketplace
1717
# -- The initial version of the operator, must match CRDs installed by the chart
18-
startingCSV: logic-operator.v1.37.0
18+
startingCSV: logic-operator.v1.37.1
1919

2020
serverlessOperator:
2121
# -- whether the operator should be deployed by the chart

0 commit comments

Comments
 (0)