diff options
| author |   vladimir turok <vladimir.turok@t-systems.com> | 2023-07-27 16:28:36 +0200 |
|---|---|---|
| committer |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-08-07 18:34:04 +0200 |
| commit | d804418c890dde93bff26125b8cf1a9fd7fc82d1 (patch) | |
| tree | 5c8d93188819e6a913f8e0566d061607b5be9095 /kubernetes/common/elasticsearch/templates | |
| parent | 7a34dfca27abc3a13f89ed8d6b87e4aa7be9613f (diff) | |
[OOM] Fixing k8s ServiceAccounts
Adding service account for the jobs
Cleanup MSB, ES and other common charts from AAF dependencies
Issue-ID: OOM-3199
Issue-ID: OOM-3114
Issue-ID: OOM-3116
Change-Id: I55bf80876c9fb3b110e538ed1a5504e0dc1d4e1a
Signed-off-by: vladimir turok <vladimir.turok@t-systems.com>
Diffstat (limited to 'kubernetes/common/elasticsearch/templates')
| -rw-r--r-- | kubernetes/common/elasticsearch/templates/configmap-server-block.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml | 3 |
2 files changed, 0 insertions, 9 deletions
diff --git a/kubernetes/common/elasticsearch/templates/configmap-server-block.yaml b/kubernetes/common/elasticsearch/templates/configmap-server-block.yaml index 49ce0ef76a..e7520aeed6 100644 --- a/kubernetes/common/elasticsearch/templates/configmap-server-block.yaml +++ b/kubernetes/common/elasticsearch/templates/configmap-server-block.yaml @@ -21,11 +21,5 @@ kind: ConfigMap metadata: {{- include "common.resourceMetadata" (dict "suffix" $suffix "dot" . )| nindent 2 }} data: server-block.conf: |- -{{ if .Values.global.aafEnabled }} -{{ .Values.nginx.serverBlock.https | indent 4 }} -{{ else }} {{ .Values.nginx.serverBlock.http | indent 4 }} - - -{{ end }} {{- end -}} diff --git a/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml b/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml index 05e09cb696..43eb92dd1e 100644 --- a/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml +++ b/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml @@ -64,7 +64,6 @@ spec: securityContext: privileged: true {{- end }} - {{ include "common.certInitializer.initContainer" . | nindent 8 }} containers: - name: {{ include "common.name" . }}-nginx @@ -85,7 +84,6 @@ spec: - name: nginx-server-block mountPath: /opt/bitnami/nginx/conf/server_blocks {{- end }} - {{- include "common.certInitializer.volumeMount" . | nindent 10 }} - name: {{ include "common.name" . }}-elasticsearch image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }} @@ -172,4 +170,3 @@ spec: configMap: name: {{ include "common.fullname" . }}-nginx-server-block {{- end }} - {{ include "common.certInitializer.volumes" . | nindent 8 }} |