Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ jobs:

- name: Run chart-testing
run: |

kubectl apply -f charts/orchestrator-infra/crds/knative-eventing/knative-eventing-crd.yaml
kubectl apply -f charts/orchestrator-infra/crds/knative-serving/knative-serving-crd.yaml

ct install \
--debug \
--config ct-install.yaml \
Expand Down
2 changes: 1 addition & 1 deletion charts/orchestrator-infra/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ maintainers:
type: application
sources:
- https://github.com/redhat-developer/rhdh-chart
version: 0.0.2
version: 0.0.3
18 changes: 16 additions & 2 deletions charts/orchestrator-infra/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Orchestrator Infra Chart for OpenShift (Community Version)

![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square)
![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-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 Logic Operator and OpenShift Serverless Operator.
Expand Down Expand Up @@ -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-rhel8"` |
| 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 | string | `"logic-operator-rhel8.v1.35.0"` |
| serverlessLogicOperator.subscription.spec.startingCSV | The initial version of the operator, must match CRDs installed by the chart | string | `"logic-operator-rhel8.v1.35.0"` |
| 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"` |
Expand All @@ -101,3 +101,17 @@ The command removes all the Kubernetes components associated with the chart and
| tests.enabled | Whether to create the test pod used for testing the Release using `helm test`. | bool | `true` |
| tests.image | Test pod image | string | `"bitnami/kubectl:latest"` |

### Installing Knative Eventing and Knative Serving CRDs
Comment thread
rm3l marked this conversation as resolved.

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`.
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 subscrtiprion 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.35.0 /manifests/operator_v1beta1_knativeeventing_crd.yaml > knative-eventing-crd.yaml

docker run --rm --entrypoint cat registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.35.0 /manifests/operator_v1beta1_knativeserving_crd.yaml > knative-serving-crd.yaml
```
15 changes: 15 additions & 0 deletions charts/orchestrator-infra/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,18 @@ helm uninstall my-orchestrator-infra
The command removes all the Kubernetes components associated with the chart and deletes the release.

{{ template "chart.valuesSection" . }}

### Installing Knative Eventing and Knative Serving CRDs

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`.
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 subscrtiprion 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.35.0 /manifests/operator_v1beta1_knativeeventing_crd.yaml > knative-eventing-crd.yaml

docker run --rm --entrypoint cat registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.35.0 /manifests/operator_v1beta1_knativeserving_crd.yaml > knative-serving-crd.yaml
```
Loading
Loading