diff options
author | Alexis de Talhouƫt <alexis.de_talhouet@bell.ca> | 2017-12-20 15:42:18 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-12-20 15:42:18 +0000 |
commit | 4aac3524f6c009a7f77f4abbe92c9b2fed9ccf81 (patch) | |
tree | 05c435759b78dcb4106508a5d3d35e687f40755d /kubernetes/policy | |
parent | dc57f9c7ffb19d4d7c9bbfbf052209d659f593b4 (diff) | |
parent | fdc32949ecb3297ae110d233b797c2653eb4881e (diff) |
Merge "Fix policy" into amsterdam
Diffstat (limited to 'kubernetes/policy')
-rw-r--r-- | kubernetes/policy/templates/all-services.yaml | 3 | ||||
-rw-r--r-- | kubernetes/policy/templates/dep-brmsgw.yaml | 8 | ||||
-rw-r--r-- | kubernetes/policy/templates/dep-drools.yaml | 15 | ||||
-rw-r--r-- | kubernetes/policy/templates/dep-nexus.yaml | 26 | ||||
-rw-r--r-- | kubernetes/policy/templates/dep-pap.yaml | 5 | ||||
-rw-r--r-- | kubernetes/policy/templates/dep-pdp.yaml | 4 |
6 files changed, 10 insertions, 51 deletions
diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml index a1c480458d..5c5f683e88 100644 --- a/kubernetes/policy/templates/all-services.yaml +++ b/kubernetes/policy/templates/all-services.yaml @@ -45,6 +45,9 @@ spec: - name: "drools-port" port: 6969 nodePort: {{ .Values.nodePortPrefix }}17 + - name: "drools-port2" + port: 9696 + nodePort: {{ .Values.nodePortPrefix }}21 selector: app: drools type: NodePort diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml index df5d888165..0e0ef17c93 100644 --- a/kubernetes/policy/templates/dep-brmsgw.yaml +++ b/kubernetes/policy/templates/dep-brmsgw.yaml @@ -19,13 +19,7 @@ spec: { "args": [ "--container-name", - "mariadb", - "--container-name", - "nexus", - "--container-name", - "pap", - "--container-name", - "pdp" + "pap" ], "command": [ "/root/ready.py" diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml index 3e9fa014fb..fe52f25708 100644 --- a/kubernetes/policy/templates/dep-drools.yaml +++ b/kubernetes/policy/templates/dep-drools.yaml @@ -21,13 +21,7 @@ spec: "--container-name", "mariadb", "--container-name", - "nexus", - "--container-name", - "pap", - "--container-name", - "pdp", - "--container-name", - "brmsgw" + "nexus" ], "command": [ "/root/ready.py" @@ -50,15 +44,12 @@ spec: ]' spec: containers: - - command: - - /bin/bash - - -c - - ./do-start.sh - image: "{{ .Values.image.policyDrools }}:{{ .Values.image.policyDroolsVersion }}" + - image: "{{ .Values.image.policyDrools }}:{{ .Values.image.policyDroolsVersion }}" imagePullPolicy: {{ .Values.pullPolicy }} name: drools ports: - containerPort: 6969 + - containerPort: 9696 readinessProbe: tcpSocket: port: 6969 diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml index 07cd334879..2cc20390fe 100644 --- a/kubernetes/policy/templates/dep-nexus.yaml +++ b/kubernetes/policy/templates/dep-nexus.yaml @@ -13,32 +13,6 @@ spec: labels: app: nexus name: nexus - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "mariadb" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "nexus-readiness" - } - ]' spec: containers: - image: "{{ .Values.image.policyNexus }}:{{ .Values.image.policyNexusVersion }}" diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml index 0816aa5291..838396f975 100644 --- a/kubernetes/policy/templates/dep-pap.yaml +++ b/kubernetes/policy/templates/dep-pap.yaml @@ -18,8 +18,6 @@ spec: { "args": [ "--container-name", - "nexus", - "--container-name", "mariadb" ], "command": [ @@ -73,6 +71,9 @@ spec: image: "{{ .Values.image.policyPe }}:{{ .Values.image.policyPeVersion }}" imagePullPolicy: {{ .Values.pullPolicy }} name: pap + env: + - name: PRELOAD_POLICIES + value: "true" ports: - containerPort: 8443 - containerPort: 9091 diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml index 6cc442b417..1fda0b6d1a 100644 --- a/kubernetes/policy/templates/dep-pdp.yaml +++ b/kubernetes/policy/templates/dep-pdp.yaml @@ -19,10 +19,6 @@ spec: { "args": [ "--container-name", - "mariadb", - "--container-name", - "nexus", - "--container-name", "pap" ], "command": [ |