From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Wed, 30 Sep 2020 12:17:24 +0000 (+0000)
Subject: Merge "[DCAEGEN2] Remove restartPolicy field"
X-Git-Tag: 7.0.0~179
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=97563a346feb448f416df4cd7bf537d53ddc07e7;hp=-c;p=oom.git

Merge "[DCAEGEN2] Remove restartPolicy field"
---

97563a346feb448f416df4cd7bf537d53ddc07e7
diff --combined kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml
index 8f379afcbd,13dd3432e5..337461fa38
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml
@@@ -1,6 -1,6 +1,6 @@@
  #============LICENSE_START========================================================
  # ================================================================================
 -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 +# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
  # Modifications Copyright © 2018 Amdocs, Bell Canada
  # ================================================================================
  # Licensed under the Apache License, Version 2.0 (the "License");
@@@ -68,7 -68,6 +68,6 @@@ spec
            - {{ include "common.namespace" . }}
            - --configmap
            - {{ .Values.multisiteConfigMapName }}
-         restartPolicy: Never
        - name: init-tls
          env:
            - name: POD_IP
@@@ -144,9 -143,6 +143,9 @@@
              name: cm-persistent
            - mountPath: /opt/onap/certs
              name: tls-info
 +          - mountPath: /opt/onap/cm-secrets
 +            name: cm-secrets
 +            readOnly: true
            securityContext:
              privileged: True
        volumes:
@@@ -174,8 -170,5 +173,8 @@@
          {{- end }}
          - emptyDir: {}
            name: tls-info
 +        - name: cm-secrets
 +          secret:
 +            secretName: {{ include "common.secret.getSecretNameFast" (dict "global" . "uid" "cm-pass") }}
        imagePullSecrets:
        - name: "{{ include "common.namespace" . }}-docker-registry-key"