diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-10-09 16:50:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-09 16:50:11 +0000 |
| commit | a4f64172c0b9e12905d173ac739b9254acb30f77 (patch) | |
| tree | b9dcef1566a7665d8bc3545420ced210904faf6b /kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml | |
| parent | aa9603c56a2e6f64ba207d20080ab7c69b5f5f31 (diff) | |
| parent | a0496b0f40c37b9a5c4747a58f34dbd47a27f1ed (diff) | |
Merge "Migrate ELK to 6.1.3 OSS"
Diffstat (limited to 'kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml')
| -rw-r--r-- | kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml index cd8e1026e7..0f5a93347a 100644 --- a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml +++ b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml @@ -46,26 +46,9 @@ spec: image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness - - args: - - --output=http://{{.Values.config.elasticsearchServiceName}}.{{ include "common.namespace" . }}:{{.Values.config.elasticsearchPort}}/.kibana - - --input=/config/default.json - - --type=data - env: - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - image: "{{ .Values.configRepository }}/{{ .Values.configImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: {{ include "common.name" . }}-config - volumeMounts: - - mountPath: /config/default.json - name: {{ include "common.fullname" . }} - subPath: default.json containers: - name: {{ include "common.name" . }} - image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}" + image: "{{ .Values.global.imageRepository | default .Values.imageRepository }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -112,8 +95,5 @@ spec: items: - key: kibana.yml path: kibana.yml - - key: default.json - path: default.json - imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |