diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-03-23 22:36:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-23 22:36:50 +0000 |
| commit | e827ca05b6efa7cdcc60c4b3eba5ebfa9546bd08 (patch) | |
| tree | dc0d7c8406f074d9e9d75ed5e843e12e7d55730f /kubernetes/so/templates | |
| parent | 37764a610ae66b53ed6b40c9eb11f54187e5dde0 (diff) | |
| parent | 96bebdcf842ef0e6c1c65713930331f0c72d1d55 (diff) | |
Merge changes I6a379ec4,I982a75a9,Id8a84b79,I423294a5,Iefe3d89a
* changes:
SO endpoints and service update
SDNC parameterized persisted type and location
Portal selective readiness check
Message-router parameterization
AAI parameterization
Diffstat (limited to 'kubernetes/so/templates')
| -rw-r--r-- | kubernetes/so/templates/deployment.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/so/templates/service.yaml | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml index 8706951467..0727ce80a3 100644 --- a/kubernetes/so/templates/deployment.yaml +++ b/kubernetes/so/templates/deployment.yaml @@ -49,7 +49,7 @@ spec: - name: {{ .Chart.Name }} command: - /tmp/start-jboss-server.sh - image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}" + image: "{{ .Values.repository | default .Values.global.repository }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -189,3 +189,4 @@ spec: mode: 0755 imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" + diff --git a/kubernetes/so/templates/service.yaml b/kubernetes/so/templates/service.yaml index de7e1c4a4c..63e41acc46 100644 --- a/kubernetes/so/templates/service.yaml +++ b/kubernetes/so/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.fullname" . }} + name: so namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -80,4 +80,5 @@ spec: {{- end}} selector: app: {{ include "common.name" . }} - release: {{ .Release.Name }}
\ No newline at end of file + release: {{ .Release.Name }} + |