Give flanneld its own certs rather than consuming them from link (#7)

cloudfoundry-incubator · May 3, 2019 · 3b60c32 · 3b60c32
1 parent 9f6b2ee
commit 3b60c32
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/jobs/flanneld-windows/spec b/jobs/flanneld-windows/spec
@@ -18,6 +18,12 @@ properties:
   backend-type:
     description: The network backend to use
     default: "win-overlay"
+  tls.etcdctl.ca:
+    description: CA for etcdctl client authentication
+  tls.etcdctl.certificate:
+    description: Certificate for etcdctl client authentication
+  tls.etcdctl.private_key:
+    description: Private key for etcdctl client authentication
 
 consumes:
 - name: etcd

diff --git a/jobs/flanneld-windows/templates/config/etcd-ca.crt.erb b/jobs/flanneld-windows/templates/config/etcd-ca.crt.erb
@@ -1,2 +1,2 @@
-<%= link('etcd').p('tls.etcdctl.ca') %>
+<%= p('tls.etcdctl.ca') %>
 
diff --git a/jobs/flanneld-windows/templates/config/etcd-client.crt.erb b/jobs/flanneld-windows/templates/config/etcd-client.crt.erb
@@ -1,2 +1,2 @@
-<%= link('etcd').p('tls.etcdctl.certificate') %>
+<%= p('tls.etcdctl.certificate') %>
 
diff --git a/jobs/flanneld-windows/templates/config/etcd-client.key.erb b/jobs/flanneld-windows/templates/config/etcd-client.key.erb
@@ -1,2 +1,2 @@
-<%= link('etcd').p('tls.etcdctl.private_key') %>
+<%= p('tls.etcdctl.private_key') %>
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		<%= link('etcd').p('tls.etcdctl.ca') %>
		<%= p('tls.etcdctl.ca') %>
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		<%= link('etcd').p('tls.etcdctl.certificate') %>
		<%= p('tls.etcdctl.certificate') %>
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		<%= link('etcd').p('tls.etcdctl.private_key') %>
		<%= p('tls.etcdctl.private_key') %>