diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-12-15 11:59:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-12-15 11:59:42 +0000 |
| commit | 20bb93fcb22d8aeef526b0f99ac8d57b7d9c95be (patch) | |
| tree | 641929d9bef767cbb1c5fdeaa064631a4d427e84 /kubernetes | |
| parent | 0ea903d6d6c9b7e52eb3fd57ba5e3d1f8273b439 (diff) | |
| parent | 8055f5a08b671f161f1287767d972a96517bb945 (diff) | |
Merge "[COMMON] Make namespace configurable"
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 }} |