diff options
Diffstat (limited to 'kubernetes/policy/templates')
| -rw-r--r-- | kubernetes/policy/templates/all-services.yaml | 17 | ||||
| -rw-r--r-- | kubernetes/policy/templates/dep-brmsgw.yaml | 19 | ||||
| -rw-r--r-- | kubernetes/policy/templates/dep-drools.yaml | 76 | ||||
| -rw-r--r-- | kubernetes/policy/templates/dep-maria.yaml | 13 | ||||
| -rw-r--r-- | kubernetes/policy/templates/dep-nexus.yaml | 7 | ||||
| -rw-r--r-- | kubernetes/policy/templates/dep-pap.yaml | 32 | ||||
| -rw-r--r-- | kubernetes/policy/templates/dep-pdp.yaml | 27 | ||||
| -rw-r--r-- | kubernetes/policy/templates/policy-deployment-configmap.yaml | 27 | ||||
| -rw-r--r-- | kubernetes/policy/templates/policy-deployment-secret.yaml | 10 | ||||
| -rw-r--r-- | kubernetes/policy/templates/policy-log-configmap.yaml | 45 | ||||
| -rw-r--r-- | kubernetes/policy/templates/policy-pv-pvc.yaml | 32 |
11 files changed, 195 insertions, 110 deletions
diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml index a1c480458d..3971b29b73 100644 --- a/kubernetes/policy/templates/all-services.yaml +++ b/kubernetes/policy/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: mariadb - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" labels: app: mariadb spec: @@ -22,7 +22,7 @@ metadata: labels: app: nexus name: nexus - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: nexus-port @@ -39,12 +39,15 @@ metadata: labels: app: drools name: drools - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: "drools-port" port: 6969 nodePort: {{ .Values.nodePortPrefix }}17 + - name: "drools-port2" + port: 9696 + nodePort: {{ .Values.nodePortPrefix }}21 selector: app: drools type: NodePort @@ -55,7 +58,7 @@ apiVersion: v1 kind: Service metadata: name: pap - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" labels: app: pap spec: @@ -76,7 +79,7 @@ apiVersion: v1 kind: Service metadata: name: pdp - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" labels: app: pdp annotations: @@ -114,7 +117,7 @@ apiVersion: v1 kind: Service metadata: name: brmsgw - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" labels: app: brmsgw spec: @@ -125,4 +128,4 @@ spec: selector: app: brmsgw type: NodePort -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml index 7a1bcdec49..25bf0c678b 100644 --- a/kubernetes/policy/templates/dep-brmsgw.yaml +++ b/kubernetes/policy/templates/dep-brmsgw.yaml @@ -2,10 +2,10 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: brmsgw - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-brmsgw + namespace: "{{ .Values.nsPrefix }}" spec: - replicas: 1 + replicas: {{ .Values.brmsgwReplicas }} selector: matchLabels: app: brmsgw @@ -13,20 +13,14 @@ spec: metadata: labels: app: brmsgw - name: brmsgw + name: policy-brmsgw spec: initContainers: - command: - /root/ready.py args: - --container-name - - mariadb - - --container-name - - nexus - - --container-name - pap - - --container-name - - pdp env: - name: NAMESPACE valueFrom: @@ -55,8 +49,9 @@ spec: hostPath: path: /etc/localtime - name: pe - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ + configMap: + name: policy-dep-pe-configmap + defaultMode: 0755 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml index 48ef16e3b2..ef9636ceef 100644 --- a/kubernetes/policy/templates/dep-drools.yaml +++ b/kubernetes/policy/templates/dep-drools.yaml @@ -2,10 +2,10 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: drools - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-drools + namespace: "{{ .Values.nsPrefix }}" spec: - replicas: 1 + replicas: {{ .Values.droolsReplicas }} selector: matchLabels: app: drools @@ -13,7 +13,7 @@ spec: metadata: labels: app: drools - name: drools + name: policy-drools spec: initContainers: - command: @@ -23,12 +23,6 @@ spec: - mariadb - --container-name - nexus - - --container-name - - pap - - --container-name - - pdp - - --container-name - - brmsgw env: - name: NAMESPACE valueFrom: @@ -38,6 +32,10 @@ spec: image: "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}" imagePullPolicy: {{ .Values.pullPolicy }} name: drools-readiness + hostAliases: + - ip: "{{ .Values.aaiServiceClusterIp }}" + hostnames: + - "aai.api.simpledemo.openecomp.org" containers: - command: - /bin/bash @@ -57,14 +55,29 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: /tmp/policy-install/config - name: drools + - mountPath: /tmp/policy-install/config/policy-keystore + name: drools-secret + subPath: policy-keystore + - mountPath: /tmp/policy-install/config/feature-healthcheck.conf + name: drools-secret + subPath: feature-healthcheck.conf + - mountPath: /tmp/policy-install/config/base.conf + name: drools-config + subPath: base.conf + - mountPath: /tmp/policy-install/config/policy-management.conf + name: drools-config + subPath: policy-management.conf + - mountPath: /tmp/policy-install/config/drools-tweaks.sh + name: drools-config + subPath: drools-tweaks.sh - mountPath: /usr/share/maven/conf/settings.xml name: drools-settingsxml + subPath: settings.xml - mountPath: /var/log/onap name: policy-logs - mountPath: /tmp/logback.xml name: policy-logback + subPath: logback.xml lifecycle: postStart: exec: @@ -75,6 +88,7 @@ spec: volumeMounts: - mountPath: /usr/share/filebeat/filebeat.yml name: filebeat-conf + subPath: filebeat.yml - mountPath: /var/log/onap name: policy-logs - mountPath: /usr/share/filebeat/data @@ -84,21 +98,41 @@ spec: hostPath: path: /etc/localtime - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + configMap: + name: policy-filebeat-configmap - name: policy-logs emptyDir: {} - name: policy-data-filebeat emptyDir: {} - name: policy-logback - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/drools/logback.xml + configMap: + name: policy-drools-log-configmap - name: drools-settingsxml - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/drools/settings.xml - - name: drools - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/drools/ + configMap: + name: policy-dep-drools-settings-configmap + - name: drools-config + configMap: + name: policy-dep-drools-configmap + items: + - key: base.conf + path: base.conf + mode: 0755 + - key: policy-management.conf + path: policy-management.conf + mode: 0755 + - key: drools-tweaks.sh + path: drools-tweaks.sh + mode: 0755 + - name: drools-secret + secret: + secretName: policy-dep-drools-secret + items: + - key: policy-keystore + path: policy-keystore + mode: 0644 + - key: feature-healthcheck.conf + path: feature-healthcheck.conf + mode: 0644 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/policy/templates/dep-maria.yaml b/kubernetes/policy/templates/dep-maria.yaml index c0f5060884..9ac17daa88 100644 --- a/kubernetes/policy/templates/dep-maria.yaml +++ b/kubernetes/policy/templates/dep-maria.yaml @@ -2,9 +2,10 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: mariadb - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-mariadb + namespace: "{{ .Values.nsPrefix }}" spec: + replicas: {{ .Values.mariadbReplicas }} selector: matchLabels: app: mariadb @@ -12,6 +13,7 @@ spec: metadata: labels: app: mariadb + name: policy-mariadb spec: hostname: mariadb containers: @@ -24,8 +26,6 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: /var/lib/mysql - name: policy-mariadb-data readinessProbe: tcpSocket: port: 3306 @@ -35,9 +35,6 @@ spec: - name: localtime hostPath: path: /etc/localtime - - name: policy-mariadb-data - persistentVolumeClaim: - claimName: policy-db imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml index 4adb05f630..c63e0af685 100644 --- a/kubernetes/policy/templates/dep-nexus.yaml +++ b/kubernetes/policy/templates/dep-nexus.yaml @@ -2,9 +2,10 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: nexus - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-nexus + namespace: "{{ .Values.nsPrefix }}" spec: + replicas: {{ .Values.nexusReplicas }} selector: matchLabels: app: nexus @@ -12,7 +13,7 @@ spec: metadata: labels: app: nexus - name: nexus + name: policy-nexus spec: initContainers: - command: diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml index 523cfd35ff..389fc6b3eb 100644 --- a/kubernetes/policy/templates/dep-pap.yaml +++ b/kubernetes/policy/templates/dep-pap.yaml @@ -2,9 +2,10 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: pap - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-pap + namespace: "{{ .Values.nsPrefix }}" spec: + replicas: {{ .Values.papReplicas }} selector: matchLabels: app: pap @@ -12,15 +13,13 @@ spec: metadata: labels: app: pap - name: pap + name: policy-pap spec: initContainers: - command: - /root/ready.py args: - --container-name - - nexus - - --container-name - mariadb env: - name: NAMESPACE @@ -52,6 +51,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 @@ -70,8 +72,10 @@ spec: name: policy-logs - mountPath: /tmp/policy-install/logback.xml name: policy-sdk-logback + subPath: logback.xml - mountPath: /tmp/logback.xml name: policy-logback + subPath: logback.xml lifecycle: postStart: exec: @@ -82,6 +86,7 @@ spec: volumeMounts: - mountPath: /usr/share/filebeat/filebeat.yml name: filebeat-conf + subPath: filebeat.yml - mountPath: /var/log/onap name: policy-logs - mountPath: /usr/share/filebeat/data @@ -91,21 +96,22 @@ spec: hostPath: path: /etc/localtime - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + configMap: + name: policy-filebeat-configmap - name: policy-logs emptyDir: {} - name: policy-data-filebeat emptyDir: {} - name: policy-logback - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/xacml-pap-rest/logback.xml + configMap: + name: policy-pap-log-configmap - name: policy-sdk-logback - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/ep_sdk_app/logback.xml + configMap: + name: policy-sdk-log-configmap - name: pe - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ + configMap: + name: policy-dep-pe-configmap + defaultMode: 0755 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml index 3763b95bb2..6740f1d422 100644 --- a/kubernetes/policy/templates/dep-pdp.yaml +++ b/kubernetes/policy/templates/dep-pdp.yaml @@ -2,10 +2,10 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: pdp - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-pdp + namespace: "{{ .Values.nsPrefix }}" spec: - replicas: 1 + replicas: {{ .Values.pdpReplicas }} selector: matchLabels: app: pdp @@ -13,17 +13,13 @@ spec: metadata: labels: app: pdp - name: pdp + name: policy-pdp spec: initContainers: - command: - /root/ready.py args: - --container-name - - mariadb - - --container-name - - nexus - - --container-name - pap env: - name: NAMESPACE @@ -59,6 +55,7 @@ spec: name: policy-logs - mountPath: /tmp/logback.xml name: policy-logback + subPath: logback.xml lifecycle: postStart: exec: @@ -69,6 +66,7 @@ spec: volumeMounts: - mountPath: /usr/share/filebeat/filebeat.yml name: filebeat-conf + subPath: filebeat.yml - mountPath: /var/log/onap name: policy-logs - mountPath: /usr/share/filebeat/data @@ -78,18 +76,19 @@ spec: hostPath: path: /etc/localtime - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + configMap: + name: policy-filebeat-configmap - name: policy-logs emptyDir: {} - name: policy-data-filebeat emptyDir: {} - name: policy-logback - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/xacml-pdp-rest/logback.xml + configMap: + name: policy-pdp-log-configmap - name: pe - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ + configMap: + name: policy-dep-pe-configmap + defaultMode: 0755 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/policy/templates/policy-deployment-configmap.yaml b/kubernetes/policy/templates/policy-deployment-configmap.yaml new file mode 100644 index 0000000000..d59ba617fa --- /dev/null +++ b/kubernetes/policy/templates/policy-deployment-configmap.yaml @@ -0,0 +1,27 @@ +#{{ if not .Values.disablePolicyDrools }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: policy-dep-drools-settings-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/drools/settings.xml").AsConfig . | indent 2 }} +#{{ end }} +--- +#{{ if not .Values.disablePolicyPdp }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: policy-dep-pe-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/opt/policy/config/pe/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: policy-dep-drools-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/opt/policy/config/drools/*").AsConfig . | indent 2 }} +#{{ end }} diff --git a/kubernetes/policy/templates/policy-deployment-secret.yaml b/kubernetes/policy/templates/policy-deployment-secret.yaml new file mode 100644 index 0000000000..6fe52ead4e --- /dev/null +++ b/kubernetes/policy/templates/policy-deployment-secret.yaml @@ -0,0 +1,10 @@ +#{{ if not .Values.disablePolicyDrools }} +apiVersion: v1 +kind: Secret +metadata: + name: policy-dep-drools-secret + namespace: {{ .Values.nsPrefix }} +type: Opaque +data: +{{ (.Files.Glob "resources/config/opt/policy/config/drools/keys/*").AsSecrets | indent 2 }} +#{{ end }} diff --git a/kubernetes/policy/templates/policy-log-configmap.yaml b/kubernetes/policy/templates/policy-log-configmap.yaml new file mode 100644 index 0000000000..b1a9e0999c --- /dev/null +++ b/kubernetes/policy/templates/policy-log-configmap.yaml @@ -0,0 +1,45 @@ +#{{ if not .Values.disablePolicyPap }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: policy-pap-log-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/log/xacml-pap-rest/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: policy-sdk-log-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/log/ep_sdk_app/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: policy-filebeat-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }} +#{{ end }} +#{{ if not .Values.disablePolicyPdp }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: policy-pdp-log-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/log/xacml-pdp-rest/*").AsConfig . | indent 2 }} +#{{ end }} +#{{ if not .Values.disablePolicyDrools }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: policy-drools-log-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/log/drools/*").AsConfig . | indent 2 }} +#{{ end }} diff --git a/kubernetes/policy/templates/policy-pv-pvc.yaml b/kubernetes/policy/templates/policy-pv-pvc.yaml deleted file mode 100644 index 5dc0c61c43..0000000000 --- a/kubernetes/policy/templates/policy-pv-pvc.yaml +++ /dev/null @@ -1,32 +0,0 @@ -#{{ if not .Values.disablePolicyMariadb }} -apiVersion: v1 -kind: PersistentVolume -metadata: - name: "{{ .Values.nsPrefix }}-policy-db" - namespace: "{{ .Values.nsPrefix }}-policy" - labels: - name: "{{ .Values.nsPrefix }}-policy-db" -spec: - capacity: - storage: 2Gi - accessModes: - - ReadWriteMany - persistentVolumeReclaimPolicy: Retain - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/mariadb/data/ ---- -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: policy-db - namespace: "{{ .Values.nsPrefix }}-policy" -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 2Gi - selector: - matchLabels: - name: "{{ .Values.nsPrefix }}-policy-db" -#{{ end }}
\ No newline at end of file |