fix flaky cluster by letting etcd persist. Add kubernetes service ip …

…as a SAN. Let kubelet restart. Add set-kubeconfig helper for configuring kubeconfig after deployment. Add note about extra-sans-ip being unused.
kubernetes-retired · Jun 14, 2016 · f56f5e2 · f56f5e2
1 parent 48df5cf
commit f56f5e2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/min-turnup/Makefile b/min-turnup/Makefile
@@ -54,6 +54,10 @@ menuconfig: .tmp/mconf
 echo-config: .config.json
 	cat $<
 
+set-kubeconfig:
+	kubectl config  set-cluster $(CLUSTER_NAME) --server https://$(MASTER_IP):443 --certificate-authority=phase1b/crypto/ca.pem --embed-certs=true
+	kubectl config set-credentials $(CLUSTER_NAME) --server https://$(MASTER_IP):443 --client-certificate=./phase1b/crypto/kubelet.pem --client-key=./phase1b/crypto/kubelet-key.pem --embed-certs=true
+	kubectl config set-context $(CLUSTER_NAME) --cluster $(CLUSTER_NAME) --user $(CLUSTER_NAME)
 
 clean:
 	rm -rf .tmp

diff --git a/min-turnup/README-azure b/min-turnup/README-azure
@@ -10,3 +10,4 @@ Other things:
 
 1. This copies root ca private key to the nodes which is not needed
 
+2. I don't see `config.phase2.extra-api-sans` being used anywhere...
diff --git a/min-turnup/phase1/azure/lib/azure.jsonnet b/min-turnup/phase1/azure/lib/azure.jsonnet
@@ -5,7 +5,7 @@ function(cfg1)
 		resource_group: "%(instance_prefix)s" % cfg,
 		master_public_ip: "%(instance_prefix)s-master-pip" % cfg,
 		availability_set: "%(instance_prefix)s-as" % cfg,
-		storage_account: "%(instance_prefix)sstrg" % cfg,
+		storage_account: "${replace(\"%(instance_prefix)sstrg\", \"-\", \"\")}" % cfg,
 		storage_container: "kube0000%(instance_prefix)s" % cfg,
 		vnet: "%(instance_prefix)s-vnet" % cfg,
 		subnet: "%(instance_prefix)s-subnet" % cfg,
@@ -137,7 +137,8 @@ function(cfg1)
 								DNS.4 = kubernetes.default.svc.cluster.local
 								DNS.5 = names.master_vm
 								IP.1 = ${azurerm_public_ip.pip.ip_address}
-								IP.2 = %s
+								IP.2 = 10.3.0.1
+								IP.3 = %s
 								EOF
 							||| % master_private_ip
 						}

diff --git a/min-turnup/phase2/ansible/playbooks/roles/master/templates/etcd.json.j2 b/min-turnup/phase2/ansible/playbooks/roles/master/templates/etcd.json.j2
@@ -20,7 +20,8 @@
           "/usr/local/bin/etcd",
           "--listen-peer-urls=http://127.0.0.1:2380",
           "--addr=127.0.0.1:2379",
-          "--bind-addr=127.0.0.1:2379"
+          "--bind-addr=127.0.0.1:2379",
+          "--data-dir=/var/lib/etcd/data"
         ],
         "livenessProbe": {
           "httpGet": {
@@ -42,8 +43,22 @@
             "containerPort": 2379,
             "hostPort": 2379
           }
+        ],
+        "volumeMounts": [
+          {
+            "name": "varetcd",
+            "mountPath": "/var/lib/etcd"
+          }
         ]
       }
+    ],
+    "volumes": [
+      {
+        "name": "varetcd",
+        "hostPath": {
+          "path": "/var/lib/etcd"
+        }
+      }
     ]
   }
 }
diff --git a/min-turnup/phase2/ansible/playbooks/roles/node/templates/kubelet.service.j2 b/min-turnup/phase2/ansible/playbooks/roles/node/templates/kubelet.service.j2
@@ -40,8 +40,8 @@ ExecStart=/usr/bin/docker run \
             --cluster-dns=10.3.0.10 \
             --cluster-domain=cluster.local \
             --v=9
-#Restart=always
-#KillMode=process
+Restart=always
+KillMode=process
 
 [Install]
 WantedBy=multi-user.target