diff options
| author |   xuegao <xue.gao@intl.att.com> | 2021-12-08 09:26:42 +0100 |
|---|---|---|
| committer | Xue Gao <xue.gao@intl.att.com> | 2021-12-09 07:26:44 +0000 |
| commit | 8055f5a08b671f161f1287767d972a96517bb945 (patch) | |
| tree | c19c90745ad7d599e2ca6317d88f6b8f8854b5c0 /kubernetes | |
| parent | 370c6dc33e55bfee7b3b79bcc21481b02a3f1e24 (diff) | |
[COMMON] Make namespace configurable
Make the namespace parameter configurable for
CertInitializer and ReadinessCheck Chart
Issue-ID: OOM-2888
Signed-off-by: xuegao <xue.gao@intl.att.com>
Change-Id: I5bb4e86be935921af1d852d6d7666fb5c8eaf725
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/common/certInitializer/templates/_certInitializer.yaml | 13 | ||||
| -rw-r--r-- | kubernetes/common/readinessCheck/templates/_readinessCheck.tpl | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/kubernetes/common/certInitializer/templates/_certInitializer.yaml b/kubernetes/common/certInitializer/templates/_certInitializer.yaml index 32bba457ee..d5fc5a0c08 100644 --- a/kubernetes/common/certInitializer/templates/_certInitializer.yaml +++ b/kubernetes/common/certInitializer/templates/_certInitializer.yaml @@ -84,12 +84,19 @@ env: - name: APP_FQI value: "{{ $initRoot.fqi }}" + {{- if $initRoot.aaf_namespace }} - name: aaf_locate_url - value: "https://aaf-locate.{{ $dot.Release.Namespace}}:8095" - - name: aaf_locator_container - value: "oom" + value: "https://aaf-locate.{{ $initRoot.aaf_namespace }}:8095" + - name: aaf_locator_container_ns + value: "{{ $initRoot.aaf_namespace }}" + {{- else }} + - name: aaf_locate_url + value: "https://aaf-locate.{{ $dot.Release.Namespace }}:8095" - name: aaf_locator_container_ns value: "{{ $dot.Release.Namespace }}" + {{- end }} + - name: aaf_locator_container + value: "oom" - name: aaf_locator_fqdn value: "{{ $initRoot.fqdn }}" - name: aaf_locator_app_ns diff --git a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl index 71201a1cc6..90c278e4c5 100644 --- a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl +++ b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl @@ -83,10 +83,14 @@ {{- end }} env: - name: NAMESPACE + {{- if $subchartDot.Values.namespace }} + value: {{ $subchartDot.Values.namespace }} + {{- else }} valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.namespace + {{- end }} resources: limits: cpu: {{ $subchartDot.Values.limits.cpu }} |