From c75eacbe1c686e635673fc2280003518303e43ac Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Fri, 24 Apr 2020 14:29:17 +0100
Subject: [DMAAP] Moving DMaaP post-install jobs to 1 BC job

Change-Id: I11fe412600d1061e5667a5531d36cecbecdd34e3
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: OOM-2369
---
 .../dmaap-dr-prov/resources/feeds/README           |  3 -
 .../dmaap-dr-prov/templates/post-install-job.yaml  | 79 ----------------------
 .../dmaap/components/dmaap-dr-prov/values.yaml     |  1 -
 3 files changed, 83 deletions(-)
 delete mode 100644 kubernetes/dmaap/components/dmaap-dr-prov/resources/feeds/README
 delete mode 100644 kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml

(limited to 'kubernetes/dmaap/components/dmaap-dr-prov')

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/feeds/README b/kubernetes/dmaap/components/dmaap-dr-prov/resources/feeds/README
deleted file mode 100644
index 4f5eac5ba1..0000000000
--- a/kubernetes/dmaap/components/dmaap-dr-prov/resources/feeds/README
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Intent of this directory is for it to contain a file for each feed that needs to be provisioned in DR.
-# So, app teams can add files to this directory as needed without impacting each other's code.
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
deleted file mode 100644
index f8ce02835a..0000000000
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "common.fullname" . }}-post-install
-  labels:
-    app.kubernetes.io/managed-by: {{.Release.Service | quote }}
-    app.kubernetes.io/instance: {{include "common.release" . | quote }}
-    helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
-    release: {{ include "common.release" . }}
-  annotations:
-    # This is what defines this resource as a hook. Without this line, the
-    # job is considered part of the release.
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "-3"
-    "helm.sh/hook-delete-policy": hook-succeeded
-spec:
-  template:
-    metadata:
-      name: {{ include "common.fullname" . }}
-      labels:
-        app.kubernetes.io/managed-by: {{.Release.Service | quote }}
-        app.kubernetes.io/instance: {{include "common.release" . | quote }}
-        helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
-        release: {{ include "common.release" . }}
-    spec:
-      restartPolicy: Never
-      containers:
-      - name: post-install-job
-        image: "{{ include "common.repository" . }}/{{ .Values.global.clientImage }}"
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        env:
-        - name: DELAY
-          value: "30"
-    {{- if .Values.global.allow_http }}
-        - name: PROTO
-          value: "http"
-        - name: PORT
-          value: "8080"
-    {{ end }}
-        - name: REQUESTID
-          value: "{{.Chart.Name}}-post-install"
-        volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
-# NOTE: on the following several configMaps, careful to include / at end
-#       since there may be more than one file in each mountPath
-# NOTE: the basename of the subdirectory is important - it matches the DBCL API URI
-        - name: {{ include "common.fullname" . }}-dbc-feeds
-          mountPath: /opt/app/config/feeds/
-        - name: {{ include "common.fullname" . }}-dbc-drpubs
-          mountPath: /opt/app/config/dr_pubs/
-        - name: {{ include "common.fullname" . }}-dbc-drsubs
-          mountPath: /opt/app/config/dr_subs/
-        resources:
-{{ include "common.resources" . | indent 10 }}
-        {{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-        {{- end -}}
-        {{- if .Values.affinity }}
-      affinity:
-{{ toYaml .Values.affinity | indent 8 }}
-        {{- end }}
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: {{ include "common.fullname" . }}-dbc-feeds
-          configMap:
-            name: {{ include "common.fullname" . }}-dbc-feeds
-        - name: {{ include "common.fullname" . }}-dbc-drpubs
-          configMap:
-            name: {{ include "common.fullname" . }}-dbc-drpubs
-        - name: {{ include "common.fullname" . }}-dbc-drsubs
-          configMap:
-            name: {{ include "common.fullname" . }}-dbc-drsubs
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index 196be0dabe..3fb90f0533 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -120,7 +120,6 @@ mariadb:
   persistence:
     size: 1Gi
     mountSubPath: data-router/dr-db-data
-  disableNfsProvisioner: true
 
 #AAF local config
 aafConfig:
-- 
cgit 1.2.3-korg