Merge "[A1Policy] Uses new tpls for repos / images"

diff --git a/kubernetes/a1policymanagement/requirements.yaml b/kubernetes/a1policymanagement/requirements.yaml
index f517fbb..7257fcf 100644 (file)
--- a/kubernetes/a1policymanagement/requirements.yaml
+++ b/kubernetes/a1policymanagement/requirements.yaml
@@ -18,3 +18,6 @@ dependencies:
   - name: common
     version: ~6.x-0
     repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
+    repository: '@local'
\ No newline at end of file

diff --git a/kubernetes/a1policymanagement/templates/deployment.yaml b/kubernetes/a1policymanagement/templates/deployment.yaml
index 1a2866b..ce2e273 100644 (file)
--- a/kubernetes/a1policymanagement/templates/deployment.yaml
+++ b/kubernetes/a1policymanagement/templates/deployment.yaml
@@ -29,7 +29,7 @@ spec:
     spec:
       initContainers:
       - name: {{ include "common.name" . }}-bootstrap-config
-        image: "{{ .Values.global.envsubstImage }}"
+        image: {{ include "repositoryGenerator.image.envsubst" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command:
         - sh
@@ -71,7 +71,7 @@ spec:
         - mountPath: /config
           name: config
       - name: {{ include "common.name" . }}
-        image: {{ include "common.repository" . }}/{{ .Values.image }}
+        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         ports: {{ include "common.containerPorts" . | nindent 10  }}
         readinessProbe:

diff --git a/kubernetes/a1policymanagement/values.yaml b/kubernetes/a1policymanagement/values.yaml
index 2f45e41..a1602c5 100644 (file)
--- a/kubernetes/a1policymanagement/values.yaml
+++ b/kubernetes/a1policymanagement/values.yaml
@@ -19,8 +19,7 @@
 # Declare variables to be passed into your templates.
 
 global:
-  nodePortPrefix: 300
-  envsubstImage: dibi/envsubst:1
+  nodePortPrefix: 302
 
 secrets:
   - uid: controller-secret
@@ -30,7 +29,6 @@ secrets:
     password: '{{ .Values.a1controller.password }}'
     passwordPolicy: required
 
-repository: nexus3.onap.org:10001
 image: onap/ccsdk-oran-a1policymanagementservice:1.0.1
 userID: 1000 #Should match with image-defined user ID
 groupID: 999 #Should match with image-defined group ID