diff --git a/nova/templates/ingress-novncproxy.yaml b/nova/templates/ingress-novncproxy.yaml new file mode 100644 index 0000000000..c5a00ec57f --- /dev/null +++ b/nova/templates/ingress-novncproxy.yaml @@ -0,0 +1,20 @@ +{{/* +Copyright 2017 The Openstack-Helm Authors. + +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_novncproxy .Values.network.novncproxy.ingress.public }} +{{- $ingressOpts := dict "envAll" . "backendService" "novncproxy" "backendServiceType" "compute_novnc_proxy" "backendPort" "n-novnc" -}} +{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }} +{{- end }} diff --git a/nova/templates/service-ingress-novncproxy.yaml b/nova/templates/service-ingress-novncproxy.yaml new file mode 100644 index 0000000000..fce765af4f --- /dev/null +++ b/nova/templates/service-ingress-novncproxy.yaml @@ -0,0 +1,20 @@ +{{/* +Copyright 2017 The Openstack-Helm Authors. + +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_novncproxy .Values.network.novncproxy.ingress.public }} +{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "compute_novnc_proxy" -}} +{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }} +{{- end }} diff --git a/nova/values.yaml b/nova/values.yaml index bc8c2cecdb..a18d1482d9 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -168,6 +168,13 @@ network: enabled: false port: 30778 novncproxy: + ingress: + public: true + classes: + namespace: "nginx" + cluster: "nginx-cluster" + annotations: + nginx.ingress.kubernetes.io/rewrite-target: / node_port: enabled: false port: 30680 @@ -1293,6 +1300,7 @@ endpoints: name: nova hosts: default: nova-novncproxy + public: novncproxy host_fqdn_override: default: null path: @@ -1302,10 +1310,12 @@ endpoints: port: novnc_proxy: default: 6080 + public: 80 compute_spice_proxy: name: nova hosts: default: nova-spiceproxy + public: placement host_fqdn_override: default: null path: @@ -1610,6 +1620,7 @@ manifests: deployment_spiceproxy: true deployment_scheduler: true ingress_metadata: true + ingress_novncproxy: true ingress_placement: true ingress_osapi: true job_bootstrap: true @@ -1635,6 +1646,7 @@ manifests: secret_keystone_placement: true secret_rabbitmq: true service_ingress_metadata: true + service_ingress_novncproxy: true service_ingress_placement: true service_ingress_osapi: true service_metadata: true