summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 22:01:15 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 22:01:15 +0100
commitd4a6afd388cd08d9c5aae5c6a23b2bdbbd1de019 (patch)
tree9ea7ccb77f2a18a646a31f6a9c4f0d4b54f58064
parent2b2aa11021114438591d184af19fde6bbf06950a (diff)
[A1Policy] Uses new tpls for repos / images
This commit makes A1 Policy Management chart to use the new generator for repositories and images. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I862bb425b05e152c669f8ff6ecbe34c96af4f6e7
-rw-r--r--kubernetes/a1policymanagement/requirements.yaml3
-rw-r--r--kubernetes/a1policymanagement/templates/deployment.yaml4
-rw-r--r--kubernetes/a1policymanagement/values.yaml4
3 files changed, 6 insertions, 5 deletions
diff --git a/kubernetes/a1policymanagement/requirements.yaml b/kubernetes/a1policymanagement/requirements.yaml
index f517fbbcc1..7257fcf4f3 100644
--- 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 1a2866b981..ce2e2732e6 100644
--- 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 2f45e41648..a1602c569c 100644
--- 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