summaryrefslogtreecommitdiffstats
path: root/helm
diff options
context:
space:
mode:
Diffstat (limited to 'helm')
-rw-r--r--helm/policy/components/mariadb-galera/templates/statefulset.yaml2
-rw-r--r--helm/policy/components/mariadb-galera/values.yaml1
-rwxr-xr-xhelm/policy/components/policy-apex-pdp/templates/statefulset.yaml2
-rwxr-xr-xhelm/policy/components/policy-apex-pdp/values.yaml1
-rwxr-xr-xhelm/policy/components/policy-api/templates/deployment.yaml4
-rw-r--r--helm/policy/components/policy-api/values.yaml1
-rwxr-xr-xhelm/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml2
-rwxr-xr-xhelm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml1
-rw-r--r--helm/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml2
-rw-r--r--helm/policy/components/policy-clamp-ac-http-ppnt/values.yaml1
-rw-r--r--helm/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml2
-rw-r--r--helm/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml5
-rwxr-xr-xhelm/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml2
-rwxr-xr-xhelm/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml1
-rw-r--r--helm/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml2
-rw-r--r--helm/policy/components/policy-clamp-ac-pf-ppnt/values.yaml1
-rw-r--r--helm/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml4
-rw-r--r--helm/policy/components/policy-clamp-runtime-acm/values.yaml9
-rwxr-xr-xhelm/policy/components/policy-distribution/templates/deployment.yaml2
-rw-r--r--helm/policy/components/policy-distribution/values.yaml1
-rw-r--r--helm/policy/components/policy-drools-pdp/templates/statefulset.yaml6
-rw-r--r--helm/policy/components/policy-drools-pdp/values.yaml1
-rw-r--r--helm/policy/components/policy-models-simulator/templates/deployment.yaml4
-rw-r--r--helm/policy/components/policy-models-simulator/values.yaml5
-rwxr-xr-xhelm/policy/components/policy-pap/templates/deployment.yaml4
-rwxr-xr-xhelm/policy/components/policy-pap/values.yaml1
-rwxr-xr-xhelm/policy/components/policy-xacml-pdp/templates/deployment.yaml4
-rw-r--r--helm/policy/components/policy-xacml-pdp/values.yaml1
-rwxr-xr-xhelm/policy/templates/job.yaml8
-rwxr-xr-xhelm/policy/values.yaml70
-rw-r--r--helm/robot/templates/test-job.yaml4
31 files changed, 57 insertions, 97 deletions
diff --git a/helm/policy/components/mariadb-galera/templates/statefulset.yaml b/helm/policy/components/mariadb-galera/templates/statefulset.yaml
index c347bef0..a606088e 100644
--- a/helm/policy/components/mariadb-galera/templates/statefulset.yaml
+++ b/helm/policy/components/mariadb-galera/templates/statefulset.yaml
@@ -90,7 +90,7 @@ spec:
{{- end }}
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.dockerRepository }}/{{ .Values.global.image.mariadb }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy | quote}}
command:
- bash
diff --git a/helm/policy/components/mariadb-galera/values.yaml b/helm/policy/components/mariadb-galera/values.yaml
index 8fce8809..f0a21386 100644
--- a/helm/policy/components/mariadb-galera/values.yaml
+++ b/helm/policy/components/mariadb-galera/values.yaml
@@ -27,7 +27,6 @@ global:
passwordStrengthOverride: basic
-image: docker.io/bitnami/mariadb-galera:10.5.8
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
diff --git a/helm/policy/components/policy-apex-pdp/templates/statefulset.yaml b/helm/policy/components/policy-apex-pdp/templates/statefulset.yaml
index 29291afc..f8fc4b08 100755
--- a/helm/policy/components/policy-apex-pdp/templates/statefulset.yaml
+++ b/helm/policy/components/policy-apex-pdp/templates/statefulset.yaml
@@ -74,7 +74,7 @@ spec:
name: {{ .Chart.Name }}-update-config
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.apex }}
imagePullPolicy: {{ .Values.pullPolicy }}
command: ["sh","-c"]
args: ["/opt/app/policy/apex-pdp/bin/apexOnapPf.sh -c /home/apexuser/config/OnapPfConfig.json"]
diff --git a/helm/policy/components/policy-apex-pdp/values.yaml b/helm/policy/components/policy-apex-pdp/values.yaml
index 647bf5b1..ae6ae1d5 100755
--- a/helm/policy/components/policy-apex-pdp/values.yaml
+++ b/helm/policy/components/policy-apex-pdp/values.yaml
@@ -29,7 +29,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-apex-pdp:2.9-SNAPSHOT-latest
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/helm/policy/components/policy-api/templates/deployment.yaml b/helm/policy/components/policy-api/templates/deployment.yaml
index ae8b85fb..d89cd5a8 100755
--- a/helm/policy/components/policy-api/templates/deployment.yaml
+++ b/helm/policy/components/policy-api/templates/deployment.yaml
@@ -49,7 +49,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: nexus3.onap.org:10001/onap/oom/readiness:3.0.1
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.readiness }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ .Chart.Name }}-readiness
- command:
@@ -88,7 +88,7 @@ spec:
name: {{ .Chart.Name }}-update-config
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.api }}
imagePullPolicy: {{ .Values.pullPolicy }}
command: ["/opt/app/policy/api/bin/policy-api.sh"]
args: ["/opt/app/policy/api/etc/mounted/apiParameters.yaml"]
diff --git a/helm/policy/components/policy-api/values.yaml b/helm/policy/components/policy-api/values.yaml
index c1e654c0..15a33e10 100644
--- a/helm/policy/components/policy-api/values.yaml
+++ b/helm/policy/components/policy-api/values.yaml
@@ -28,7 +28,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-api:2.8-SNAPSHOT-latest
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml
index 3b7678b8..071339b0 100755
--- a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml
+++ b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
name: {{ .Chart.Name }}-update-config
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.a1pmsparticipant }}
imagePullPolicy: {{ .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/a1pms-participant.sh"]
args: ["/opt/app/policy/clamp/etc/mounted/A1pmsParticipantParameters.yaml"]
diff --git a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
index 9abca5bf..21f41349 100755
--- a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
+++ b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
@@ -20,7 +20,6 @@
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-clamp-ac-a1pms-ppnt:6.4-SNAPSHOT-latest
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/helm/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml b/helm/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
index f056861a..c8aadc8b 100644
--- a/helm/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
+++ b/helm/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
@@ -77,7 +77,7 @@ spec:
name: {{ .Chart.Name }}-update-config
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.httpparticipant }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/http-participant.sh"]
args: ["/opt/app/policy/clamp/etc/mounted/HttpParticipantParameters.yaml"]
diff --git a/helm/policy/components/policy-clamp-ac-http-ppnt/values.yaml b/helm/policy/components/policy-clamp-ac-http-ppnt/values.yaml
index 9cf80fc5..7ad75d01 100644
--- a/helm/policy/components/policy-clamp-ac-http-ppnt/values.yaml
+++ b/helm/policy/components/policy-clamp-ac-http-ppnt/values.yaml
@@ -28,7 +28,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-clamp-ac-http-ppnt:6.4-SNAPSHOT-latest
pullPolicy: Always
# application configuration
diff --git a/helm/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml b/helm/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
index 58721070..2916da44 100644
--- a/helm/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
+++ b/helm/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
name: {{ .Chart.Name }}-update-config
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.k8sparticipant }}
imagePullPolicy: {{ .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/kubernetes-participant.sh"]
args: ["/opt/app/policy/clamp/etc/mounted/KubernetesParticipantParameters.yaml"]
diff --git a/helm/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml b/helm/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
index d158d2a2..84ac7b33 100644
--- a/helm/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
+++ b/helm/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
@@ -20,7 +20,6 @@
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-clamp-ac-k8s-ppnt:6.4-SNAPSHOT-latest
pullPolicy: Always
# flag to enable debugging - application support required
@@ -90,6 +89,10 @@ repoList:
repoName: bitnami
address: https://charts.bitnami.com/bitnami
+ -
+ repoName: policy-chartmuseum
+ address: http://policy-chartmuseum:8080
+
protocols:
- http
- https
diff --git a/helm/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml b/helm/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml
index 2b02d9ac..f9e17cfd 100755
--- a/helm/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml
+++ b/helm/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
name: {{ .Chart.Name }}-update-config
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.kserveparticipant }}
imagePullPolicy: {{ .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/kserve-participant.sh"]
args: ["/opt/app/policy/clamp/etc/mounted/KserveParticipantParameters.yaml"]
diff --git a/helm/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml b/helm/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
index 7bc601b1..eb4dfcf9 100755
--- a/helm/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
+++ b/helm/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
@@ -20,7 +20,6 @@
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-clamp-ac-kserve-ppnt:6.4-SNAPSHOT-latest
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/helm/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml b/helm/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml
index 14ba8aed..a321c5bd 100644
--- a/helm/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml
+++ b/helm/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml
@@ -97,7 +97,7 @@ spec:
name: {{ .Chart.Name }}-update-config
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.pfparticipant }}
imagePullPolicy: {{ .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/policy-participant.sh"]
args: ["/opt/app/policy/clamp/etc/mounted/PolicyParticipantParameters.yaml"]
diff --git a/helm/policy/components/policy-clamp-ac-pf-ppnt/values.yaml b/helm/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
index 16bd6ad9..59c1388f 100644
--- a/helm/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
+++ b/helm/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
@@ -27,7 +27,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-clamp-ac-pf-ppnt:6.4-SNAPSHOT-latest
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/helm/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml b/helm/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
index 14f5bb3d..2cd63b37 100644
--- a/helm/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
+++ b/helm/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
@@ -49,7 +49,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: nexus3.onap.org:10001/onap/oom/readiness:3.0.1
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.readiness }}
imagePullPolicy: {{ .Values.pullPolicy }}
name: {{ .Chart.Name }}-readiness
- command:
@@ -100,7 +100,7 @@ spec:
name: {{ .Chart.Name }}-update-config
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.runtimeacm }}
imagePullPolicy: {{ .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/acm-runtime.sh"]
args: ["/opt/app/policy/clamp/etc/mounted/acRuntimeParameters.yaml"]
diff --git a/helm/policy/components/policy-clamp-runtime-acm/values.yaml b/helm/policy/components/policy-clamp-runtime-acm/values.yaml
index 4c606f03..e3128492 100644
--- a/helm/policy/components/policy-clamp-runtime-acm/values.yaml
+++ b/helm/policy/components/policy-clamp-runtime-acm/values.yaml
@@ -21,7 +21,6 @@
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-clamp-runtime-acm:6.4-SNAPSHOT-latest
pullPolicy: Always
# flag to enable debugging - application support required
@@ -73,16 +72,16 @@ affinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 20
- periodSeconds: 10
+ initialDelaySeconds: 50
+ periodSeconds: 30
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
port: http-api
readiness:
- initialDelaySeconds: 20
- periodSeconds: 10
+ initialDelaySeconds: 50
+ periodSeconds: 30
port: http-api
service:
diff --git a/helm/policy/components/policy-distribution/templates/deployment.yaml b/helm/policy/components/policy-distribution/templates/deployment.yaml
index e8b203ba..4d8605d5 100755
--- a/helm/policy/components/policy-distribution/templates/deployment.yaml
+++ b/helm/policy/components/policy-distribution/templates/deployment.yaml
@@ -96,7 +96,7 @@ spec:
name: {{ .Chart.Name }}-update-config
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.distribution }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/opt/app/policy/distribution/bin/policy-dist.sh"]
args: ["/opt/app/policy/distribution/etc/mounted/config.json"]
diff --git a/helm/policy/components/policy-distribution/values.yaml b/helm/policy/components/policy-distribution/values.yaml
index 63ab8018..28f1f267 100644
--- a/helm/policy/components/policy-distribution/values.yaml
+++ b/helm/policy/components/policy-distribution/values.yaml
@@ -28,7 +28,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-distribution:2.9-SNAPSHOT-latest
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/helm/policy/components/policy-drools-pdp/templates/statefulset.yaml b/helm/policy/components/policy-drools-pdp/templates/statefulset.yaml
index e2121fa8..d68f5aa6 100644
--- a/helm/policy/components/policy-drools-pdp/templates/statefulset.yaml
+++ b/helm/policy/components/policy-drools-pdp/templates/statefulset.yaml
@@ -52,14 +52,14 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: nexus3.onap.org:10001/onap/oom/readiness:3.0.1
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.readiness }}
imagePullPolicy: Always
name: {{ .Chart.Name }}-db-readiness
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
- imagePullPolicy: Always
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.pdpdcl }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
command: ["sh","-c"]
args: ["/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot"]
ports:
diff --git a/helm/policy/components/policy-drools-pdp/values.yaml b/helm/policy/components/policy-drools-pdp/values.yaml
index 2d7415cd..dd2ce0c8 100644
--- a/helm/policy/components/policy-drools-pdp/values.yaml
+++ b/helm/policy/components/policy-drools-pdp/values.yaml
@@ -43,7 +43,6 @@ secrets:
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-pdpd-cl:1.12.1
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/helm/policy/components/policy-models-simulator/templates/deployment.yaml b/helm/policy/components/policy-models-simulator/templates/deployment.yaml
index fa70f799..84f1197c 100644
--- a/helm/policy/components/policy-models-simulator/templates/deployment.yaml
+++ b/helm/policy/components/policy-models-simulator/templates/deployment.yaml
@@ -27,8 +27,8 @@ spec:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.simulator }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
command: ["/opt/app/policy/simulators/bin/simulators.sh"]
args: ["/opt/app/policy/simulators/etc/mounted/simParameters.json"]
ports:
diff --git a/helm/policy/components/policy-models-simulator/values.yaml b/helm/policy/components/policy-models-simulator/values.yaml
index e567a141..367a7d8c 100644
--- a/helm/policy/components/policy-models-simulator/values.yaml
+++ b/helm/policy/components/policy-models-simulator/values.yaml
@@ -4,10 +4,7 @@
replicaCount: 1
-image:
- repository: nexus3.onap.org:10001/onap/policy-models-simulator
- tag: latest
- pullPolicy: IfNotPresent
+pullPolicy: IfNotPresent
imagePullSecrets: []
nameOverride: ""
diff --git a/helm/policy/components/policy-pap/templates/deployment.yaml b/helm/policy/components/policy-pap/templates/deployment.yaml
index 6c82fb8b..09858de1 100755
--- a/helm/policy/components/policy-pap/templates/deployment.yaml
+++ b/helm/policy/components/policy-pap/templates/deployment.yaml
@@ -55,7 +55,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: nexus3.onap.org:10001/onap/oom/readiness:3.0.1
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.readiness }}
imagePullPolicy: {{ .Values.pullPolicy }}
name: {{ .Chart.Name }}-readiness
- command:
@@ -121,7 +121,7 @@ spec:
name: {{ .Chart.Name }}-update-config
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.pap }}
imagePullPolicy: {{ .Values.pullPolicy }}
command: ["/opt/app/policy/pap/bin/policy-pap.sh"]
args: ["/opt/app/policy/pap/etc/mounted/papParameters.yaml"]
diff --git a/helm/policy/components/policy-pap/values.yaml b/helm/policy/components/policy-pap/values.yaml
index 85f08c0b..be4a4a19 100755
--- a/helm/policy/components/policy-pap/values.yaml
+++ b/helm/policy/components/policy-pap/values.yaml
@@ -28,7 +28,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-pap:2.8-SNAPSHOT-latest
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/helm/policy/components/policy-xacml-pdp/templates/deployment.yaml b/helm/policy/components/policy-xacml-pdp/templates/deployment.yaml
index ec820640..bad2a1f9 100755
--- a/helm/policy/components/policy-xacml-pdp/templates/deployment.yaml
+++ b/helm/policy/components/policy-xacml-pdp/templates/deployment.yaml
@@ -51,7 +51,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: nexus3.onap.org:10001/onap/oom/readiness:3.0.1
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.readiness }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ .Chart.Name }}-readiness
- command:
@@ -100,7 +100,7 @@ spec:
name: {{ .Chart.Name }}-update-config
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.xacml }}
imagePullPolicy: {{ .Values.pullPolicy }}
command: ["/opt/app/policy/pdpx/bin/policy-pdpx.sh"]
args: ["/opt/app/policy/pdpx/etc/mounted/config.json"]
diff --git a/helm/policy/components/policy-xacml-pdp/values.yaml b/helm/policy/components/policy-xacml-pdp/values.yaml
index f7bb045e..5bf9d09f 100644
--- a/helm/policy/components/policy-xacml-pdp/values.yaml
+++ b/helm/policy/components/policy-xacml-pdp/values.yaml
@@ -51,7 +51,6 @@ secrets:
# Application configuration defaults.
#################################################################
# application image
-image: nexus3.onap.org:10001/onap/policy-xacml-pdp:2.8-SNAPSHOT-latest
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/helm/policy/templates/job.yaml b/helm/policy/templates/job.yaml
index beca1288..eee143b5 100755
--- a/helm/policy/templates/job.yaml
+++ b/helm/policy/templates/job.yaml
@@ -33,7 +33,7 @@ spec:
- name: "default-docker-registry-key"
initContainers:
- name: policy-mariadb-readiness
- image: {{ .Values.repository }}/{{ .Values.readiness.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.readiness }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@ -47,7 +47,7 @@ spec:
fieldPath: metadata.namespace
containers:
- name: policy-galera-config
- image: {{ .Values.dockerRepository }}/{{ .Values.mariadb.image }}
+ image: {{ .Values.global.dockerRepository }}/{{ .Values.mariadb.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /dbcmd-config/db.sh
@@ -113,7 +113,7 @@ spec:
- name: "default-docker-registry-key"
initContainers:
- name: policy-init-readiness
- image: {{ .Values.repository }}/{{ .Values.readiness.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.global.image.readiness }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@ -128,7 +128,7 @@ spec:
fieldPath: metadata.namespace
containers:
- name: policy-galera-db-migrator
- image: {{ .Values.repository }}/{{ .Values.dbmigrator.image }}
+ image: {{ .Values.global.repository }}/{{ .Values.dbmigrator.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /dbcmd-config/db_migrator_policy_init.sh
diff --git a/helm/policy/values.yaml b/helm/policy/values.yaml
index 322b1e9f..547344a3 100755
--- a/helm/policy/values.yaml
+++ b/helm/policy/values.yaml
@@ -30,6 +30,26 @@ global:
kafkaBootstrap: strimzi-kafka-bootstrap
policyKafkaUser: policy-kafka-user
+ repository: nexus3.onap.org:10001
+ pullPolicy: Always
+ dockerRepository: docker.io
+
+ image:
+ readiness: onap/oom/readiness:3.0.1
+ mariadb: bitnami/mariadb-galera:10.5.8
+ api: onap/policy-api:$tag
+ pap: onap/policy-pap:$tag
+ apex: onap/policy-apex-pdp:$tag
+ simulator: onap/policy-models-simulator:$tag
+ pdpdcl: onap/policy-pdpd-cl:$tag
+ xacml: onap/policy-xacml-pdp:$tag
+ distribution: onap/policy-distribution:$tag
+ runtimeacm: onap/policy-clamp-runtime-acm:$tag
+ kserveparticipant: onap/policy-clamp-ac-kserve-ppnt:$tag
+ k8sparticipant: onap/policy-clamp-ac-k8s-ppnt:$tag
+ pfparticipant: onap/policy-clamp-ac-pf-ppnt:$tag
+ httpparticipant: onap/policy-clamp-ac-http-ppnt:$tag
+ a1pmsparticipant: onap/policy-clamp-ac-a1pms-ppnt:$tag
policy-mariadb-galera:
enabled: true
@@ -64,10 +84,6 @@ policy-clamp-ac-a1pms-ppnt:
# DB configuration defaults.
#################################################################
-repository: nexus3.onap.org:10001
-pullPolicy: Always
-
-dockerRepository: docker.io
mariadb:
image: mariadb:10.5.8
@@ -90,46 +106,6 @@ nodeSelector: {}
affinity: {}
-# probe configuration parameters
-liveness:
- initialDelaySeconds: 10
- periodSeconds: 10
- # necessary to disable liveness probe when setting breakpoints
- # in debugger so K8s doesn't restart unresponsive container
- enabled: true
-
-readiness:
- image: onap/oom/readiness:3.0.1
- initialDelaySeconds: 10
- periodSeconds: 10
-
-
-config:
- policyAppUserName: runtimeUser
- useStrimziKafka: true
- acRuntimeTopic:
- name: policy-acruntime-participant
- partitions: 10
- retentionMs: 7200000
- segmentBytes: 1073741824
- consumer:
- groupId: policy-group
- policyHeartbeatTopic:
- name: policy-heartbeat
- partitions: 10
- retentionMs: 7200000
- segmentBytes: 1073741824
- consumer:
- groupId: policy-group
- policyNotificationTopic:
- name: policy-notification
- partitions: 10
- retentionMs: 7200000
- segmentBytes: 1073741824
- consumer:
- groupId: policy-group
- someConfig: blah
-
mariadb-galera:
# mariadb-galera.config and global.mariadb.config must be equals
db:
@@ -146,12 +122,6 @@ mariadb-galera:
serviceAccount:
nameOverride: *mariadb-galera
-restServer:
- policyPapUserName: policyadmin
- policyPapUserPassword: zb!XztG34
- policyApiUserName: policyadmin
- policyApiUserPassword: zb!XztG34
-
# Resource Limit flavor -By Default using small
# Segregation for Different environment (small, large, or unlimited)
flavor: small
diff --git a/helm/robot/templates/test-job.yaml b/helm/robot/templates/test-job.yaml
index ed1669a9..1cdc53eb 100644
--- a/helm/robot/templates/test-job.yaml
+++ b/helm/robot/templates/test-job.yaml
@@ -35,6 +35,8 @@ spec:
- --container-name
- {{ $container}}
{{- end }}
+ - --timeout
+ - "15"
env:
- name: NAMESPACE
valueFrom:
@@ -52,7 +54,7 @@ spec:
volumeMounts:
- name: robot-csit-pv
mountPath: /tmp
- restartPolicy: Never
+ restartPolicy: OnFailure
volumes:
- name: robot-csit-pv
hostPath: