[POLICY] Rename from TOSCA Control Loop to ACM

[oom.git] / kubernetes / policy / components / policy-clamp-ac-http-ppnt / templates / deployment.yaml

diff --git a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
similarity index 73%
rename from kubernetes/policy/components/policy-clamp-cl-http-ppnt/templates/deployment.yaml
rename to kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
index 80eaf76..3a5b8b1 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{/*
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   Copyright (C) 2021-2022 Nordix Foundation.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -33,11 +33,16 @@ spec:
         args:
         - -c
         - "cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done"
+        env:
+        - name: RESTSERVER_USER
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-secret" "key" "login") | indent 10 }}
+        - name: RESTSERVER_PASSWORD
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-secret" "key" "password") | indent 10 }}
         volumeMounts:
         - mountPath: /config-input
-          name: cl-http-ppnt-config
+          name: ac-http-ppnt-config
         - mountPath: /config
-          name: cl-http-ppnt-config-processed
+          name: ac-http-ppnt-config-processed
         image: {{ include "repositoryGenerator.image.envsubst" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-update-config
@@ -59,13 +64,28 @@ spec:
           - name: TRUSTSTORE_PASSWD
             {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "truststore-password" "key" "password") | indent 12 }}
 {{- end }}
+          ports: {{ include "common.containerPorts" . | nindent 12  }}
+          # disable liveness probe when breakpoints set in debugger
+          # so K8s doesn't restart unresponsive container
+          {{- if eq .Values.liveness.enabled true }}
+          livenessProbe:
+            tcpSocket:
+              port: {{ .Values.liveness.port }}
+            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.liveness.periodSeconds }}
+          {{ end -}}
+          readinessProbe:
+            tcpSocket:
+              port: {{ .Values.readiness.port }}
+            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readiness.periodSeconds }}
           volumeMounts:
 {{ include "common.certInitializer.volumeMount" . | indent 10 }}
           - mountPath: /etc/localtime
             name: localtime
             readOnly: true
           - mountPath: /opt/app/policy/clamp/etc/mounted
-            name: cl-http-ppnt-config-processed
+            name: ac-http-ppnt-config-processed
           resources:
 {{ include "common.resources" . }}
         {{- if .Values.nodeSelector }}
@@ -82,11 +102,11 @@ spec:
         - name: localtime
           hostPath:
              path: /etc/localtime
-        - name: cl-http-ppnt-config
+        - name: ac-http-ppnt-config
           configMap:
             name: {{ include "common.fullname" . }}-configmap
             defaultMode: 0755
-        - name: cl-http-ppnt-config-processed
+        - name: ac-http-ppnt-config-processed
           emptyDir:
             medium: Memory
       imagePullSecrets: