diff options
| author |   Jerome Doucerain <jerome.doucerain@bell.ca> | 2018-04-16 14:26:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-16 14:26:32 +0000 |
| commit | a6ee34ed3a655541a4cac72c15dc7a9ee57a0ccc (patch) | |
| tree | 00f81391302e38ace7970dbe4c9589aa72947a41 /kubernetes/helm/starters/onap-app/templates | |
| parent | 86a6e6863215b75c5b76e97cb2b1021406153f2c (diff) | |
| parent | 14d6eae467e8769f001d7d46694f87bdce9c44f1 (diff) | |
Merge "Add service name standard template"
Diffstat (limited to 'kubernetes/helm/starters/onap-app/templates')
| -rw-r--r-- | kubernetes/helm/starters/onap-app/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/helm/starters/onap-app/templates/service.yaml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kubernetes/helm/starters/onap-app/templates/deployment.yaml b/kubernetes/helm/starters/onap-app/templates/deployment.yaml index 71aae08f31..a78795486b 100644 --- a/kubernetes/helm/starters/onap-app/templates/deployment.yaml +++ b/kubernetes/helm/starters/onap-app/templates/deployment.yaml @@ -54,13 +54,13 @@ spec: - containerPort: {{ .Values.service.internalPort }} # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container - {{- if eq .Values.liveness.enabled true }} + {{ if .Values.liveness.enabled }} livenessProbe: tcpSocket: port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end -}} + {{ end }} readinessProbe: tcpSocket: port: {{ .Values.service.internalPort }} diff --git a/kubernetes/helm/starters/onap-app/templates/service.yaml b/kubernetes/helm/starters/onap-app/templates/service.yaml index cab488aac3..94b81e855c 100644 --- a/kubernetes/helm/starters/onap-app/templates/service.yaml +++ b/kubernetes/helm/starters/onap-app/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.fullname" . }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -42,11 +42,11 @@ spec: #Example internal target port if required #targetPort: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName | default "http" }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName | default "http" }} {{- end}} selector: app: {{ include "common.name" . }} |