This commit makes Policy 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: Ibc592fdc393e37c075ce905027d49d70fcbe4d84
24 files changed:
- name: certInitializer
version: ~6.x-0
repository: '@local'
- name: certInitializer
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
name: apexconfig-input
- mountPath: /config
name: apexconfig
name: apexconfig-input
- mountPath: /config
name: apexconfig
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["bash","-c"]
args: ["if [ -f {{ .Values.certInitializer.credsPath }}/.ci ]; then \
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["bash","-c"]
args: ["if [ -f {{ .Values.certInitializer.credsPath }}/.ci ]; then \
#################################################################
global:
nodePortPrefix: 302
#################################################################
global:
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- envsubstImage: dibi/envsubst
aafEnabled: true
persistence: {}
aafEnabled: true
persistence: {}
# Application configuration defaults.
#################################################################
# application image
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/policy-apex-pdp:2.4.4
pullPolicy: Always
image: onap/policy-apex-pdp:2.4.4
pullPolicy: Always
- name: certInitializer
version: ~6.x-0
repository: '@local'
- name: certInitializer
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
- command:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
- command:
name: apiconfig
- mountPath: /config
name: apiconfig-processed
name: apiconfig
- mountPath: /config
name: apiconfig-processed
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
{{ include "common.certInitializer.initContainer" . | indent 8 }}
containers:
- name: {{ include "common.name" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
{{ include "common.certInitializer.initContainer" . | indent 8 }}
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
{{- if .Values.global.aafEnabled }}
command: ["bash","-c"]
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
{{- if .Values.global.aafEnabled }}
command: ["bash","-c"]
global:
nodePortPrefix: 304
persistence: {}
global:
nodePortPrefix: 304
persistence: {}
- envsubstImage: dibi/envsubst
- readinessImage: onap/oom/readiness:3.0.1
#################################################################
# Secrets metaconfig
#################################################################
# Secrets metaconfig
# Application configuration defaults.
#################################################################
# application image
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/policy-api:2.3.3
pullPolicy: Always
image: onap/policy-api:2.3.3
pullPolicy: Always
- name: certInitializer
version: ~6.x-0
repository: '@local'
- name: certInitializer
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
name: distributionconfig-input
- mountPath: /config
name: distributionconfig
name: distributionconfig-input
- mountPath: /config
name: distributionconfig
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
{{- if .Values.global.aafEnabled }}
command: ["bash","-c"]
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
{{- if .Values.global.aafEnabled }}
command: ["bash","-c"]
#################################################################
global:
persistence: {}
#################################################################
global:
persistence: {}
- envsubstImage: dibi/envsubst
- readinessImage: onap/oom/readiness:3.0.1
#################################################################
# Application configuration defaults.
#################################################################
# application image
#################################################################
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/policy-distribution:2.4.3
pullPolicy: Always
image: onap/policy-distribution:2.4.3
pullPolicy: Always
- name: certInitializer
version: ~6.x-0
repository: '@local'
- name: certInitializer
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-db-readiness
{{- if not .Values.nexus.offline }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-db-readiness
{{- if not .Values.nexus.offline }}
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
{{- end }}
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
{{- end }}
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["bash","-c"]
args: ["if [ -f {{ .Values.certInitializer.credsPath }}/.ci ]; then \
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["bash","-c"]
args: ["if [ -f {{ .Values.certInitializer.credsPath }}/.ci ]; then \
#################################################################
global:
nodePortPrefix: 302
#################################################################
global:
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- ubuntuImage: ubuntu:16.04
#################################################################
# Secrets metaconfig
#################################################################
# Secrets metaconfig
# Application configuration defaults.
#################################################################
# application image
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/policy-pdpd-cl:1.7.5
pullPolicy: Always
image: onap/policy-pdpd-cl:1.7.5
pullPolicy: Always
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
spec:
initContainers:
- command: ["sh", "-c", "chown -R 200:200 /share"]
spec:
initContainers:
- command: ["sh", "-c", "chown -R 200:200 /share"]
- image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.global.ubuntuInitImage }}"
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-init
volumeMounts:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-init
volumeMounts:
name: nexus-data
containers:
- name: {{ include "common.name" . }}
name: nexus-data
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.externalPort }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.externalPort }}
#################################################################
global:
nodePortPrefix: 302
#################################################################
global:
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- ubuntuInitRepository: oomk8s
- ubuntuInitImage: ubuntu-init:1.0.0
persistence: {}
#################################################################
# Application configuration defaults.
#################################################################
# application image
persistence: {}
#################################################################
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: sonatype/nexus:2.14.13-01
pullPolicy: Always
image: sonatype/nexus:2.14.13-01
pullPolicy: Always
- name: certInitializer
version: ~6.x-0
repository: '@local'
- name: certInitializer
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
- command:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
- command:
name: papconfig
- mountPath: /config
name: papconfig-processed
name: papconfig
- mountPath: /config
name: papconfig-processed
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
{{- if .Values.global.aafEnabled }}
command: ["bash","-c"]
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
{{- if .Values.global.aafEnabled }}
command: ["bash","-c"]
global:
nodePortPrefixExt: 304
persistence: {}
global:
nodePortPrefixExt: 304
persistence: {}
- envsubstImage: dibi/envsubst
- readinessImage: onap/oom/readiness:3.0.1
#################################################################
# Secrets metaconfig
#################################################################
# Secrets metaconfig
# Application configuration defaults.
#################################################################
# application image
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/policy-pap:2.3.3
pullPolicy: Always
image: onap/policy-pap:2.3.3
pullPolicy: Always
- name: certInitializer
version: ~6.x-0
repository: '@local'
- name: certInitializer
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
- command:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
- command:
name: pdpxconfig
- mountPath: /config
name: pdpxconfig-processed
name: pdpxconfig
- mountPath: /config
name: pdpxconfig-processed
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
{{- if .Values.global.aafEnabled }}
command: ["bash","-c"]
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
{{- if .Values.global.aafEnabled }}
command: ["bash","-c"]
#################################################################
global:
persistence: {}
#################################################################
global:
persistence: {}
- envsubstImage: dibi/envsubst
- readinessImage: onap/oom/readiness:3.0.1
#################################################################
# Secrets metaconfig
#################################################################
# Secrets metaconfig
# Application configuration defaults.
#################################################################
# application image
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/policy-xacml-pdp:2.3.3
pullPolicy: Always
image: onap/policy-xacml-pdp:2.3.3
pullPolicy: Always
version: ~6.x-0
repository: 'file://components/policy-distribution'
condition: policy-distribution.enabled
version: ~6.x-0
repository: 'file://components/policy-distribution'
condition: policy-distribution.enabled
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
initContainers:
#This container checks that all galera instances are up before initializing it.
- name: {{ include "common.name" . }}-readiness
initContainers:
#This container checks that all galera instances are up before initializing it.
- name: {{ include "common.name" . }}-readiness
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
fieldPath: metadata.namespace
containers:
- name: {{ include "common.release" . }}-policy-galera-config
fieldPath: metadata.namespace
containers:
- name: {{ include "common.release" . }}-policy-galera-config
- image: {{ .Values.mariadb_image }}
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadb.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /dbcmd-config/db.sh
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /dbcmd-config/db.sh
# Global configuration defaults.
#################################################################
global:
# Global configuration defaults.
#################################################################
global:
- readinessImage: onap/oom/readiness:3.0.1
aafEnabled: true
mariadb:
# '&mariadbConfig' means we "store" the values for later use in the file
aafEnabled: true
mariadb:
# '&mariadbConfig' means we "store" the values for later use in the file
#################################################################
repository: nexus3.onap.org:10001
#################################################################
repository: nexus3.onap.org:10001
-mariadb_image: library/mariadb:10
+mariadb:
+ image: mariadb:10.5.8
+
subChartsOnly:
enabled: true
subChartsOnly:
enabled: true