X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=templates%2Fsoftware%2Fcharts%2Fkubernetes%2Fcontainer-networking%2Fcalico.j2;fp=site%2Fsite30%2Fsoftware%2Fcharts%2Fucp%2Fpromenade%2Fpromenade.yaml;h=6c802273978b7f5c811988469ad872e088f21dbd;hb=refs%2Fchanges%2F69%2F369%2F1;hp=1072d22b99977103e03f947b9c86c72d6551faed;hpb=d743ec6c91f97cc9f5b944a8d0a609883440b14e;p=yaml_builds.git

diff --git a/site/site30/software/charts/ucp/promenade/promenade.yaml b/templates/software/charts/kubernetes/container-networking/calico.j2
similarity index 62%
rename from site/site30/software/charts/ucp/promenade/promenade.yaml
rename to templates/software/charts/kubernetes/container-networking/calico.j2
index 1072d22..6c80227 100644
--- a/site/site30/software/charts/ucp/promenade/promenade.yaml
+++ b/templates/software/charts/kubernetes/container-networking/calico.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.                   #
@@ -18,23 +18,41 @@
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: ucp-promenade
+  replacement: true
+  name: kubernetes-calico
   layeringDefinition:
     abstract: false
     layer: site
     parentSelector:
-      name: ucp-promenade-global
+      name: kubernetes-calico-global
     actions:
       - method: merge
         path: .
   storagePolicy: cleartext
 data:
   values:
-    pod:
-      env:
-        promenade_api:
-         - name: no_proxy
-           value: 172.30.1.30,10.96.0.1,.cluster.local,192.168.2.30,192.168.2.31,192.168.2.32,192.168.2.33,192.168.2.34,nexus3.att-akraino.org,hpgen10.lab.akraino.org,gcr.io,quay.io,lachlanevenson,docker.io,github.com,localhost,127.0.0.1
-         - name: NO_PROXY
-           value: 172.30.1.30,10.96.0.1,.cluster.local,192.168.2.30,192.168.2.31,192.168.2.32,192.168.2.33,192.168.2.34,nexus3.att-akraino.org,hpgen10.lab.akraino.org,gcr.io,quay.io,lachlanevenson,docker.io,github.com,localhost,127.0.0.1
+    networking:
+      settings:
+        mesh: "off"
+        ippool:
+          ipip:
+            enabled: "false"
+            mode: "cross-subnet"
+      bgp:
+        asnumber: {{yaml.networks.ksn.local_asnumber}}
+        ipv4:
+          additional_cidrs:
+{% for add_cidr in yaml.networks.ksn.additional_cidrs %}
+            - {{add_cidr}}
+{% endfor %}
+          peers:
+{% for peer in yaml.networks.ksn.peers %}
+            - apiVersion: v1
+              kind: bgpPeer
+              metadata:
+                peerIP: {{peer.ip}}
+                scope: {{peer.scope}}
+              spec:
+                asnumber: {{peer.asnumber}}
+{% endfor %}
 ...