Merge pull request #81 from aaronlevy/1.3.0

Bump version v1.3.0_coreos.1

Author: aaronlevy

Makefile

@@ -50,7 +50,7 @@ conformance-%: clean all
 
 # This will naively try and create a vendor dir from a k8s release
 # USE: make vendor VENDOR_VERSION=vX.Y.Z
-VENDOR_VERSION = v1.3.0-beta.2
+VENDOR_VERSION = v1.3.0
 vendor: vendor-$(VENDOR_VERSION)
 
 vendor-$(VENDOR_VERSION):

hack/multi-node/user-data.sample

@@ -26,7 +26,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-        Environment=KUBELET_VERSION=v1.3.0-beta.2_coreos.0
+        Environment=KUBELET_VERSION=v1.3.0_coreos.1
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
         ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets

hack/quickstart/kubelet.master

@@ -4,7 +4,7 @@ After=docker.service etcd2.service flanneld.service
 
 [Service]
 Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-Environment=KUBELET_VERSION=v1.3.0-beta.2_coreos.0
+Environment=KUBELET_VERSION=v1.3.0_coreos.1
 EnvironmentFile=/etc/environment
 
 ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests

hack/quickstart/kubelet.worker

@@ -4,7 +4,7 @@ After=docker.service flanneld.service
 
 [Service]
 Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-Environment=KUBELET_VERSION=v1.3.0-beta.2_coreos.0
+Environment=KUBELET_VERSION=v1.3.0_coreos.1
 EnvironmentFile=/etc/environment
 
 ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests

hack/single-node/user-data.sample

@@ -27,7 +27,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-        Environment=KUBELET_VERSION=v1.3.0-beta.2_coreos.0
+        Environment=KUBELET_VERSION=v1.3.0_coreos.1
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
         ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets

hack/tests/conformance-test.sh

@@ -3,7 +3,8 @@ set -euo pipefail
 
 CHECK_NODE_COUNT=${CHECK_NODE_COUNT:-true}
 CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes}
-CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.3.0-beta.2+coreos.0}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.3.0+coreos.1}
+TEST_ARGS=${TEST_ARGS:-"--ginkgo.focus='\[Conformance\]' --ginkgo.skip='\[Flaky\]|\[Feature:.+\]'"}
 
 usage() {
     echo "USAGE:"
@@ -34,7 +35,7 @@ RKT_OPTS=$(echo \
 # Init steps necessary to run conformance in docker://golang:1.6.2 container
 INIT="apt-get update && apt-get install -y rsync"
 
-TEST_FLAGS="-v --test -check_version_skew=false -check_node_count=${CHECK_NODE_COUNT} --test_args=\"ginkgo.focus='\[Conformance\]'\""
+TEST_FLAGS="-v --test -check_version_skew=false -check_node_count=${CHECK_NODE_COUNT} --test_args=\"${TEST_ARGS}\""
 
 CONFORMANCE=$(echo \
     "cd /go/src/k8s.io/kubernetes && " \

pkg/asset/internal/templates.go

@@ -5,13 +5,13 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: kube-apiserver
-    version: v1.3.0-beta.2
+    version: v1.3.0_coreos.1
 spec:
   template:
     metadata:
       labels:
         k8s-app: kube-apiserver
-        version: v1.3.0-beta.2
+        version: v1.3.0_coreos.1
     spec:
       nodeSelector:
         master: "true"
@@ -25,7 +25,7 @@ spec:
         - mountPath: /etc/kubernetes/manifests
           name: etc-k8s-manifests
       - name: kube-apiserver
-        image: quay.io/coreos/hyperkube:v1.3.0-beta.2_coreos.0
+        image: quay.io/coreos/hyperkube:v1.3.0_coreos.1
         command:
         - /hyperkube
         - apiserver

pkg/asset/templates/kube-apiserver.yaml

@@ -5,17 +5,17 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: kube-controller-manager
-    version: v1.3.0-beta.2
+    version: v1.3.0_coreos.1
 spec:
   template:
     metadata:
       labels:
         k8s-app: kube-controller-manager
-        version: v1.3.0-beta.2
+        version: v1.3.0_coreos.1
     spec:
       containers:
       - name: kube-controller-manager
-        image: quay.io/coreos/hyperkube:v1.3.0-beta.2_coreos.0
+        image: quay.io/coreos/hyperkube:v1.3.0_coreos.1
         command:
         - ./hyperkube
         - controller-manager

pkg/asset/templates/kube-controller-manager.yaml

@@ -5,18 +5,18 @@ metadata:
   namespace: kube-system
   labels:
     k8s_app: kube-proxy
-    version: v1.3.0-beta.2
+    version: v1.3.0_coreos.1
 spec:
   template:
     metadata:
       labels:
         k8s_app: kube-proxy
-        version: v1.3.0-beta.2
+        version: v1.3.0_coreos.1
     spec:
       hostNetwork: true
       containers:
       - name: kube-proxy
-        image: quay.io/coreos/hyperkube:v1.3.0-beta.2_coreos.0
+        image: quay.io/coreos/hyperkube:v1.3.0_coreos.0
         command:
         - /hyperkube
         - proxy