diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-04-20 07:15:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-20 07:15:03 +0000 |
| commit | 91fbf8fa8c146704733eea25e8ce843823d8962c (patch) | |
| tree | 12945865984a18d3570136a7f74a38dab2aeb87c /kubernetes/cli/templates | |
| parent | 768eac673132b08e48da7beba7062af0e7771c4c (diff) | |
| parent | 948ee22afd4edc1a252902b5121c80eb43823e4c (diff) | |
Merge changes I4dc6cf5c,I1ad4da22
* changes:
Add HTTPS ceritificate in CLI OOM charts
Set CLI version to 5.0.4
Diffstat (limited to 'kubernetes/cli/templates')
| -rw-r--r-- | kubernetes/cli/templates/deployment.yaml | 9 | ||||
| -rw-r--r-- | kubernetes/cli/templates/secrets.yaml | 29 |
2 files changed, 38 insertions, 0 deletions
diff --git a/kubernetes/cli/templates/deployment.yaml b/kubernetes/cli/templates/deployment.yaml index 64c8968c6c..58fc6663c5 100644 --- a/kubernetes/cli/templates/deployment.yaml +++ b/kubernetes/cli/templates/deployment.yaml @@ -51,6 +51,11 @@ spec: port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} + volumeMounts: + - name: ocomp-pem + mountPath: "/etc/lighttpd/ocomp.pem" + subPath: ocomp.pem + readOnly: true env: - name: OPEN_CLI_MODE value: "{{ .Values.config.climode }}" @@ -64,5 +69,9 @@ spec: affinity: {{ toYaml .Values.affinity | indent 10 }} {{- end }} + volumes: + - name: ocomp-pem + secret: + secretName: ocomp-pem imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/cli/templates/secrets.yaml b/kubernetes/cli/templates/secrets.yaml new file mode 100644 index 0000000000..ab7fb6673a --- /dev/null +++ b/kubernetes/cli/templates/secrets.yaml @@ -0,0 +1,29 @@ +# Copyright 2020 Huawei Technologies Co., Ltd. +# +# 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: ocomp-pem + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ include "common.release" . }} + heritage: {{ .Release.Service }} +type: Opaque +data: + ocomp.pem: +{{ tpl (.Files.Glob "resources/certificates/ocomp.pem").AsSecrets . | indent 2 }} + |