[CORD-2909] Flatten and parameterize charts
Change-Id: I695c1df063b0f6f6ccf280254d54cc701292348f
diff --git a/xos-core/templates/tosca-deployment.yaml b/xos-core/templates/tosca-deployment.yaml
index 5dd61f2..48eecf2 100644
--- a/xos-core/templates/tosca-deployment.yaml
+++ b/xos-core/templates/tosca-deployment.yaml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +18,7 @@
metadata:
name: xos-tosca
labels:
- app: xos-tosca
+ {{- include "xos-core.release_labels" . | indent 4 }}
spec:
replicas: 1
template:
@@ -27,25 +28,29 @@
spec:
containers:
- name: xos-tosca
- image: {{ .Values.pull_docker_registry }}{{ .Values.images.xos_tosca.repository }}:{{ .Values.images.xos_tosca.tag }}
- imagePullPolicy: {{ .Values.images.xos_tosca.pullPolicy }}
+ image: {{ .Values.xos_toscaImage | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
ports:
- containerPort: 9102
port: 9102
protocol: TCP
volumeMounts:
- - name: secret-volume
- mountPath: /usr/local/share/ca-certificates
- - name: xos-core-config
+ - name: certchain-volume
+ mountPath: /usr/local/share/ca-certificates/local_certs.crt
+ subPath: config/ca_cert_chain.pem
+ - name: xos-tosca-config
mountPath: /opt/xos-tosca/src/xos-tosca.config.yaml
subPath: config/xos-tosca.config.yaml
volumes:
- - name: secret-volume
- secret:
- secretName: cert-chain-secret
- - name: xos-core-config
+ - name: certchain-volume
+ configMap:
+ name: ca-certificates
+ items:
+ - key: chain
+ path: config/ca_cert_chain.pem
+ - name: xos-tosca-config
configMap:
name: xos-tosca
items:
- - key: config
- path: config/xos-tosca.config.yaml
+ - key: config
+ path: config/xos-tosca.config.yaml