Merge pull request #11 from cab105/master

Updated precooked k8s version to 1.2.0
skippbox · Mar 23, 2016 · d16e1e5 · d16e1e5
2 parents 6db2b9f + cb21e3b
commit d16e1e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,9 +16,9 @@ FROM boot2docker/boot2docker
 
 #Install Kubelet and Kubelet manifest
 
-ENV K8S_VERSION=v1.2.0-alpha.8
+ENV K8S_VERSION=v1.2.0
 
-RUN curl -fL -o $ROOTFS/usr/local/bin/kubelet https://storage.googleapis.com/kubernetes-release/release/v1.2.0-alpha.8/bin/linux/amd64/kubelet && \
+RUN curl -fL -o $ROOTFS/usr/local/bin/kubelet https://storage.googleapis.com/kubernetes-release/release/v1.2.0/bin/linux/amd64/kubelet && \
 	chmod +x $ROOTFS/usr/local/bin/kubelet
 
 #RUN mv kubelet /usr/bin/kubelet

diff --git a/kubernetes.yaml b/kubernetes.yaml
@@ -31,7 +31,7 @@ spec:
         - name: "policies"
           mountPath: "/etc/kubernetes/policies"
           readOnly: true
-      image: "gcr.io/google_containers/hyperkube-amd64:v1.2.0-alpha.8"
+      image: "gcr.io/google_containers/hyperkube-amd64:v1.2.0"
       args: 
         - "/hyperkube"
         - "apiserver"
@@ -45,7 +45,7 @@ spec:
         - name: "certs"
           mountPath: "/var/run/kubernetes"
           readOnly: true
-      image: "gcr.io/google_containers/hyperkube-amd64:v1.2.0-alpha.8"
+      image: "gcr.io/google_containers/hyperkube-amd64:v1.2.0"
       args: 
         - "/hyperkube"
         - "controller-manager"
@@ -56,7 +56,7 @@ spec:
         - name: "certs"
           mountPath: "/var/run/kubernetes"
           readOnly: true
-      image: "gcr.io/google_containers/hyperkube-amd64:v1.2.0-alpha.8"
+      image: "gcr.io/google_containers/hyperkube-amd64:v1.2.0"
       args:
         - "/hyperkube"
         - "scheduler"
@@ -67,7 +67,7 @@ spec:
         - name: "certs"
           mountPath: "/var/run/kubernetes"
           readOnly: true
-      image: "gcr.io/google_containers/hyperkube-amd64:v1.2.0-alpha.8"
+      image: "gcr.io/google_containers/hyperkube-amd64:v1.2.0"
       args:
         - "/hyperkube"
         - "proxy"