summaryrefslogtreecommitdiffstats
path: root/kubernetes/common/certInitializer
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/common/certInitializer')
-rw-r--r--kubernetes/common/certInitializer/requirements.yaml3
-rw-r--r--kubernetes/common/certInitializer/templates/_certInitializer.yaml4
-rw-r--r--kubernetes/common/certInitializer/values.yaml2
3 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/common/certInitializer/requirements.yaml b/kubernetes/common/certInitializer/requirements.yaml
index 81b0845ae0..3677d45a26 100644
--- a/kubernetes/common/certInitializer/requirements.yaml
+++ b/kubernetes/common/certInitializer/requirements.yaml
@@ -19,3 +19,6 @@ dependencies:
- name: readinessCheck
version: ~7.x-0
repository: 'file://../readinessCheck'
+ - name: repositoryGenerator
+ version: ~7.x-0
+ repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/certInitializer/templates/_certInitializer.yaml b/kubernetes/common/certInitializer/templates/_certInitializer.yaml
index 800364f1a2..c1459bf438 100644
--- a/kubernetes/common/certInitializer/templates/_certInitializer.yaml
+++ b/kubernetes/common/certInitializer/templates/_certInitializer.yaml
@@ -44,7 +44,7 @@
{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
{{ include "common.readinessCheck.waitFor" $subchartDot }}
- name: {{ include "common.name" $dot }}-aaf-config
- image: {{ include "common.repository" $subchartDot }}/{{ $subchartDot.Values.global.aafAgentImage }}
+ image: {{ include "repositoryGenerator.repository" $subchartDot }}/{{ $subchartDot.Values.global.aafAgentImage }}
imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }}
volumeMounts:
- mountPath: {{ $initRoot.mountPath }}
@@ -116,7 +116,7 @@
{{- $initRoot := default $dot.Values.certInitializer .initRoot -}}
{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
- name: {{ include "common.name" $dot }}-import-custom-certs
- image: {{ $subchartDot.Values.global.jreImage }}
+ image: {{ include "repositoryGenerator.image.jre" $subchartDot }}
imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }}
securityContext:
runAsUser: 0
diff --git a/kubernetes/common/certInitializer/values.yaml b/kubernetes/common/certInitializer/values.yaml
index 66251fa29a..e7a0a3f02e 100644
--- a/kubernetes/common/certInitializer/values.yaml
+++ b/kubernetes/common/certInitializer/values.yaml
@@ -13,10 +13,8 @@
# limitations under the License.
global:
- repository: nexus3.onap.org:10001
aafAgentImage: onap/aaf/aaf_agent:2.1.20
aafEnabled: true
- jreImage: registry.gitlab.com/onap-integration/docker/onap-java
pullPolicy: Always