diff --git a/nova/Chart.yaml b/nova/Chart.yaml index edb933e4ff..d703b37cf9 100644 --- a/nova/Chart.yaml +++ b/nova/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Nova name: nova -version: 0.3.33 +version: 0.3.34 home: https://docs.openstack.org/nova/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png sources: diff --git a/nova/templates/ingress-novncproxy.yaml b/nova/templates/ingress-novncproxy.yaml index cad53cf306..ec68fb60ac 100644 --- a/nova/templates/ingress-novncproxy.yaml +++ b/nova/templates/ingress-novncproxy.yaml @@ -12,7 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. */}} -{{- if and .Values.manifests.ingress_novncproxy .Values.network.novncproxy.ingress.public }} +{{- if and .Values.manifests.ingress_novncproxy .Values.network.novncproxy.ingress.public (eq .Values.console.console_kind "novnc") }} {{- $envAll := . }} {{- $ingressOpts := dict "envAll" $envAll "backendService" "novncproxy" "backendServiceType" "compute_novnc_proxy" "backendPort" "n-novnc" -}} {{- $secretName := $envAll.Values.secrets.tls.compute_novnc_proxy.novncproxy.internal -}} diff --git a/nova/templates/ingress-spiceproxy.yaml b/nova/templates/ingress-spiceproxy.yaml new file mode 100644 index 0000000000..020797d895 --- /dev/null +++ b/nova/templates/ingress-spiceproxy.yaml @@ -0,0 +1,23 @@ +{{/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/}} + +{{- if and .Values.manifests.ingress_spiceproxy .Values.network.spiceproxy.ingress.public (eq .Values.console.console_kind "spice") }} +{{- $envAll := . }} +{{- $ingressOpts := dict "envAll" $envAll "backendService" "spiceproxy" "backendServiceType" "compute_spice_proxy" "backendPort" "n-spice" -}} +{{- $secretName := $envAll.Values.secrets.tls.compute_spice_proxy.spiceproxy.internal -}} +{{- if and .Values.manifests.certificates $secretName }} +{{- $_ := set $ingressOpts "certIssuer" .Values.endpoints.compute_spice_proxy.host_fqdn_override.default.tls.issuerRef.name -}} +{{- end }} +{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }} +{{- end }} diff --git a/nova/templates/service-ingress-novncproxy.yaml b/nova/templates/service-ingress-novncproxy.yaml index caae9130e3..434cf339cf 100644 --- a/nova/templates/service-ingress-novncproxy.yaml +++ b/nova/templates/service-ingress-novncproxy.yaml @@ -12,7 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. */}} -{{- if and .Values.manifests.service_ingress_novncproxy .Values.network.novncproxy.ingress.public }} +{{- if and .Values.manifests.service_ingress_novncproxy .Values.network.novncproxy.ingress.public (eq .Values.console.console_kind "novnc") }} {{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "compute_novnc_proxy" -}} {{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }} {{- end }} diff --git a/nova/templates/service-ingress-spiceproxy.yaml b/nova/templates/service-ingress-spiceproxy.yaml new file mode 100644 index 0000000000..e0bd3d546c --- /dev/null +++ b/nova/templates/service-ingress-spiceproxy.yaml @@ -0,0 +1,18 @@ +{{/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/}} + +{{- if and .Values.manifests.service_ingress_spiceproxy .Values.network.spiceproxy.ingress.public (eq .Values.console.console_kind "spice") }} +{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "compute_spice_proxy" -}} +{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }} +{{- end }} diff --git a/nova/values.yaml b/nova/values.yaml index 9c68375d08..bc34440d94 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -247,6 +247,13 @@ network: enabled: false port: 30680 spiceproxy: + ingress: + public: true + classes: + namespace: "nginx" + cluster: "nginx-cluster" + annotations: + nginx.ingress.kubernetes.io/rewrite-target: / node_port: enabled: false port: 30682 @@ -1593,7 +1600,8 @@ secrets: internal: metadata-tls-metadata compute_spice_proxy: spiceproxy: - internal: nova-tls-spiceproxy + public: nova-spiceproxy-tls-public + internal: nova-spiceproxy-tls-proxy oci_image_registry: nova: nova-oci-image-registry @@ -1894,7 +1902,7 @@ endpoints: name: nova hosts: default: nova-spiceproxy - public: placement + public: spiceproxy host_fqdn_override: default: null path: @@ -1904,6 +1912,7 @@ endpoints: port: spice_proxy: default: 6082 + public: 80 placement: name: placement hosts: @@ -2523,6 +2532,7 @@ manifests: deployment_scheduler: true ingress_metadata: true ingress_novncproxy: true + ingress_spiceproxy: true ingress_osapi: true job_bootstrap: true job_storage_init: true @@ -2548,6 +2558,7 @@ manifests: secret_registry: true service_ingress_metadata: true service_ingress_novncproxy: true + service_ingress_spiceproxy: true service_ingress_osapi: true service_metadata: true service_novncproxy: true diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml index b600afba53..909995acf4 100644 --- a/releasenotes/notes/nova.yaml +++ b/releasenotes/notes/nova.yaml @@ -102,4 +102,5 @@ nova: - 0.3.31 Add getting LISTEN IP for CIDR - 0.3.32 Set the startupProbe for nova-compute - 0.3.33 Add job to create 'vms' pool + - 0.3.34 Add public endpoints for the spiceproxy ...