X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=templates%2Fsoftware%2Fcharts%2Fkubernetes%2Fetcd%2Fetcd.j2;fp=templates%2Faic-clcp-manifests%2Fsoftware%2Fcharts%2Fkubernetes%2Fetcd%2Fetcd.j2;h=9cc4322ea51fe081f8be38bd228c32e57b2830a0;hb=refs%2Fchanges%2F69%2F369%2F1;hp=ad315457db913a5dbd4ac3c463f7c09ceeaafe99;hpb=d743ec6c91f97cc9f5b944a8d0a609883440b14e;p=yaml_builds.git

diff --git a/templates/aic-clcp-manifests/software/charts/kubernetes/etcd/etcd.j2 b/templates/software/charts/kubernetes/etcd/etcd.j2
similarity index 77%
rename from templates/aic-clcp-manifests/software/charts/kubernetes/etcd/etcd.j2
rename to templates/software/charts/kubernetes/etcd/etcd.j2
index ad31545..9cc4322 100644
--- a/templates/aic-clcp-manifests/software/charts/kubernetes/etcd/etcd.j2
+++ b/templates/software/charts/kubernetes/etcd/etcd.j2
@@ -1,6 +1,6 @@
 ---
 ##############################################################################
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.          #
+# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License.                   #
@@ -29,63 +29,85 @@ metadata:
         path: .
   storagePolicy: cleartext
   substitutions:
-    # Node names
-{% set count = [0] %}
-{% for server in yaml.masters %}
+
+  # Chart source
     - src:
-        schema: pegleg/CommonAddresses/v1
-        name: common-addresses
-        path: .masters[{{count[0]}}].hostname
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .charts.kubernetes.etcd
       dest:
-        path: .values.nodes[{{count[0]}}].name
-      {% if count.append(count.pop() + 1) %}{% endif %}
-{% endfor %}
-{% for server in yaml.workers %}
+        path: .source
+
+    # Images
+    - src:
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .images.kubernetes.etcd
+      dest:
+        path: .values.images.tags
+
+    # IP addresses
     - src:
         schema: pegleg/CommonAddresses/v1
         name: common-addresses
-        path: .masters[{{count[0]}}].hostname
+        path: .kubernetes.etcd_service_ip
       dest:
-        path: .values.nodes[{{count[0]}}].name
-      {% if count.append(count.pop() + 1) %}{% endif %}
-{% endfor %}
+        path: .values.service.ip
     - src:
         schema: pegleg/CommonAddresses/v1
         name: common-addresses
-        path: .genesis.hostname
+        path: .kubernetes.etcd_service_ip
       dest:
-        path: .values.nodes[{{count[0]}}].name
+        path: .values.anchor.etcdctl_endpoint
 
-    # Server certs
-{% set count = [0] %}
-{% for server in yaml.masters %}
+    # CAs
     - src:
-        schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-{{server.name}}
+        schema: deckhand/CertificateAuthority/v1
+        name: kubernetes-etcd
         path: .
       dest:
-        path: .values.nodes[{{count[0]}}].tls.client.cert
+        path: .values.secrets.tls.client.ca
     - src:
-        schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-{{server.name}}
+        schema: deckhand/CertificateAuthority/v1
+        name: kubernetes-etcd-peer
         path: .
       dest:
-        path: .values.nodes[{{count[0]}}].tls.client.key
+        path: .values.secrets.tls.peer.ca
+
     - src:
         schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-{{server.name}}-peer
+        name: kubernetes-etcd-anchor
         path: .
       dest:
-        path: .values.nodes[{{count[0]}}].tls.peer.cert
+        path: .values.secrets.anchor.tls.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-{{server.name}}-peer
+        name: kubernetes-etcd-anchor
         path: .
       dest:
-        path: .values.nodes[{{count[0]}}].tls.peer.key
+        path: .values.secrets.anchor.tls.key
+
+    # Node names
+{% set count = [0] %}
+{% for server in yaml.masters %}
+    - src:
+        schema: pegleg/CommonAddresses/v1
+        name: common-addresses
+        path: .masters[{{count[0]}}].hostname
+      dest:
+        path: .values.nodes[{{count[0]}}].name
       {% if count.append(count.pop() + 1) %}{% endif %}
 {% endfor %}
-{% for server in yaml.workers %}
+    - src:
+        schema: pegleg/CommonAddresses/v1
+        name: common-addresses
+        path: .genesis.hostname
+      dest:
+        path: .values.nodes[{{count[0]}}].name
+
+    # Server certs
+{% set count = [0] %}
+{% for server in yaml.masters %}
     - src:
         schema: deckhand/Certificate/v1
         name: kubernetes-etcd-{{server.name}}
@@ -140,5 +162,4 @@ metadata:
         path: .values.nodes[{{count[0]}}].tls.peer.key
 
 data: {}
-
 ...