starlingx
/
config
Code Issues Proposed changes

Merge "change fm-rest-api helm endpoint service type to 'faultmanagement'"

This commit is contained in:
Zuul 2019-05-31 14:51:59 +00:00 committed by Gerrit Code Review
parent 18773081e7 b92e37aeea
commit 1f5df24b6a
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/templates/ingress.yaml
View File

@ -4,7 +4,7 @@
#
*/}}
{{- if and .Values.manifests.ingress .Values.network.alarming.ingress.public }}
{{- $ingressOpts := dict "envAll" . "backendService" "alarming" "backendServiceType" "alarming" "backendPort" "fm-port" -}}
{{- if and .Values.manifests.ingress .Values.network.faultmanagement.ingress.public }}
{{- $ingressOpts := dict "envAll" . "backendService" "faultmanagement" "backendServiceType" "faultmanagement" "backendPort" "fm-port" -}}
{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
{{- end }}

2
kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/templates/job-ks-endpoints.yaml
View File

@ -5,6 +5,6 @@
*/}}
{{- if .Values.manifests.job_ks_endpoints }}
{{- $ksServiceJob := dict "envAll" . "serviceName" "fm" "serviceTypes" ( tuple "alarming" ) -}}
{{- $ksServiceJob := dict "envAll" . "serviceName" "fm" "serviceTypes" ( tuple "faultmanagement" ) -}}
{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }}
{{- end }}

2
kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/templates/job-ks-service.yaml
View File

@ -5,6 +5,6 @@
*/}}
{{- if .Values.manifests.job_ks_service }}
{{- $ksServiceJob := dict "envAll" . "serviceName" "fm" "serviceTypes" ( tuple "alarming" ) -}}
{{- $ksServiceJob := dict "envAll" . "serviceName" "fm" "serviceTypes" ( tuple "faultmanagement" ) -}}
{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }}
{{- end }}

12
kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/templates/service.yaml
View File

@ -10,19 +10,19 @@
apiVersion: v1
kind: Service
metadata:
name: {{ tuple "alarming" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
name: {{ tuple "faultmanagement" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
spec:
ports:
- name: fm-port
port: {{ .Values.network.alarming.port }}
{{ if .Values.network.alarming.node_port.enabled }}
nodePort: {{ .Values.network.alarming.node_port.port }}
port: {{ .Values.network.faultmanagement.port }}
{{ if .Values.network.faultmanagement.node_port.enabled }}
nodePort: {{ .Values.network.faultmanagement.node_port.port }}
{{ end }}
selector:
{{ tuple $envAll "fm-rest-api" "fm" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.alarming.node_port.enabled }}
{{ if .Values.network.faultmanagement.node_port.enabled }}
type: NodePort
{{ if .Values.network.alarming.external_policy_local }}
{{ if .Values.network.faultmanagement.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}

6
kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/fm-rest-api/values.yaml
View File

@ -32,7 +32,7 @@ nameOverride: ""
fullnameOverride: ""
network:
alarming:
faultmanagement:
ingress:
public: true
classes:
@ -246,7 +246,7 @@ endpoints:
api:
default: 80
internal: 5000
alarming:
faultmanagement:
name: fm
hosts:
default: fm-rest-api
@ -336,7 +336,7 @@ secrets:
admin: fm-db-admin
fm: fm-db-user
tls:
alarming:
faultmanagement:
fm_api:
public: fm-rest-api-tls-public