From 339dfe803f88e100b17153e30544d24138f695d2 Mon Sep 17 00:00:00 2001 From: Sun Austin Date: Mon, 10 Jun 2019 11:12:43 +0800 Subject: [PATCH] containerized fm public endpoint can not be accessed http://fm.openstack.svc.cluster.local:80 can not be accessed The ingress service is missing in helm chart Closes-Bug: 1832155 Change-Id: I61ea514d3092e1e3fedcd8ca8001a178d65282a3 Signed-off-by: Sun Austin --- .../templates/service-ingress.yaml | 21 +++++++++++++++++++ .../fm-rest-api/values.yaml | 1 + 2 files changed, 22 insertions(+) create mode 100644 kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/templates/service-ingress.yaml diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/templates/service-ingress.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/templates/service-ingress.yaml new file mode 100644 index 0000000000..64ea3b91a8 --- /dev/null +++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/templates/service-ingress.yaml @@ -0,0 +1,21 @@ +{{/* +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 .Values.network.faultmanagement.ingress.public }} +{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "faultmanagement" -}} +{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }} +{{- end }} + diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/values.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/values.yaml index 6a49abd776..37f8dde6cb 100644 --- a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/values.yaml +++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/values.yaml @@ -192,6 +192,7 @@ manifests: secret_ingress_tls: false secret_keystone: true service_fm: true + service_ingress: true endpoints: cluster_domain_suffix: cluster.local oslo_db: