diff --git a/charts/orchestrator-infra/Chart.yaml b/charts/orchestrator-infra/Chart.yaml index a5a8c638d..91cb8cf9b 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.3.0 +version: 0.4.0 diff --git a/charts/orchestrator-infra/README.md b/charts/orchestrator-infra/README.md index 73ed6b0ec..f3a0a7724 100644 --- a/charts/orchestrator-infra/README.md +++ b/charts/orchestrator-infra/README.md @@ -1,7 +1,7 @@ # Orchestrator Infra Chart for OpenShift -![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) +![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-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.3.0 +helm install my-orchestrator-infra redhat-developer/redhat-developer-hub-orchestrator-infra --version 0.4.0 ``` > **Tip**: List all releases using `helm list` @@ -85,12 +85,12 @@ The command removes all the Kubernetes components associated with the chart and |-----|-------------|------|---------| | serverlessLogicOperator.enabled | whether the operator should be deployed by the chart | bool | `true` | | serverlessLogicOperator.subscription.namespace | namespace where the operator should be deployed | string | `"openshift-serverless-logic"` | -| serverlessLogicOperator.subscription.spec.channel | channel of an operator package to subscribe to | string | `"alpha"` | +| serverlessLogicOperator.subscription.spec.channel | channel of an operator package to subscribe to | string | `"stable"` | | serverlessLogicOperator.subscription.spec.installPlanApproval | whether the update should be installed automatically | string | `"Manual"` | -| serverlessLogicOperator.subscription.spec.name | name of the operator package | string | `"logic-operator-rhel8"` | +| 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-rhel8.v1.36.0"` | +| serverlessLogicOperator.subscription.spec.startingCSV | The initial version of the operator, must match CRDs installed by the chart | string | `"logic-operator.v1.37.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"` | @@ -111,7 +111,7 @@ After installing the openshift-serverless subscription, more Knative CRDs will b 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.36.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.37.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.36.0 /manifests/operator_v1beta1_knativeserving_crd.yaml > knative-serving-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 diff --git a/charts/orchestrator-infra/README.md.gotmpl b/charts/orchestrator-infra/README.md.gotmpl index ccc6ee15d..6faa317c8 100644 --- a/charts/orchestrator-infra/README.md.gotmpl +++ b/charts/orchestrator-infra/README.md.gotmpl @@ -86,7 +86,7 @@ After installing the openshift-serverless subscription, more Knative CRDs will b 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.36.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.37.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.36.0 /manifests/operator_v1beta1_knativeserving_crd.yaml > knative-serving-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 diff --git a/charts/orchestrator-infra/crds/knative-serving/knative-serving-crd.yaml b/charts/orchestrator-infra/crds/knative-serving/knative-serving-crd.yaml index 1761801eb..3a316a833 100644 --- a/charts/orchestrator-infra/crds/knative-serving/knative-serving-crd.yaml +++ b/charts/orchestrator-infra/crds/knative-serving/knative-serving-crd.yaml @@ -2258,6 +2258,13 @@ spec: type: string type: object tls: + nullable: true + oneOf: + - required: + - mode + - credentialName + - required: + - httpsRedirect properties: mode: description: TLS mode can be SIMPLE, MUTUAL, ISTIO_MUTUAL. @@ -2267,6 +2274,11 @@ spec: description: TLS certificate name. format: string type: string + httpsRedirect: + description: If set to true, the load balancer will send a 301 redirect + to HTTPS for all HTTP requests. Should be used only for HTTP listener, + is mutually exclusive with all other TLS options. + type: boolean type: object type: object type: array diff --git a/charts/orchestrator-infra/values.schema.json b/charts/orchestrator-infra/values.schema.json index 97d9b9820..767f99731 100644 --- a/charts/orchestrator-infra/values.schema.json +++ b/charts/orchestrator-infra/values.schema.json @@ -21,7 +21,7 @@ "additionalProperties": false, "properties": { "channel": { - "default": "alpha", + "default": "stable", "title": "Channel of an operator package to subscribe to", "type": "string" }, @@ -31,7 +31,7 @@ "type": "string" }, "name": { - "default": "logic-operator-rhel8", + "default": "logic-operator", "title": "Name of the operator package", "type": "string" }, @@ -46,7 +46,7 @@ "type": "string" }, "startingCSV": { - "default": "logic-operator-rhel8.v1.33.0", + "default": "logic-operator.v1.37.0", "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 1a4cf209b..ad4970f10 100644 --- a/charts/orchestrator-infra/values.schema.tmpl.json +++ b/charts/orchestrator-infra/values.schema.tmpl.json @@ -27,7 +27,7 @@ "type": "object", "properties": { "channel": { - "default": "alpha", + "default": "stable", "title": "Channel of an operator package to subscribe to", "type": "string" }, @@ -37,7 +37,7 @@ "type": "string" }, "name": { - "default": "logic-operator-rhel8", + "default": "logic-operator", "title": "Name of the operator package", "type": "string" }, @@ -52,7 +52,7 @@ "type": "string" }, "startingCSV": { - "default": "logic-operator-rhel8.v1.35.0", + "default": "logic-operator.v1.37.0", "title": "The initial version of the operator", "type": "string" } diff --git a/charts/orchestrator-infra/values.yaml b/charts/orchestrator-infra/values.yaml index 88df43433..3b27206ad 100644 --- a/charts/orchestrator-infra/values.yaml +++ b/charts/orchestrator-infra/values.yaml @@ -6,16 +6,16 @@ serverlessLogicOperator: namespace: openshift-serverless-logic spec: # -- channel of an operator package to subscribe to - channel: alpha + channel: stable # -- whether the update should be installed automatically installPlanApproval: Manual # -- name of the operator package - name: logic-operator-rhel8 + name: logic-operator # -- name of the catalog source source: redhat-operators sourceNamespace: openshift-marketplace # -- The initial version of the operator, must match CRDs installed by the chart - startingCSV: logic-operator-rhel8.v1.36.0 + startingCSV: logic-operator.v1.37.0 serverlessOperator: # -- whether the operator should be deployed by the chart