diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-11-26 09:58:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-26 09:58:55 +0000 |
| commit | 5fd87d08f23f6199969a3e4f863d2d9e20b5c395 (patch) | |
| tree | f6b820b1f6eaf4935986d209e199440618d68e1b | |
| parent | ee07bc6c45cb623c8302d1374ca2a4648452a05b (diff) | |
| parent | d4a6afd388cd08d9c5aae5c6a23b2bdbbd1de019 (diff) | |
Merge "[A1Policy] Uses new tpls for repos / images"
| -rw-r--r-- | kubernetes/a1policymanagement/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/a1policymanagement/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/a1policymanagement/values.yaml | 4 |
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 |