Browse Source

tweaked zone definitions again

Shane 7 years ago
parent
commit
9690ccb61c
4 changed files with 4 additions and 4 deletions
  1. 1 1
      zones/k8s-master.json
  2. 1 1
      zones/k8s-worker1.json
  3. 1 1
      zones/k8s-worker2.json
  4. 1 1
      zones/k8s-worker3.json

+ 1 - 1
zones/k8s-master.json

@@ -27,6 +27,6 @@
   ],
   "customer_metadata": {
     "root_authorized_keys": "ssh-rsa AAAA......",
-    "cloud-init:user-data": "#cloud-config\n\nresolv_conf:\n  nameservers: ['10.40.0.1', '8.8.8.8']\n\nruncmd:\n - curl -s \"https://packages.cloud.google.com/apt/doc/apt-key.gpg\" | apt-key add -\n - echo 'deb http://apt.kubernetes.io/ kubernetes-yakkety main' >/etc/apt/sources.list.d/kubernetes.list\n - apt-get update\n - apt-get upgrade -y\n - apt-get install -y docker.io\n - apt-get install -y kubelet kubeadm kubectl\n - systemctl enable docker\n - systemctl start docker\n - echo 'net.bridge.bridge-nf-call-iptables=1' >>/etc/sysctl.conf\n - sysctl -p\n - swapoff -a\n - kubeadm init"
+    "cloud-init:user-data": "#cloud-config\n\nresolv_conf:\n  nameservers: ['8.8.8.8']\n\nruncmd:\n - curl -s \"https://packages.cloud.google.com/apt/doc/apt-key.gpg\" | apt-key add -\n - echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' >/etc/apt/sources.list.d/kubernetes.list\n - apt-get update\n - apt-get upgrade -y\n - apt-get install -y docker.io\n - apt-get install -y kubelet kubeadm kubectl\n - systemctl enable docker\n - systemctl start docker\n - echo 'net.bridge.bridge-nf-call-iptables=1' >>/etc/sysctl.conf\n - sysctl -p\n - swapoff -a\n - kubeadm init"
   }
 }

+ 1 - 1
zones/k8s-worker1.json

@@ -27,6 +27,6 @@
   ],
   "customer_metadata": {
     "root_authorized_keys": "ssh-rsa AAAA......",
-    "cloud-init:user-data": "#cloud-config\n\nresolv_conf:\n  nameservers: ['10.40.0.1', '8.8.8.8']\n\nruncmd:\n - curl -s \"https://packages.cloud.google.com/apt/doc/apt-key.gpg\" | apt-key add -\n - echo 'deb http://apt.kubernetes.io/ kubernetes-yakkety main' >/etc/apt/sources.list.d/kubernetes.list\n - apt-get update\n - apt-get upgrade -y\n - apt-get install -y docker.io\n - apt-get install -y kubelet kubeadm kubectl\n - systemctl enable docker\n - systemctl start docker\n - echo 'net.bridge.bridge-nf-call-iptables=1' >>/etc/sysctl.conf\n - sysctl -p"
+    "cloud-init:user-data": "#cloud-config\n\nresolv_conf:\n  nameservers: ['8.8.8.8']\n\nruncmd:\n - curl -s \"https://packages.cloud.google.com/apt/doc/apt-key.gpg\" | apt-key add -\n - echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' >/etc/apt/sources.list.d/kubernetes.list\n - apt-get update\n - apt-get upgrade -y\n - apt-get install -y docker.io\n - apt-get install -y kubelet kubeadm kubectl\n - systemctl enable docker\n - systemctl start docker\n - echo 'net.bridge.bridge-nf-call-iptables=1' >>/etc/sysctl.conf\n - sysctl -p"
   }
 }

+ 1 - 1
zones/k8s-worker2.json

@@ -27,6 +27,6 @@
   ],
   "customer_metadata": {
     "root_authorized_keys": "ssh-rsa AAAA......",
-    "cloud-init:user-data": "#cloud-config\n\nresolv_conf:\n  nameservers: ['10.40.0.1', '8.8.8.8']\n\nruncmd:\n - curl -s \"https://packages.cloud.google.com/apt/doc/apt-key.gpg\" | apt-key add -\n - echo 'deb http://apt.kubernetes.io/ kubernetes-yakkety main' >/etc/apt/sources.list.d/kubernetes.list\n - apt-get update\n - apt-get upgrade -y\n - apt-get install -y docker.io\n - apt-get install -y kubelet kubeadm kubectl\n - systemctl enable docker\n - systemctl start docker\n - echo 'net.bridge.bridge-nf-call-iptables=1' >>/etc/sysctl.conf\n - sysctl -p"
+    "cloud-init:user-data": "#cloud-config\n\nresolv_conf:\n  nameservers: ['8.8.8.8']\n\nruncmd:\n - curl -s \"https://packages.cloud.google.com/apt/doc/apt-key.gpg\" | apt-key add -\n - echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' >/etc/apt/sources.list.d/kubernetes.list\n - apt-get update\n - apt-get upgrade -y\n - apt-get install -y docker.io\n - apt-get install -y kubelet kubeadm kubectl\n - systemctl enable docker\n - systemctl start docker\n - echo 'net.bridge.bridge-nf-call-iptables=1' >>/etc/sysctl.conf\n - sysctl -p"
   }
 }

+ 1 - 1
zones/k8s-worker3.json

@@ -27,6 +27,6 @@
   ],
   "customer_metadata": {
     "root_authorized_keys": "ssh-rsa AAAA......",
-    "cloud-init:user-data": "#cloud-config\n\nresolv_conf:\n  nameservers: ['10.40.0.1', '8.8.8.8']\n\nruncmd:\n - curl -s \"https://packages.cloud.google.com/apt/doc/apt-key.gpg\" | apt-key add -\n - echo 'deb http://apt.kubernetes.io/ kubernetes-yakkety main' >/etc/apt/sources.list.d/kubernetes.list\n - apt-get update\n - apt-get upgrade -y\n - apt-get install -y docker.io\n - apt-get install -y kubelet kubeadm kubectl\n - systemctl enable docker\n - systemctl start docker\n - echo 'net.bridge.bridge-nf-call-iptables=1' >>/etc/sysctl.conf\n - sysctl -p"
+    "cloud-init:user-data": "#cloud-config\n\nresolv_conf:\n  nameservers: ['8.8.8.8']\n\nruncmd:\n - curl -s \"https://packages.cloud.google.com/apt/doc/apt-key.gpg\" | apt-key add -\n - echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' >/etc/apt/sources.list.d/kubernetes.list\n - apt-get update\n - apt-get upgrade -y\n - apt-get install -y docker.io\n - apt-get install -y kubelet kubeadm kubectl\n - systemctl enable docker\n - systemctl start docker\n - echo 'net.bridge.bridge-nf-call-iptables=1' >>/etc/sysctl.conf\n - sysctl -p"
   }
 }