summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/a1policymanagement/templates/deployment.yaml2
-rw-r--r--kubernetes/cds/charts/cds-ui/resources/certs/org.onap.sdnc-cds.p12bin0 -> 4383 bytes
-rw-r--r--kubernetes/cds/charts/cds-ui/templates/deployment.yaml16
-rw-r--r--kubernetes/cds/charts/cds-ui/templates/secret.yaml31
-rw-r--r--kubernetes/cds/charts/cds-ui/values.yaml14
5 files changed, 62 insertions, 1 deletions
diff --git a/kubernetes/a1policymanagement/templates/deployment.yaml b/kubernetes/a1policymanagement/templates/deployment.yaml
index 1a2866b981..db1b53f5f6 100644
--- a/kubernetes/a1policymanagement/templates/deployment.yaml
+++ b/kubernetes/a1policymanagement/templates/deployment.yaml
@@ -94,10 +94,10 @@ spec:
- name: {{ include "common.fullname" . }}-policy-conf-input
configMap:
name: {{ include "common.fullname" . }}-policy-conf
- defaultMode: 0555
- name: {{ include "common.fullname" . }}-envsubst-scripts
configMap:
name: {{ include "common.fullname" . }}-envsubst-scripts
+ defaultMode: 0555
- name: config
emptyDir:
medium: Memory
diff --git a/kubernetes/cds/charts/cds-ui/resources/certs/org.onap.sdnc-cds.p12 b/kubernetes/cds/charts/cds-ui/resources/certs/org.onap.sdnc-cds.p12
new file mode 100644
index 0000000000..8240f4c590
--- /dev/null
+++ b/kubernetes/cds/charts/cds-ui/resources/certs/org.onap.sdnc-cds.p12
Binary files differ
diff --git a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
index 4d3d8347db..a0774ec859 100644
--- a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
@@ -52,6 +52,13 @@ spec:
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end }}
+ command:
+ - sh
+ args:
+ - -c
+ - |
+ echo "cadi_keystore_password_p12=$PASSPHRASE_VALUE" > .enc
+ node .
env:
- name: HOST
value: 0.0.0.0
@@ -71,6 +78,10 @@ spec:
value: "{{ .Values.config.api.processor.grpc.port }}"
- name: API_BLUEPRINT_PROCESSOR_GRPC_AUTH_TOKEN
value: {{ .Values.config.api.processor.grpc.authToken }}
+ - name: KEYSTORE
+ value: "/certs/org.onap.sdnc-cds.p12"
+ - name: PASSPHRASE_VALUE
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cds-certs-pass" "key" "password") | indent 14 }}
readinessProbe:
tcpSocket:
port: {{ .Values.service.internalPort }}
@@ -80,6 +91,8 @@ spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
+ - mountPath: /certs
+ name: certs
resources:
{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
@@ -94,5 +107,8 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
+ - name: certs
+ secret:
+ secretName: {{ include "common.fullname" . }}-certs
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/cds/charts/cds-ui/templates/secret.yaml b/kubernetes/cds/charts/cds-ui/templates/secret.yaml
new file mode 100644
index 0000000000..6dcf31f6ca
--- /dev/null
+++ b/kubernetes/cds/charts/cds-ui/templates/secret.yaml
@@ -0,0 +1,31 @@
+{{/*
+# Copyright © 2021 Orange
+# 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.
+*/}}
+
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ include "common.fullname" . }}-certs
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/certs/*").AsSecrets . | indent 2 }}
+---
+{{ include "common.secretFast" . }}
diff --git a/kubernetes/cds/charts/cds-ui/values.yaml b/kubernetes/cds/charts/cds-ui/values.yaml
index 496aa85fea..d94c59f02a 100644
--- a/kubernetes/cds/charts/cds-ui/values.yaml
+++ b/kubernetes/cds/charts/cds-ui/values.yaml
@@ -21,6 +21,20 @@ global:
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
+
+#################################################################
+# Secrets metaconfig
+#################################################################
+secrets:
+ - uid: cds-certs-pass
+ type: password
+ externalSecret: '{{ tpl (default "" .Values.certs.certsExternalSecret) . }}'
+ password: '{{ .Values.certs.password }}'
+
+certs:
+ password: "DG*HkOIe5W^F}XYI6o!2sD(6"
+ #certsExternalSecret:
+
subChartsOnly:
enabled: true