summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-05-27 07:27:04 +0000
committerGerrit Code Review <gerrit@onap.org>2020-05-27 07:27:04 +0000
commita5474c3217af798249458dc539ae7edccc5b2750 (patch)
tree334ce200c1067d5950362ffa96bc094f13ba70cd /kubernetes
parent47d9f98d2d46cd84683d5b5c5158f78a5551eaf8 (diff)
parent388a23d85dd8866762330a2e1c146cac3b5c3e36 (diff)
Merge "Set certificate SAN as msb-iag" into frankfurt
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/msb/charts/msb-eag/templates/deployment.yaml11
-rw-r--r--kubernetes/msb/charts/msb-iag/templates/deployment.yaml11
-rw-r--r--kubernetes/msb/resources/config/certificates/cert.crt37
-rw-r--r--kubernetes/msb/templates/secrets.yaml26
4 files changed, 67 insertions, 18 deletions
diff --git a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml
index fd16a0ce6b..95f0e34599 100644
--- a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml
+++ b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml
@@ -81,6 +81,14 @@ spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
+ - name: {{ include "common.fullname" . }}-cert
+ mountPath: /usr/local/openresty/nginx/ssl/cert/cert.crt
+ readOnly: true
+ subPath: "cert.crt"
+ - name: {{ include "common.fullname" . }}-cert
+ mountPath: /usr/local/openresty/nginx/html/cert/ca.crt
+ readOnly: true
+ subPath: "ca.crt"
- mountPath: /usr/local/apiroute-works/logs
name: {{ include "common.fullname" . }}-logs
resources:
@@ -109,6 +117,9 @@ spec:
name: {{ include "common.fullname" . }}-log-conf
subPath: logback.xml
volumes:
+ - name: {{ include "common.fullname" . }}-cert
+ secret:
+ secretName: {{ include "common.release" . }}-msb-https-cert
- name: {{ include "common.fullname" . }}-log-conf
configMap:
name: {{ include "common.fullname" . }}-log
diff --git a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml
index 8975a32c7f..f95f1059a6 100644
--- a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml
+++ b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml
@@ -81,6 +81,14 @@ spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
+ - name: {{ include "common.fullname" . }}-cert
+ mountPath: /usr/local/openresty/nginx/ssl/cert/cert.crt
+ readOnly: true
+ subPath: "cert.crt"
+ - name: {{ include "common.fullname" . }}-cert
+ mountPath: /usr/local/openresty/nginx/html/cert/ca.crt
+ readOnly: true
+ subPath: "ca.crt"
- mountPath: /usr/local/apiroute-works/logs
name: {{ include "common.fullname" . }}-logs
resources:
@@ -109,6 +117,9 @@ spec:
name: {{ include "common.fullname" . }}-log-conf
subPath: logback.xml
volumes:
+ - name: {{ include "common.fullname" . }}-cert
+ secret:
+ secretName: {{ include "common.release" . }}-msb-https-cert
- name: {{ include "common.fullname" . }}-log-conf
configMap:
name: {{ include "common.fullname" . }}-log
diff --git a/kubernetes/msb/resources/config/certificates/cert.crt b/kubernetes/msb/resources/config/certificates/cert.crt
index 7d1314f59e..e718c8d166 100644
--- a/kubernetes/msb/resources/config/certificates/cert.crt
+++ b/kubernetes/msb/resources/config/certificates/cert.crt
@@ -1,22 +1,23 @@
-----BEGIN CERTIFICATE-----
-MIIDqjCCApKgAwIBAgIJAOQWcdss4Qu5MA0GCSqGSIb3DQEBCwUAMIGKMQswCQYD
+MIID0TCCArmgAwIBAgIJAOQWcdss4QvKMA0GCSqGSIb3DQEBCwUAMIGKMQswCQYD
VQQGEwJDTjERMA8GA1UECAwIc2ljaHVhbmcxEDAOBgNVBAcMB2NoZW5nZHUxDDAK
BgNVBAoMA3p0ZTEOMAwGA1UECwwFemVuYXAxODA2BgNVBAMML1pURSBPcGVuUGFs
-ZXR0ZSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAyMDE3MB4XDTIwMDQyMjAy
-NTc1MFoXDTIyMDQyMjAyNTc1MFowYDELMAkGA1UEBhMCQ04xEDAOBgNVBAgMB1Np
-Y2h1YW4xEDAOBgNVBAcMB0NoZW5nZHUxDTALBgNVBAoMBE9OQVAxDDAKBgNVBAsM
-A01TQjEQMA4GA1UEAwwHbXNiLWlhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMa1YlTIL8APcmASbxrD7Q9BhWL9Hwi+FKO4HsIrSiJj/A/FLVe3kV2a
-xA7b5wdv44P0qQnh3pc0djlnZ47Fgli3lhEZ33+j5vrXHCjEFKiZZVeO+y/p+OcZ
-VMNiL+MPJNTNgMkPoaljs/U6fn6fFyAgMMIqqigxHJaNvz7IH+UpqbWWzZo7+JqC
-lBi8t5ZIDk18/3cPQWXIne+3MoYULdEayAS8/4wYoJANH1knmSG+J07f9uCXniiz
-4zFFngMGHm4kuKXJCAl5E6S5fPzsLKqtwbbn9kJNyWoNFDuc7zW5dPfqPVckHHQ8
-Dx0q2111UgrzrBZMW1RKmcwB+1YXip8CAwEAAaM8MDowCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwIAYDVR0RBBkwF4IVKi5zaW1wbGVkZW1vLm9uYXAub3JnMA0GCSqG
-SIb3DQEBCwUAA4IBAQCXSECDNzsg2MhVIVvviqxhpZWZ3sa7KxXlyd9iSmBzkneS
-+XiyUC575ZM3lmh1Kme35bWgz5R/w76XLSMBPxIX6uZ4HVNQqwSPv63Nk9+ON3IN
-iCn6ehHKJgT0rpx/aB3sIcE1hEtIWLGaaKVEb3DOuDbkbBT9eJbIgHKkT80PKynK
-l35dQRMiGBQiD8cBUxTOJaj7QohZ/aUWArZCOl0uvddkrs/IOCMY3BDQ0WZ7RYp3
-LwpgZVPzkVRaSLSq3TS07Re+nZcaht69T6mdMY5V0gW20O4J2nWMaldSmlNqcddb
-Nl5Xn0lRMW651ZzxEkcaXNtR78yLYi2JXtyQBgVA
+ZXR0ZSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAyMDE3MB4XDTIwMDUxMzAy
+MjIyN1oXDTIyMDUxMzAyMjIyN1owgYwxCzAJBgNVBAYTAkNOMRAwDgYDVQQIDAdT
+aWNodWFuMRAwDgYDVQQHDAdDaGVuZ2R1MQ0wCwYDVQQKDARPTkFQMQwwCgYDVQQL
+DANNU0IxEDAOBgNVBAMMB21zYi1pYWcxKjAoBgkqhkiG9w0BCQEWG29uYXAtZGlz
+Y3Vzc0BsaXN0cy5vbmFwLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMa1YlTIL8APcmASbxrD7Q9BhWL9Hwi+FKO4HsIrSiJj/A/FLVe3kV2axA7b
+5wdv44P0qQnh3pc0djlnZ47Fgli3lhEZ33+j5vrXHCjEFKiZZVeO+y/p+OcZVMNi
+L+MPJNTNgMkPoaljs/U6fn6fFyAgMMIqqigxHJaNvz7IH+UpqbWWzZo7+JqClBi8
+t5ZIDk18/3cPQWXIne+3MoYULdEayAS8/4wYoJANH1knmSG+J07f9uCXniiz4zFF
+ngMGHm4kuKXJCAl5E6S5fPzsLKqtwbbn9kJNyWoNFDuc7zW5dPfqPVckHHQ8Dx0q
+2111UgrzrBZMW1RKmcwB+1YXip8CAwEAAaM2MDQwMgYDVR0RBCswKYIHbXNiLWlh
+Z4IHbXNiLWVhZ4IVKi5zaW1wbGVkZW1vLm9uYXAub3JnMA0GCSqGSIb3DQEBCwUA
+A4IBAQC9KKJ5x+EBHfdODbMIAufYinlbNRQ4xdG7tlRk0cRXnZoWi6yObQXmZuHV
+56M2ZIylKNab2Z0VBluQqoLJvByAHQJO1r+qsAMG/LXBRC1x3y5344vtEPbikpMs
+GHtxHomAu/JtSAlSL1Wvj7co3OUgVH/yNbccysVtqxxrfPrBhLfH/yDrFehmQ00T
+P8mmJG3qeOUII0pgUjBkGL52+YMN0qy0SgryBx86fR9Y1bQLdWNfsM1CUXE2q9xs
+FmU5Ry1pemTo68THSJs4wOnjLZ4kWTseTcEmQ6X2lfah8Ch0ffd3tttguNXnT1Xc
+axgwv2Cypja3bPbq9t8kfJhbDrYO
-----END CERTIFICATE-----
diff --git a/kubernetes/msb/templates/secrets.yaml b/kubernetes/msb/templates/secrets.yaml
new file mode 100644
index 0000000000..7dcec5a303
--- /dev/null
+++ b/kubernetes/msb/templates/secrets.yaml
@@ -0,0 +1,26 @@
+{{/*
+# Copyright © 2020 Samsung Electronics
+#
+# 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.release" . }}-msb-https-cert
+ labels: {{ include "common.labels" . | nindent 4 }}
+ app: {{ include "common.name" . }}
+ chart: {{ include "common.chart" . }}
+ release: {{ include "common.release" . }}
+type: Opaque
+data:
+{{ tpl (.Files.Glob "resources/config/certificates/*").AsSecrets . | indent 2 }}