From 76da59c50483b489edce3552a95ad163f3ca936c Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Fri, 8 Jul 2016 22:17:12 -0700 Subject: [PATCH] examples/k8s: Remove fleet from Kubernetes nodes * fleet is not a requirement, let's keep it simple --- examples/groups/k8s-docker/node1.json | 3 +-- examples/groups/k8s-docker/node2.json | 3 +-- examples/groups/k8s-docker/node3.json | 3 +-- examples/groups/k8s-install/node1.json | 3 +-- examples/groups/k8s-install/node2.json | 3 +-- examples/groups/k8s-install/node3.json | 3 +-- examples/groups/k8s/node1.json | 3 +-- examples/groups/k8s/node2.json | 3 +-- examples/groups/k8s/node3.json | 3 +-- examples/ignition/k8s-master.yaml | 7 ------- examples/ignition/k8s-worker.yaml | 7 ------- 11 files changed, 9 insertions(+), 32 deletions(-) diff --git a/examples/groups/k8s-docker/node1.json b/examples/groups/k8s-docker/node1.json index 9fe16c92..380cc3aa 100644 --- a/examples/groups/k8s-docker/node1.json +++ b/examples/groups/k8s-docker/node1.json @@ -1,6 +1,6 @@ { "id": "node1", - "name": "Master Node", + "name": "k8s controller", "profile": "k8s-master", "selector": { "mac": "52:54:00:a1:9c:ae" @@ -8,7 +8,6 @@ "metadata": { "etcd_initial_cluster": "node1=http://172.17.0.21:2380,node2=http://172.17.0.22:2380,node3=http://172.17.0.23:2380", "etcd_name": "node1", - "fleet_metadata": "role=etcd,name=node1", "ipv4_address": "172.17.0.21", "k8s_cert_endpoint": "http://bootcfg.foo:8080/assets", "k8s_dns_service_ip": "10.3.0.10", diff --git a/examples/groups/k8s-docker/node2.json b/examples/groups/k8s-docker/node2.json index cdee7798..0b0fd7b4 100644 --- a/examples/groups/k8s-docker/node2.json +++ b/examples/groups/k8s-docker/node2.json @@ -1,6 +1,6 @@ { "id": "node2", - "name": "Worker 1", + "name": "k8s worker", "profile": "k8s-worker", "selector": { "mac": "52:54:00:b2:2f:86" @@ -8,7 +8,6 @@ "metadata": { "etcd_initial_cluster": "node1=http://172.17.0.21:2380,node2=http://172.17.0.22:2380,node3=http://172.17.0.23:2380", "etcd_name": "node2", - "fleet_metadata": "role=etcd,name=node2", "ipv4_address": "172.17.0.22", "k8s_cert_endpoint": "http://bootcfg.foo:8080/assets", "k8s_controller_endpoint": "https://172.17.0.21", diff --git a/examples/groups/k8s-docker/node3.json b/examples/groups/k8s-docker/node3.json index bf876bd5..4bcb22ec 100644 --- a/examples/groups/k8s-docker/node3.json +++ b/examples/groups/k8s-docker/node3.json @@ -1,6 +1,6 @@ { "id": "node3", - "name": "Worker 2", + "name": "k8s worker", "profile": "k8s-worker", "selector": { "mac": "52:54:00:c3:61:77" @@ -8,7 +8,6 @@ "metadata": { "etcd_initial_cluster": "node1=http://172.17.0.21:2380,node2=http://172.17.0.22:2380,node3=http://172.17.0.23:2380", "etcd_name": "node3", - "fleet_metadata": "role=etcd,name=node3", "ipv4_address": "172.17.0.23", "k8s_cert_endpoint": "http://bootcfg.foo:8080/assets", "k8s_controller_endpoint": "https://172.17.0.21", diff --git a/examples/groups/k8s-install/node1.json b/examples/groups/k8s-install/node1.json index 527030be..384f807b 100644 --- a/examples/groups/k8s-install/node1.json +++ b/examples/groups/k8s-install/node1.json @@ -1,6 +1,6 @@ { "id": "node1", - "name": "Master Node", + "name": "k8s controller", "profile": "k8s-master-install", "selector": { "os": "installed", @@ -9,7 +9,6 @@ "metadata": { "etcd_initial_cluster": "node1=http://172.15.0.21:2380,node2=http://172.15.0.22:2380,node3=http://172.15.0.23:2380", "etcd_name": "node1", - "fleet_metadata": "role=etcd,name=node1", "ipv4_address": "172.15.0.21", "k8s_cert_endpoint": "http://bootcfg.foo:8080/assets", "k8s_dns_service_ip": "10.3.0.10", diff --git a/examples/groups/k8s-install/node2.json b/examples/groups/k8s-install/node2.json index ab2db895..ccb814c5 100644 --- a/examples/groups/k8s-install/node2.json +++ b/examples/groups/k8s-install/node2.json @@ -1,6 +1,6 @@ { "id": "node2", - "name": "Worker 1", + "name": "k8s worker", "profile": "k8s-worker-install", "selector": { "os": "installed", @@ -9,7 +9,6 @@ "metadata": { "etcd_initial_cluster": "node1=http://172.15.0.21:2380,node2=http://172.15.0.22:2380,node3=http://172.15.0.23:2380", "etcd_name": "node2", - "fleet_metadata": "role=etcd,name=node2", "ipv4_address": "172.15.0.22", "k8s_cert_endpoint": "http://bootcfg.foo:8080/assets", "k8s_controller_endpoint": "https://172.15.0.21", diff --git a/examples/groups/k8s-install/node3.json b/examples/groups/k8s-install/node3.json index 19135f10..f544b9ce 100644 --- a/examples/groups/k8s-install/node3.json +++ b/examples/groups/k8s-install/node3.json @@ -1,6 +1,6 @@ { "id": "node3", - "name": "Worker 2", + "name": "k8s worker", "profile": "k8s-worker-install", "selector": { "os": "installed", @@ -9,7 +9,6 @@ "metadata": { "etcd_initial_cluster": "node1=http://172.15.0.21:2380,node2=http://172.15.0.22:2380,node3=http://172.15.0.23:2380", "etcd_name": "node3", - "fleet_metadata": "role=etcd,name=node3", "ipv4_address": "172.15.0.23", "k8s_cert_endpoint": "http://bootcfg.foo:8080/assets", "k8s_controller_endpoint": "https://172.15.0.21", diff --git a/examples/groups/k8s/node1.json b/examples/groups/k8s/node1.json index da61e059..b6057873 100644 --- a/examples/groups/k8s/node1.json +++ b/examples/groups/k8s/node1.json @@ -1,6 +1,6 @@ { "id": "node1", - "name": "Master Node", + "name": "k8s controller", "profile": "k8s-master", "selector": { "mac": "52:54:00:a1:9c:ae" @@ -8,7 +8,6 @@ "metadata": { "etcd_initial_cluster": "node1=http://172.15.0.21:2380,node2=http://172.15.0.22:2380,node3=http://172.15.0.23:2380", "etcd_name": "node1", - "fleet_metadata": "role=etcd,name=node1", "ipv4_address": "172.15.0.21", "k8s_cert_endpoint": "http://bootcfg.foo:8080/assets", "k8s_dns_service_ip": "10.3.0.10", diff --git a/examples/groups/k8s/node2.json b/examples/groups/k8s/node2.json index 7be49521..88d5538c 100644 --- a/examples/groups/k8s/node2.json +++ b/examples/groups/k8s/node2.json @@ -1,6 +1,6 @@ { "id": "node2", - "name": "Worker 1", + "name": "k8s worker", "profile": "k8s-worker", "selector": { "mac": "52:54:00:b2:2f:86" @@ -8,7 +8,6 @@ "metadata": { "etcd_initial_cluster": "node1=http://172.15.0.21:2380,node2=http://172.15.0.22:2380,node3=http://172.15.0.23:2380", "etcd_name": "node2", - "fleet_metadata": "role=etcd,name=node2", "ipv4_address": "172.15.0.22", "k8s_cert_endpoint": "http://bootcfg.foo:8080/assets", "k8s_controller_endpoint": "https://172.15.0.21", diff --git a/examples/groups/k8s/node3.json b/examples/groups/k8s/node3.json index 8b4fe99a..7d8f4928 100644 --- a/examples/groups/k8s/node3.json +++ b/examples/groups/k8s/node3.json @@ -1,6 +1,6 @@ { "id": "node3", - "name": "Worker 2", + "name": "k8s worker", "profile": "k8s-worker", "selector": { "mac": "52:54:00:c3:61:77" @@ -8,7 +8,6 @@ "metadata": { "etcd_initial_cluster": "node1=http://172.15.0.21:2380,node2=http://172.15.0.22:2380,node3=http://172.15.0.23:2380", "etcd_name": "node3", - "fleet_metadata": "role=etcd,name=node3", "ipv4_address": "172.15.0.23", "k8s_cert_endpoint": "http://bootcfg.foo:8080/assets", "k8s_controller_endpoint": "https://172.15.0.21", diff --git a/examples/ignition/k8s-master.yaml b/examples/ignition/k8s-master.yaml index 55aa8769..a476dfe7 100644 --- a/examples/ignition/k8s-master.yaml +++ b/examples/ignition/k8s-master.yaml @@ -14,13 +14,6 @@ systemd: Environment="ETCD_LISTEN_PEER_URLS=http://{{.ipv4_address}}:2380" Environment="ETCD_INITIAL_CLUSTER={{.etcd_initial_cluster}}" Environment="ETCD_STRICT_RECONFIG_CHECK=true" - - name: fleet.service - enable: true - dropins: - - name: 40-fleet-metadata.conf - contents: | - [Service] - Environment="FLEET_METADATA={{.fleet_metadata}}" - name: flanneld.service dropins: - name: 40-ExecStartPre-symlink.conf diff --git a/examples/ignition/k8s-worker.yaml b/examples/ignition/k8s-worker.yaml index 4f93f745..b584705d 100644 --- a/examples/ignition/k8s-worker.yaml +++ b/examples/ignition/k8s-worker.yaml @@ -14,13 +14,6 @@ systemd: Environment="ETCD_LISTEN_PEER_URLS=http://{{.ipv4_address}}:2380" Environment="ETCD_INITIAL_CLUSTER={{.etcd_initial_cluster}}" Environment="ETCD_STRICT_RECONFIG_CHECK=true" - - name: fleet.service - enable: true - dropins: - - name: 40-fleet-metadata.conf - contents: | - [Service] - Environment="FLEET_METADATA={{.fleet_metadata}}" - name: flanneld.service dropins: - name: 40-ExecStartPre-symlink.conf