Merge "Attempt 2 at chart restructure"

3 files changed, 197 insertions, 0 deletions

diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/configmap.yaml
new file mode 100644
index 0000000000..21134ada9f
--- /dev/null
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/configmap.yaml
@@ -0,0 +1,41 @@
+#============LICENSE_START========================================================
+# ================================================================================
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2018 Amdocs, Bell Canada
+# ================================================================================
+# 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: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-dcae-config
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-dcae-inputs
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/inputs/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-dcae-cacert
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/certs/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml
new file mode 100644
index 0000000000..be5a769a37
--- /dev/null
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml
@@ -0,0 +1,125 @@
+#============LICENSE_START========================================================

+# ================================================================================

+# Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.

+# Modifications Copyright © 2018 Amdocs, Bell Canada

+# ================================================================================

+# 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: extensions/v1beta1

+kind: Deployment

+metadata:

+  name: {{ include "common.fullname" . }}

+  namespace: {{ include "common.namespace" . }}

+  labels:

+    app: {{ include "common.name" . }}

+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

+    release: {{ .Release.Name }}

+    heritage: {{ .Release.Service }}

+spec:

+  replicas: 1

+  template:

+    metadata:

+      labels:

+        app: {{ include "common.name" . }}

+        release: {{ .Release.Name }}

+    spec:

+      initContainers:

+      - name: {{ include "common.name" . }}-readiness

+        image: {{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}

+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}

+        command:

+          - /root/ready.py

+        args:

+          - --container-name

+          - dcae-cloudify-manager

+          - --container-name

+          - consul-server

+          - --container-name

+          - msb-discovery

+          - --container-name

+          - kube2msb

+          - --container-name

+          - dcae-config-binding-service

+          - --container-name

+          - dcae-db

+          - "-t"

+          - "15"

+        env:

+        - name: NAMESPACE

+          valueFrom:

+            fieldRef:

+              apiVersion: v1

+              fieldPath: metadata.namespace

+      - name: init-tls

+        env:

+        - name: POD_IP

+          valueFrom:

+            fieldRef:

+              apiVersion: v1

+              fieldPath: status.podIP

+        image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }}

+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}

+        resources: {}

+        volumeMounts:

+        - mountPath: /opt/tls/shared

+          name: tls-info

+      containers:

+        - name: {{ include "common.name" . }}

+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"

+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}

+          resources:

+{{ include "common.resources" . | indent 12 }}

+          volumeMounts:

+            - mountPath: /inputs

+              name: {{ include "common.fullname" . }}-dcae-inputs

+            - mountPath: /dcae-configs

+              name: {{ include "common.fullname" . }}-dcae-config

+            - mountPath: /etc/localtime

+              name: localtime

+              readOnly: true

+            - mountPath: /certs

+              name: tls-info

+              readOnly: true

+          env:

+            - name: CMADDR

+              value: {{ .Values.config.address.cm.host }}

+            - name: CMPASS

+              valueFrom:

+                secretKeyRef:

+                  name: {{ include "common.name" . }}-cmpass

+                  key: password

+            - name: CMPROTO

+              value: {{ .Values.config.address.cm.proto }}

+            - name: CMPORT

+              value: !!string {{ .Values.config.address.cm.port }}

+            - name: CONSUL

+              value: {{ .Values.config.address.consul.host }}:{{ .Values.config.address.consul.port }}

+            - name: DCAE_NAMESPACE

+              value: {{ .Values.dcae_ns | default "" }}

+            - name: ONAP_NAMESPACE

+              value: {{ include "common.namespace" . }}

+      volumes:

+        - name: {{ include "common.fullname" . }}-dcae-inputs

+          configMap:

+            name: {{ include "common.fullname" . }}-dcae-inputs

+        - name: {{ include "common.fullname" . }}-dcae-config

+          configMap:

+            name: {{ include "common.fullname" . }}-dcae-config

+        - name: localtime

+          hostPath:

+            path: /etc/localtime

+        - name: tls-info

+          emptyDir: {}

+      imagePullSecrets:

+        - name: "{{ include "common.namespace" . }}-docker-registry-key"

diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/templates/secret.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/secret.yaml
new file mode 100644
index 0000000000..87dc6cd219
--- /dev/null
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/secret.yaml
@@ -0,0 +1,31 @@
+#============LICENSE_START========================================================
+# ================================================================================
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2018 Amdocs, Bell Canada
+# ================================================================================
+# 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: v1
+kind: Secret
+metadata:
+  name: {{ include "common.name" . }}-cmpass
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+type: Opaque
+data:
+  password: YWRtaW4=