diff options
author | Andreas Geissler <andreas-geissler@telekom.de> | 2023-03-27 17:11:27 +0200 |
---|---|---|
committer | Andreas Geissler <andreas-geissler@telekom.de> | 2023-03-29 17:46:17 +0200 |
commit | 2af5079ba7cc09fda2c19a3f627299b3ef655227 (patch) | |
tree | 76dd5b7179c384b58a2c1609365a15c21f3c0865 /kubernetes/sdnc/templates/sdnrdb-init-job.yaml | |
parent | 2ff70ab60f387a40f1723c0449e29c74fe1e118c (diff) |
[SDNC] Chart cleanup from TLS/AAF options
Remove checks and add the usage of common templates
Add information about external access to SDNC-callhome
and add ingress setup for it
Issue-ID: OOM-3122
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I7b32832ee31d811c23b4eaa5d43f7aa9d767c353
Diffstat (limited to 'kubernetes/sdnc/templates/sdnrdb-init-job.yaml')
-rwxr-xr-x | kubernetes/sdnc/templates/sdnrdb-init-job.yaml | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml index 9b69481c58..a36b97d39c 100755 --- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml +++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml @@ -23,13 +23,6 @@ spec: metadata: {{ include "common.templateMetadata" . | indent 6}} spec: initContainers: - {{ include "common.certInitializer.initContainer" . | indent 6 }} - {{ if .Values.global.aafEnabled }} - - name: {{ include "common.name" . }}-chown - image: {{ include "repositoryGenerator.image.busybox" . }} - command: ["sh", "-c", "chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certInitializer.credsPath }}"] - volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }} - {{ end }} - name: {{ include "common.name" . }}-readiness command: - /app/ready.py @@ -59,7 +52,7 @@ spec: sleep 90; "{{ .Values.config.binDir }}/startODL.sh" env: - name: SDNC_AAF_ENABLED - value: "{{ .Values.global.aafEnabled}}" + value: "false" - name: SDNC_HOME value: "{{.Values.config.sdncHome}}" - name: ETC_DIR @@ -70,14 +63,9 @@ spec: - name: SDNRINIT value: "true" - name: SDNRDBURL - {{ if .Values.global.aafEnabled -}} - value: "https://{{ .Values.elasticsearch.service.name | default "sdnrdb"}}.{{.Release.Namespace}}:{{.Values.elasticsearch.service.port | default "9200"}}" - {{- else -}} value: "http://{{ .Values.elasticsearch.service.name | default "sdnrdb"}}.{{.Release.Namespace}}:{{.Values.elasticsearch.service.port | default "9200"}}" - {{- end }} - name: SDNRDBPARAMETER value: "-k" - volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }} resources: {{ include "common.resources" . | nindent 10 }} {{- if include "common.onServiceMesh" . }} - name: sdnrdb-service-mesh-wait-for-job-container @@ -117,7 +105,6 @@ spec: configMap: name: {{ include "common.fullname" . }}-properties defaultMode: 0644 -{{ include "common.certInitializer.volumes" . | nindent 6 }} restartPolicy: Never imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |