summaryrefslogtreecommitdiffstats
path: root/kubernetes/policy
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/policy')
-rw-r--r--kubernetes/policy/templates/all-services.yaml16
-rw-r--r--kubernetes/policy/templates/dep-brmsgw.yaml6
-rw-r--r--kubernetes/policy/templates/dep-drools.yaml6
-rw-r--r--kubernetes/policy/templates/dep-maria.yaml13
-rw-r--r--kubernetes/policy/templates/dep-nexus.yaml14
-rw-r--r--kubernetes/policy/templates/dep-pap.yaml6
-rw-r--r--kubernetes/policy/templates/dep-pdp.yaml6
-rw-r--r--kubernetes/policy/templates/policy-pv-pvc.yaml6
-rw-r--r--kubernetes/policy/values.yaml8
9 files changed, 47 insertions, 34 deletions
diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
index cd01b54ee8..0d9a68ac25 100644
--- a/kubernetes/policy/templates/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -102,22 +102,6 @@ spec:
apiVersion: v1
kind: Service
metadata:
- name: pypdp
- namespace: "{{ .Values.nsPrefix }}-policy"
- labels:
- app: pypdp
-spec:
- ports:
- - name: tcp-31032-8480-bm91k
- port: 8480
- nodePort: {{ .Values.nodePortPrefix }}21
- selector:
- app: pypdp
- type: NodePort
----
-apiVersion: v1
-kind: Service
-metadata:
name: brmsgw
namespace: "{{ .Values.nsPrefix }}-policy"
labels:
diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml
index 17e4896e79..e47b0403ca 100644
--- a/kubernetes/policy/templates/dep-brmsgw.yaml
+++ b/kubernetes/policy/templates/dep-brmsgw.yaml
@@ -55,9 +55,15 @@ spec:
imagePullPolicy: {{ .Values.pullPolicy }}
name: brmsgw
volumeMounts:
+ - mountPath: /etc/localtime
+ name: localtime
+ readOnly: true
- mountPath: /tmp/policy-install/config
name: pe
volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
- name: pe
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml
index 75055c10d8..9c3fc29d99 100644
--- a/kubernetes/policy/templates/dep-drools.yaml
+++ b/kubernetes/policy/templates/dep-drools.yaml
@@ -64,11 +64,17 @@ spec:
initialDelaySeconds: 5
periodSeconds: 10
volumeMounts:
+ - mountPath: /etc/localtime
+ name: localtime
+ readOnly: true
- mountPath: /tmp/policy-install/config
name: drools
- mountPath: /usr/share/maven/conf/settings.xml
name: drools-settingsxml
volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
- name: drools-settingsxml
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/drools/settings.xml
diff --git a/kubernetes/policy/templates/dep-maria.yaml b/kubernetes/policy/templates/dep-maria.yaml
index 30d0db3af5..e3c93d7fe6 100644
--- a/kubernetes/policy/templates/dep-maria.yaml
+++ b/kubernetes/policy/templates/dep-maria.yaml
@@ -4,7 +4,6 @@ metadata:
name: mariadb
namespace: "{{ .Values.nsPrefix }}-policy"
spec:
- replicas: 1
selector:
matchLabels:
app: mariadb
@@ -15,16 +14,15 @@ spec:
spec:
hostname: mariadb
containers:
- - command:
- - /bin/bash
- - -c
- - exec bash /tmp/do-start.sh
- image: "{{ .Values.image.policyDb }}:{{ .Values.image.policyDbVersion }}"
+ - image: "{{ .Values.image.policyDb }}:{{ .Values.image.policyDbVersion }}"
imagePullPolicy: {{ .Values.pullPolicy }}
name: mariadb
ports:
- containerPort: 3306
volumeMounts:
+ - mountPath: /etc/localtime
+ name: localtime
+ readOnly: true
- mountPath: /var/lib/mysql
name: policy-mariadb-data
readinessProbe:
@@ -33,6 +31,9 @@ spec:
initialDelaySeconds: 5
periodSeconds: 10
volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
- name: policy-mariadb-data
persistentVolumeClaim:
claimName: policy-db
diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml
index de067b162f..15b7ec38fd 100644
--- a/kubernetes/policy/templates/dep-nexus.yaml
+++ b/kubernetes/policy/templates/dep-nexus.yaml
@@ -40,12 +40,16 @@ spec:
]'
spec:
containers:
- - command:
- - /bin/bash
- - -c
- - bash -c "/opt/nexus/nexus-2.14.2-01/bin/nexus start && sleep 1000d"
- image: "{{ .Values.image.policyNexus }}:{{ .Values.image.policyNexusVersion }}"
+ - image: "{{ .Values.image.policyNexus }}:{{ .Values.image.policyNexusVersion }}"
imagePullPolicy: {{ .Values.pullPolicy }}
name: nexus
+ volumeMounts:
+ - name: localtime
+ mountPath: /etc/localtime
+ readOnly: true
+ volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml
index fcb590bdb2..794c6548b8 100644
--- a/kubernetes/policy/templates/dep-pap.yaml
+++ b/kubernetes/policy/templates/dep-pap.yaml
@@ -81,9 +81,15 @@ spec:
initialDelaySeconds: 5
periodSeconds: 10
volumeMounts:
+ - mountPath: /etc/localtime
+ name: localtime
+ readOnly: true
- mountPath: /tmp/policy-install/config/
name: pe
volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
- name: pe
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml
index c8a4f7108a..d7d697d71d 100644
--- a/kubernetes/policy/templates/dep-pdp.yaml
+++ b/kubernetes/policy/templates/dep-pdp.yaml
@@ -60,9 +60,15 @@ spec:
initialDelaySeconds: 5
periodSeconds: 10
volumeMounts:
+ - mountPath: /etc/localtime
+ name: localtime
+ readOnly: true
- mountPath: /tmp/policy-install/config
name: pe
volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
- name: pe
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
diff --git a/kubernetes/policy/templates/policy-pv-pvc.yaml b/kubernetes/policy/templates/policy-pv-pvc.yaml
index dda9820c06..71cf3d8a48 100644
--- a/kubernetes/policy/templates/policy-pv-pvc.yaml
+++ b/kubernetes/policy/templates/policy-pv-pvc.yaml
@@ -1,10 +1,10 @@
apiVersion: v1
kind: PersistentVolume
metadata:
- name: policy-db
+ name: "{{ .Values.nsPrefix }}-policy-db"
namespace: "{{ .Values.nsPrefix }}-policy"
labels:
- name: policy-db
+ name: "{{ .Values.nsPrefix }}-policy-db"
spec:
capacity:
storage: 2Gi
@@ -27,4 +27,4 @@ spec:
storage: 2Gi
selector:
matchLabels:
- name: policy-db
+ name: "{{ .Values.nsPrefix }}-policy-db"
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 1b2ed0f880..62e91f88f5 100644
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -4,12 +4,12 @@ nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check
readinessVersion: 1.0.0
- policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe
+ policyPe: nexus3.onap.org:10001/onap/policy/policy-pe
policyPeVersion: 1.1-STAGING-latest
- policyDrools: nexus3.onap.org:10001/openecomp/policy/policy-drools
+ policyDrools: nexus3.onap.org:10001/onap/policy/policy-drools
policyDroolsVersion: 1.1-STAGING-latest
- policyDb: nexus3.onap.org:10001/openecomp/policy/policy-db
+ policyDb: nexus3.onap.org:10001/onap/policy/policy-db
policyDbVersion: 1.1-STAGING-latest
- policyNexus: nexus3.onap.org:10001/openecomp/policy/policy-nexus
+ policyNexus: nexus3.onap.org:10001/onap/policy/policy-nexus
policyNexusVersion: 1.1-STAGING-latest
ubuntu: ubuntu:16.04