Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[COMMON] Use common aaf template in elasticsearch"
[oom.git]
/
kubernetes
/
common
/
certInitializer
/
templates
/
_certInitializer.yaml
diff --git
a/kubernetes/common/certInitializer/templates/_certInitializer.yaml
b/kubernetes/common/certInitializer/templates/_certInitializer.yaml
index
0e0f339
..
eddc7bc
100644
(file)
--- a/
kubernetes/common/certInitializer/templates/_certInitializer.yaml
+++ b/
kubernetes/common/certInitializer/templates/_certInitializer.yaml
@@
-41,11
+41,10
@@
{{- $dot := default . .dot -}}
{{- $initRoot := default $dot.Values.certInitializer .initRoot -}}
{{- $initName := default "certInitializer" -}}
{{- $dot := default . .dot -}}
{{- $initRoot := default $dot.Values.certInitializer .initRoot -}}
{{- $initName := default "certInitializer" -}}
-{{/* Our version of helm doesn't support deepCopy so we need this nasty trick */}}
-{{- $subchartDot := mergeOverwrite (fromJson (toJson $dot)) (dict "Chart" (set (fromJson (toJson .Chart)) "Name" $initRoot.nameOverride) "Values" $initRoot) }}
+{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
- name: {{ include "common.name" $dot }}-aaf-readiness
- name: {{ include "common.name" $dot }}-aaf-readiness
- image: "{{ $
dot.Values.global.readinessRepository }}/{{ $d
ot.Values.global.readinessImage }}"
- imagePullPolicy: {{ $
dot.Values.global.pullPolicy | default $d
ot.Values.pullPolicy }}
+ image: "{{ $
subchartDot.Values.global.readinessRepository }}/{{ $subchartD
ot.Values.global.readinessImage }}"
+ imagePullPolicy: {{ $
subchartDot.Values.global.pullPolicy | default $subchartD
ot.Values.pullPolicy }}
command:
- /root/ready.py
args:
command:
- /root/ready.py
args:
@@
-62,8
+61,8
@@
apiVersion: v1
fieldPath: metadata.namespace
- name: {{ include "common.name" $dot }}-aaf-config
apiVersion: v1
fieldPath: metadata.namespace
- name: {{ include "common.name" $dot }}-aaf-config
- image: {{ (default $
dot.Values.repository $dot.Values.global.repository) }}/{{ $d
ot.Values.global.aafAgentImage }}
- imagePullPolicy: {{ $
dot.Values.global.pullPolicy | default $d
ot.Values.pullPolicy }}
+ image: {{ (default $
subchartDot.Values.repository $subchartDot.Values.global.repository) }}/{{ $subchartD
ot.Values.global.aafAgentImage }}
+ imagePullPolicy: {{ $
subchartDot.Values.global.pullPolicy | default $subchartD
ot.Values.pullPolicy }}
volumeMounts:
- mountPath: {{ $initRoot.mountPath }}
name: {{ include "common.certInitializer._aafConfigVolumeName" $dot }}
volumeMounts:
- mountPath: {{ $initRoot.mountPath }}
name: {{ include "common.certInitializer._aafConfigVolumeName" $dot }}
@@
-124,20
+123,20
@@
{{- define "common.certInitializer._volumes" -}}
{{- $dot := default . .dot -}}
{{- $initRoot := default $dot.Values.certInitializer .initRoot -}}
{{- define "common.certInitializer._volumes" -}}
{{- $dot := default . .dot -}}
{{- $initRoot := default $dot.Values.certInitializer .initRoot -}}
-{{- $subchartDot := mergeOverwrite (
fromJson (toJson $dot)) (dict "Chart" (set (fromJson (toJson .Chart)) "Name" $initRoot.nameOverride) "Values" $initRoot
) }}
+{{- $subchartDot := mergeOverwrite (
deepCopy (omit $dot "Values")) (dict "Chart" (set (fromJson (toJson $dot.Chart)) "Name" $initRoot.nameOverride) "Values" (mergeOverwrite (deepCopy $initRoot) (dict "global" $dot.Values.global))
) }}
- name: {{ include "common.certInitializer._aafConfigVolumeName" $dot }}
emptyDir:
medium: Memory
- name: {{ include "common.certInitializer._aafConfigVolumeName" $dot }}
emptyDir:
medium: Memory
-{{- if $initRoot.aaf_add_config }}
-- name: {{ include "common.certInitializer._aafAddConfigVolumeName" $dot }}
- configMap:
- name: {{ include "common.fullname" $subchartDot }}-add-config
- defaultMode: 0700
- name: aaf-agent-certs
configMap:
name: {{ include "common.fullname" $subchartDot }}-certs
defaultMode: 0700
- name: aaf-agent-certs
configMap:
name: {{ include "common.fullname" $subchartDot }}-certs
defaultMode: 0700
+{{- if $initRoot.aaf_add_config }}
+- name: {{ include "common.certInitializer._aafAddConfigVolumeName" $dot }}
+ configMap:
+ name: {{ include "common.fullname" $subchartDot }}-add-config
+ defaultMode: 0700
{{- end -}}
{{- end -}}
{{- end -}}
{{- end -}}