diff options
Diffstat (limited to 'kubernetes/dcaegen2/components/dcae-cloudify-manager/templates')
| -rw-r--r-- | kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml | 10 | ||||
| -rw-r--r-- | kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml | 21 |
2 files changed, 29 insertions, 2 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml index 6ec98b56c4..806b06ed8a 100644 --- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml +++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml @@ -3,6 +3,7 @@ # ================================================================================ # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # Modifications Copyright © 2018 Amdocs, Bell Canada +# 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. @@ -17,7 +18,6 @@ # limitations under the License. # ============LICENSE_END========================================================= */}} - apiVersion: v1 kind: ConfigMap metadata: @@ -29,6 +29,14 @@ data: apiVersion: v1 kind: ConfigMap metadata: + name: {{ include "common.fullname" . }}-plugins + namespace: {{ include "common.namespace" . }} +data: +{{ tpl (.Files.Glob "resources/config/plugins/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: name: {{ include "common.release" . }}-dcae-filebeat-configmap namespace: {{include "common.namespace" . }} data: diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml index 6c7fa4d85c..204a3e27d7 100644 --- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml +++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml @@ -3,7 +3,7 @@ # ================================================================================ # Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved. # Modifications Copyright © 2018 Amdocs, Bell Canada -# Copyright (c) 2020 J. F. Lucas. All rights reserved. +# Copyright (c) 2020-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. @@ -46,6 +46,8 @@ spec: - ip: "127.0.0.1" hostnames: - "dcae-cloudify-manager" + # Cloudify requires a fixed hostname across restarts + hostname: dcae-cloudify-manager initContainers: - name: {{ include "common.name" . }}-readiness image: {{ include "repositoryGenerator.image.readiness" . }} @@ -55,6 +57,8 @@ spec: args: - --container-name - aaf-cm + - --container-name + - consul-server - "-t" - "15" env: @@ -71,6 +75,18 @@ spec: - {{ include "common.namespace" . }} - --configmap - {{ .Values.multisiteConfigMapName }} + - name: init-consul + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.consulLoaderImage }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + args: + - --key + - k8s-plugin|/plugin-configs/k8s-plugin.json + - --key + - dmaap-plugin|/plugin-configs/dmaap-plugin.json + resources: {} + volumeMounts: + - mountPath: /plugin-configs + name: plugin-configs - name: init-tls env: - name: POD_IP @@ -160,6 +176,9 @@ spec: - name: {{ include "common.fullname" .}}-kubeconfig configMap: name: {{ .Values.multisiteConfigMapName }} + - name: plugin-configs + configMap: + name: {{ include "common.fullname" . }}-plugins - name: dcae-token secret: secretName: dcae-token |