airship
/
airship-in-a-bottle
Code Issues Proposed changes

Fix Deckhand substitution 

- Do not prefix substitution paths with '$' to
  make documents compatible w/ Deckhand

Closes #19

Change-Id: Ic971bfed31ff03c7ddd5fb6f2f598d79f42846f4
This commit is contained in:
Scott Hussey 2018-02-09 13:34:20 -06:00
parent b8325b36d8
commit a2be73c611
1 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
manifests/basic_ucp/armada-resources.yaml.sub
View File

@ -142,75 +142,75 @@ metadata:
- src: - src:
schema: deckhand/CertificateAuthority/v1 schema: deckhand/CertificateAuthority/v1
name: calico-etcd name: calico-etcd
path: $ path: .
dest: dest:
path: '$.values.secrets.tls.client.ca' path: '.values.secrets.tls.client.ca'
- src: - src:
schema: deckhand/CertificateAuthority/v1 schema: deckhand/CertificateAuthority/v1
name: calico-etcd-peer name: calico-etcd-peer
path: $ path: .
dest: dest:
path: '$.values.secrets.tls.peer.ca' path: '.values.secrets.tls.peer.ca'
- src: - src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: calico-etcd-anchor name: calico-etcd-anchor
path: $ path: .
dest: dest:
path: '$.values.secrets.anchor.tls.cert' path: '.values.secrets.anchor.tls.cert'
- src: - src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: calico-etcd-anchor name: calico-etcd-anchor
path: $ path: .
dest: dest:
path: '$.values.secrets.anchor.tls.key' path: '.values.secrets.anchor.tls.key'
- src: - src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: calico-etcd-${GENESIS_NODE_NAME} name: calico-etcd-${GENESIS_NODE_NAME}
path: $ path: .
dest: dest:
path: '$.values.nodes[0].tls.client.cert' path: '.values.nodes[0].tls.client.cert'
- src: - src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: calico-etcd-${GENESIS_NODE_NAME} name: calico-etcd-${GENESIS_NODE_NAME}
path: $ path: .
dest: dest:
path: '$.values.nodes[0].tls.client.key' path: '.values.nodes[0].tls.client.key'
- src: - src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: calico-etcd-${GENESIS_NODE_NAME}-peer name: calico-etcd-${GENESIS_NODE_NAME}-peer
path: $ path: .
dest: dest:
path: '$.values.nodes[0].tls.peer.cert' path: '.values.nodes[0].tls.peer.cert'
- src: - src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: calico-etcd-${GENESIS_NODE_NAME}-peer name: calico-etcd-${GENESIS_NODE_NAME}-peer
path: $ path: .
dest: dest:
path: '$.values.nodes[0].tls.peer.key' path: '.values.nodes[0].tls.peer.key'
- src: - src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: calico-etcd-${MASTER_NODE_NAME} name: calico-etcd-${MASTER_NODE_NAME}
path: $ path: .
dest: dest:
path: '$.values.nodes[1].tls.client.cert' path: '.values.nodes[1].tls.client.cert'
- src: - src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: calico-etcd-${MASTER_NODE_NAME} name: calico-etcd-${MASTER_NODE_NAME}
path: $ path: .
dest: dest:
path: '$.values.nodes[1].tls.client.key' path: '.values.nodes[1].tls.client.key'
- src: - src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: calico-etcd-${MASTER_NODE_NAME}-peer name: calico-etcd-${MASTER_NODE_NAME}-peer
path: $ path: .
dest: dest:
path: '$.values.nodes[1].tls.peer.cert' path: '.values.nodes[1].tls.peer.cert'
- src: - src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: calico-etcd-${MASTER_NODE_NAME}-peer name: calico-etcd-${MASTER_NODE_NAME}-peer
path: $ path: .
dest: dest:
path: '$.values.nodes[1].tls.peer.key' path: '.values.nodes[1].tls.peer.key'
data: data:
chart_name: etcd chart_name: etcd
release: calico-etcd release: calico-etcd
@ -293,21 +293,21 @@ metadata:
- src: - src:
schema: deckhand/CertificateAuthority/v1 schema: deckhand/CertificateAuthority/v1
name: calico-etcd name: calico-etcd
path: $ path: .
dest: dest:
path: '$.values.etcd.tls.ca' path: '.values.etcd.tls.ca'
- src: - src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: calico-node name: calico-node
path: $ path: .
dest: dest:
path: '$.values.etcd.tls.cert' path: '.values.etcd.tls.cert'
- src: - src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: calico-node name: calico-node
path: $ path: .
dest: dest:
path: '$.values.etcd.tls.key' path: '.values.etcd.tls.key'
data: data:
chart_name: calico chart_name: calico
release: calico release: calico
@ -351,21 +351,21 @@ metadata:
- src: - src:
schema: deckhand/CertificateAuthority/v1 schema: deckhand/CertificateAuthority/v1
name: kubernetes name: kubernetes
path: $ path: .
dest: dest:
path: '$.values.tls.ca' path: '.values.tls.ca'
- src: - src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: coredns name: coredns
path: $ path: .
dest: dest:
path: '$.values.tls.cert' path: '.values.tls.cert'
- src: - src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: coredns name: coredns
path: $ path: .
dest: dest:
path: '$.values.tls.key' path: '.values.tls.key'
data: data:
chart_name: coredns chart_name: coredns
release: coredns release: coredns
@ -456,45 +456,45 @@ metadata:
- src: - src:
schema: deckhand/CertificateAuthority/v1 schema: deckhand/CertificateAuthority/v1
name: kubernetes name: kubernetes
path: $ path: .
dest: dest:
path: $.values.secrets.tls.ca path: .values.secrets.tls.ca
- src: - src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: apiserver name: apiserver
path: $ path: .
dest: dest:
path: $.values.secrets.tls.cert path: .values.secrets.tls.cert
- src: - src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: apiserver name: apiserver
path: $ path: .
dest: dest:
path: $.values.secrets.tls.key path: .values.secrets.tls.key
- src: - src:
schema: deckhand/CertificateAuthority/v1 schema: deckhand/CertificateAuthority/v1
name: kubernetes-etcd name: kubernetes-etcd
path: $ path: .
dest: dest:
path: $.values.secrets.etcd.tls.ca path: .values.secrets.etcd.tls.ca
- src: - src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: apiserver-etcd name: apiserver-etcd
path: $ path: .
dest: dest:
path: $.values.secrets.etcd.tls.cert path: .values.secrets.etcd.tls.cert
- src: - src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: apiserver-etcd name: apiserver-etcd
path: $ path: .
dest: dest:
path: $.values.secrets.etcd.tls.key path: .values.secrets.etcd.tls.key
- src: - src:
schema: deckhand/PublicKey/v1 schema: deckhand/PublicKey/v1
name: service-account name: service-account
path: $ path: .
dest: dest:
path: $.values.secrets.service_account.public_key path: .values.secrets.service_account.public_key
data: data:
chart_name: apiserver chart_name: apiserver
@ -545,27 +545,27 @@ metadata:
- src: - src:
schema: deckhand/CertificateAuthority/v1 schema: deckhand/CertificateAuthority/v1
name: kubernetes name: kubernetes
path: $ path: .
dest: dest:
path: $.values.secrets.tls.ca path: .values.secrets.tls.ca
- src: - src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: controller-manager name: controller-manager
path: $ path: .
dest: dest:
path: $.values.secrets.tls.cert path: .values.secrets.tls.cert
- src: - src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: controller-manager name: controller-manager
path: $ path: .
dest: dest:
path: $.values.secrets.tls.key path: .values.secrets.tls.key
- src: - src:
schema: deckhand/PrivateKey/v1 schema: deckhand/PrivateKey/v1
name: service-account name: service-account
path: $ path: .
dest: dest:
path: $.values.secrets.service_account.private_key path: .values.secrets.service_account.private_key
data: data:
chart_name: controller_manager chart_name: controller_manager
release: kubernetes-controller-manager release: kubernetes-controller-manager
@ -607,21 +607,21 @@ metadata:
- src: - src:
schema: deckhand/CertificateAuthority/v1 schema: deckhand/CertificateAuthority/v1
name: kubernetes name: kubernetes
path: $ path: .
dest: dest:
path: $.values.secrets.tls.ca path: .values.secrets.tls.ca
- src: - src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: scheduler name: scheduler
path: $ path: .
dest: dest:
path: $.values.secrets.tls.cert path: .values.secrets.tls.cert
- src: - src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: scheduler name: scheduler
path: $ path: .
dest: dest:
path: $.values.secrets.tls.key path: .values.secrets.tls.key
data: data:
chart_name: scheduler chart_name: scheduler
@ -664,89 +664,89 @@ metadata:
src: src:
schema: deckhand/CertificateAuthority/v1 schema: deckhand/CertificateAuthority/v1
name: kubernetes-etcd name: kubernetes-etcd
path: $ path: .
dest: dest:
path: '$.values.secrets.tls.client.ca' path: '.values.secrets.tls.client.ca'
- -
src: src:
schema: deckhand/CertificateAuthority/v1 schema: deckhand/CertificateAuthority/v1
name: kubernetes-etcd-peer name: kubernetes-etcd-peer
path: $ path: .
dest: dest:
path: '$.values.secrets.tls.peer.ca' path: '.values.secrets.tls.peer.ca'
- -
src: src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: kubernetes-etcd-anchor name: kubernetes-etcd-anchor
path: $ path: .
dest: dest:
path: '$.values.secrets.anchor.tls.cert' path: '.values.secrets.anchor.tls.cert'
- -
src: src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: kubernetes-etcd-anchor name: kubernetes-etcd-anchor
path: $ path: .
dest: dest:
path: '$.values.secrets.anchor.tls.key' path: '.values.secrets.anchor.tls.key'
- -
src: src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: kubernetes-etcd-${GENESIS_NODE_NAME} name: kubernetes-etcd-${GENESIS_NODE_NAME}
path: $ path: .
dest: dest:
path: '$.values.nodes[0].tls.client.cert' path: '.values.nodes[0].tls.client.cert'
- -
src: src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: kubernetes-etcd-${GENESIS_NODE_NAME} name: kubernetes-etcd-${GENESIS_NODE_NAME}
path: $ path: .
dest: dest:
path: '$.values.nodes[0].tls.client.key' path: '.values.nodes[0].tls.client.key'
- -
src: src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: kubernetes-etcd-${GENESIS_NODE_NAME}-peer name: kubernetes-etcd-${GENESIS_NODE_NAME}-peer
path: $ path: .
dest: dest:
path: '$.values.nodes[0].tls.peer.cert' path: '.values.nodes[0].tls.peer.cert'
- -
src: src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: kubernetes-etcd-${GENESIS_NODE_NAME}-peer name: kubernetes-etcd-${GENESIS_NODE_NAME}-peer
path: $ path: .
dest: dest:
path: '$.values.nodes[0].tls.peer.key' path: '.values.nodes[0].tls.peer.key'
- -
src: src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: kubernetes-etcd-${MASTER_NODE_NAME} name: kubernetes-etcd-${MASTER_NODE_NAME}
path: $ path: .
dest: dest:
path: '$.values.nodes[1].tls.client.cert' path: '.values.nodes[1].tls.client.cert'
- -
src: src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: kubernetes-etcd-${MASTER_NODE_NAME} name: kubernetes-etcd-${MASTER_NODE_NAME}
path: $ path: .
dest: dest:
path: '$.values.nodes[1].tls.client.key' path: '.values.nodes[1].tls.client.key'
- -
src: src:
schema: deckhand/Certificate/v1 schema: deckhand/Certificate/v1
name: kubernetes-etcd-${MASTER_NODE_NAME}-peer name: kubernetes-etcd-${MASTER_NODE_NAME}-peer
path: $ path: .
dest: dest:
path: '$.values.nodes[1].tls.peer.cert' path: '.values.nodes[1].tls.peer.cert'
- -
src: src:
schema: deckhand/CertificateKey/v1 schema: deckhand/CertificateKey/v1
name: kubernetes-etcd-${MASTER_NODE_NAME}-peer name: kubernetes-etcd-${MASTER_NODE_NAME}-peer
path: $ path: .
dest: dest:
path: '$.values.nodes[1].tls.peer.key' path: '.values.nodes[1].tls.peer.key'
data: data:
chart_name: etcd chart_name: etcd