[DCAEGEN2] Remove Consul loader init container

DCAE microservices no longer rely on Consul to
store their configuration information.  This change
modifies the common DCAE microservice deployment
template to eliminate the initContainer that
loads configuration information into Consul.

Issue-ID: DCAEGEN2-3059
Signed-off-by: Jack Lucas <jflos@sonoris.net>
Change-Id: I4d9d547de020fe1987afab1c99cd033799ed7b36

2 files changed, 1 insertions, 83 deletions

diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
index ef846034d0..5a45fa1004 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
@@ -180,14 +180,7 @@ The sidecar is included if .Values.log.path is set.  The
 logging sidecar and the DCAE microservice container share a
 volume where the microservice logs are written.
 
-The Deployment includes an initContainer that pushes the
-microservice's initial configuration (from .Values.applicationConfig)
-into Consul.  All DCAE microservices retrieve their initial
-configurations by making an API call to a DCAE platform component called
-the  config-binding-service.  The config-binding-service currently
-retrieves configuration information from Consul.
-
-The Deployment also includes an initContainer that checks for the
+The Deployment includes an initContainer that checks for the
 readiness of other components that the microservice relies on.
 This container is generated by the "common.readinessCheck.waitfor"
 template.
@@ -269,19 +262,6 @@ spec:
       {{- end }}
       {{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
       {{- include "common.dmaap.provisioning.initContainer" . | nindent 6 }}
-      - name: init-consul
-        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.consulLoaderImage }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        args:
-        - --key-yaml
-        - "{{ include "common.name" . }}|/app-config/application_config.yaml"
-        env:
-        - name: CONSUL_HOST
-          value: {{ .Values.consulHost | default "consul-server-ui" }}.{{ include "common.namespace" . }}
-        resources: {{ include "common.resources" . | nindent 2 }}
-        volumeMounts:
-          - mountPath: /app-config
-            name: app-config
       {{- if $certDir }}
       - name: init-tls
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.tlsImage }}
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_job.tpl b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_job.tpl
deleted file mode 100644
index f3c09161cc..0000000000
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_job.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{{/*
-#============LICENSE_START========================================================
-# ================================================================================
-# Copyright (c) 2021 J. F. Lucas. 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=========================================================
-*/}}
-{{/*
-dcaegen2-services-common.consulDeleteJob:
-This template generates a Kubernetes Job that runs when a
-DCAE microservice is deleted.  The Job deletes the Consul
-entry that contains the microservice's configuration.
-
-The template expects the full chart context as input.  A chart for a
-DCAE microservice references this template using:
-{{ include "dcaegen2-services-common.consulDeleteJob" . }}
-The template directly references data in .Values, and indirectly (through its
-use of templates from the ONAP "common" collection) references data in
-.Release.
-
-The microservice configuration data is loaded into Consul by an
-initContainer that is part of the Kubernetes Deployment for the microservice.
-See the documentation for dcaegen2-services-common.microserviceDeployment
-for more information.
-*/}}
-{{- define "dcaegen2-services-common.consulDeleteJob" -}}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "common.fullname" . }}-delete-config
-  namespace: {{ include "common.namespace" . }}
-  labels: {{ include "common.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeeded,hook-failed
-spec:
-  template:
-    metadata:
-      name: {{ include "common.fullname" . }}-delete-config
-      labels: {{ include "common.labels" . | nindent 8 }}
-    spec:
-      restartPolicy: Never
-      containers:
-      - name: dcae-config-delete
-        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.consulLoaderImage }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        command:
-        - /opt/app/delete_key.sh
-        args:
-        - {{ include "common.name" . }}
-{{ end -}}