summaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaegen2
diff options
context:
space:
mode:
authorJack Lucas <jflucas@research.att.com>2019-09-04 15:44:33 -0400
committerJack Lucas <jflucas@research.att.com>2019-09-05 10:08:35 -0400
commit128c0ad9e909288898ccb9da9af5cb9b9c1c958e (patch)
treef9d5c95c2c053fecb0c4892c960063607c92c8b2 /kubernetes/dcaegen2
parentbbc4c7bbbff54a22916e4a5e040c38a750cb19bb (diff)
Add DCAE cleanup job, update CBS version
Also fix CBS and policy handler filebeat loggging. Shorten names in CBS to remain < 64 with 10-char release name. Issue-ID: DCAEGEN2-1729 Issue-ID: DCAEGEN2-1317 Issue-ID: DCAEGEN2-1747 Issue-ID: DCAEGEN2-1749 Issue-ID: DCAEGEN2-1750 Signed-off-by: Jack Lucas <jflucas@research.att.com> Change-Id: I5a727e3c9502205bc727439ed70728238d59d74e
Diffstat (limited to 'kubernetes/dcaegen2')
-rw-r--r--kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/job.yaml42
-rw-r--r--kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml3
-rw-r--r--kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml36
-rw-r--r--kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-policy-handler/templates/deployment.yaml2
5 files changed, 61 insertions, 24 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/job.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/job.yaml
new file mode 100644
index 0000000000..bd0ea517f6
--- /dev/null
+++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/job.yaml
@@ -0,0 +1,42 @@
+#============LICENSE_START========================================================
+# ================================================================================
+# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+apiVersion: batch/v1
+kind: Job
+metadata:
+ name: {{ include "common.fullname" . }}-cleanup
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+ annotations:
+ "helm.sh/hook": pre-delete
+ "helm.sh/hook-delete-policy": hook-succeeded,hook-failed
+spec:
+ template:
+ metadata:
+ name: {{ include "common.fullname" . }}-cleanup
+ labels:
+ app: {{ include "common.name" . }}
+ release: {{ .Release.Name }}
+ spec:
+ restartPolicy: Never
+ containers:
+ - name: dcae-cleanup
+ image: {{ include "common.repository" . }}/{{ .Values.cleanupImage }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} \ No newline at end of file
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml
index 70504efd75..d8db056f96 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml
@@ -53,6 +53,9 @@ multisiteConfigMapName: multisite-kubeconfig-configmap
# image for init container to initialize shared ConfigMap
multisiteInitImage: onap/org.onap.dcaegen2.deployments.multisite-init-container:1.0.0
+# image for cleanup job container
+cleanupImage: onap/org.onap.dcaegen2.deployments.dcae-k8s-cleanup-container:1.0.0
+
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml
index 5496aee2cb..c3e63fb968 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml
@@ -104,25 +104,17 @@ spec:
value: "/opt/tls/cert.pem"
- name: HTTPS_KEY_PATH
value: "/opt/tls/key.pem"
- - name: TRUST_STORE_PATH
- value: "/opt/app/prh/etc/cert/trust.jks"
- - name: TRUST_STORE_PASS_PATH
- value: "/opt/app/prh/etc/cert/trust.pass"
- - name: KEY_STORE_PATH
- value: "/opt/app/prh/etc/cert/key.p12"
- - name: KEY_STORE_PASS_PATH
- value: "/opt/app/prh/etc/cert/key.pass"
- - name: {{ include "common.name" . }}-filebeat-onap
+ - name: {{ include "common.name" . }}-fb-onap
image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
+ - name: {{ include "common.fullname" . }}-fb-conf
mountPath: /usr/share/filebeat/filebeat.yml
subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-data-filebeat
+ - name: {{ include "common.fullname" . }}-data-fb
mountPath: /usr/share/filebeat/data
- name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
+ mountPath: /var/log/onap/config-binding-service
{{ end }}
{{- if .Values.service.insecure.enabled }}
- name: {{ include "common.name" . }}-insecure
@@ -149,29 +141,29 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
volumeMounts:
- - name: {{ include "common.fullname" . }}-logs-insecure
+ - name: {{ include "common.fullname" . }}-logs-i
mountPath: /opt/logs
env:
- name: CONSUL_HOST
value: consul.{{ include "common.namespace" . }}
- - name: {{ include "common.name" . }}-filebeat-onap-insecure
+ - name: {{ include "common.name" . }}-fb-onap-i
image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
+ - name: {{ include "common.fullname" . }}-fb-conf
mountPath: /usr/share/filebeat/filebeat.yml
subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-data-filebeat-insecure
+ - name: {{ include "common.fullname" . }}-data-fb-i
mountPath: /usr/share/filebeat/data
- - name: {{ include "common.fullname" . }}-logs-insecure
- mountPath: /var/log/onap
+ - name: {{ include "common.fullname" . }}-logs-i
+ mountPath: /var/log/onap/config-binding-service
{{ end }}
volumes:
- - name: {{ include "common.fullname" . }}-filebeat-conf
+ - name: {{ include "common.fullname" . }}-fb-conf
configMap:
name: {{ .Release.Name }}-cbs-filebeat-configmap
{{- if .Values.service.secure.enabled }}
- - name: {{ include "common.fullname" . }}-data-filebeat
+ - name: {{ include "common.fullname" . }}-data-fb
emptyDir: {}
- name: {{ include "common.fullname" . }}-logs
emptyDir: {}
@@ -179,9 +171,9 @@ spec:
emptyDir: {}
{{ end }}
{{- if .Values.service.insecure.enabled }}
- - name: {{ include "common.fullname" . }}-data-filebeat-insecure
+ - name: {{ include "common.fullname" . }}-data-fb-i
emptyDir: {}
- - name: {{ include "common.fullname" . }}-logs-insecure
+ - name: {{ include "common.fullname" . }}-logs-i
emptyDir: {}
{{ end }}
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml
index c7db0d5518..8cff544d93 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml
@@ -45,7 +45,7 @@ config:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.platform.configbinding:2.5.1
+image: onap/org.onap.dcaegen2.platform.configbinding:2.5.2
pullPolicy: Always
# probe configuration parameters
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-policy-handler/templates/deployment.yaml
index a6b87bf3eb..8c1c8741aa 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-policy-handler/templates/deployment.yaml
@@ -131,7 +131,7 @@ spec:
imagePullPolicy: IfNotPresent
resources: {}
volumeMounts:
- - mountPath: /var/log/onap/deployment-handler
+ - mountPath: /var/log/onap/policy-handler
name: component-log
- mountPath: /usr/share/filebeat/data
name: filebeat-data