bump to 1.10.0

kubernetes-retired · Apr 5, 2018 · ddb64f6 · ddb64f6
1 parent 588a621
commit ddb64f6
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 18 deletions.
diff --git a/hack/multi-node/user-data.sample b/hack/multi-node/user-data.sample
@@ -9,7 +9,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
-        Environment=KUBELET_IMAGE_TAG=v1.9.6
+        Environment=KUBELET_IMAGE_TAG=v1.10.0
         Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
           --volume var-lib-cni,kind=host,source=/var/lib/cni \
           --volume var-lib-kubelet,kind=host,source=/var/lib/kubelet \

diff --git a/hack/quickstart/kubelet.master b/hack/quickstart/kubelet.master
@@ -1,6 +1,6 @@
 [Service]
 Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
-Environment=KUBELET_IMAGE_TAG=v1.9.6
+Environment=KUBELET_IMAGE_TAG=v1.10.0
 Environment=KUBELET_MINIMUM_CONTAINER_TTL_DURATION=3m0s
 Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS=-1
 Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS_PER_CONTAINER=1

diff --git a/hack/quickstart/kubelet.worker b/hack/quickstart/kubelet.worker
@@ -1,6 +1,6 @@
 [Service]
 Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
-Environment=KUBELET_IMAGE_TAG=v1.9.6
+Environment=KUBELET_IMAGE_TAG=v1.10.0
 Environment=KUBELET_MINIMUM_CONTAINER_TTL_DURATION=3m0s
 Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS=-1
 Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS_PER_CONTAINER=1

diff --git a/hack/single-node/user-data.sample b/hack/single-node/user-data.sample
@@ -9,7 +9,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
-        Environment=KUBELET_IMAGE_TAG=v1.9.6
+        Environment=KUBELET_IMAGE_TAG=v1.10.0
         Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
           --volume var-lib-cni,kind=host,source=/var/lib/cni \
           --volume var-lib-kubelet,kind=host,source=/var/lib/kubelet \

diff --git a/hack/terraform-quickstart/main.tf b/hack/terraform-quickstart/main.tf
@@ -1,3 +1,9 @@
+locals {
+  default_keys   = ["Name", "kubernetes.io/cluster/${var.kubernetes_id}"]
+  default_values = ["${var.resource_owner}", true]
+  default_tags   = "${zipmap(local.default_keys, local.default_values)}"
+}
+
 provider "aws" {
   access_key = "${var.access_key_id}"
   secret_key = "${var.access_key}"
@@ -21,9 +27,7 @@ resource "aws_instance" "bootstrap_node" {
   associate_public_ip_address = true
   depends_on                  = ["aws_internet_gateway.main"]
 
-  tags {
-    Name = "${var.resource_owner}"
-  }
+  tags = "${local.default_tags}"
 
   root_block_device {
     volume_type = "gp2"
@@ -64,9 +68,7 @@ resource "aws_instance" "worker_node" {
   associate_public_ip_address = true
   depends_on                  = ["aws_internet_gateway.main"]
 
-  tags {
-    Name = "${var.resource_owner}"
-  }
+  tags = "${local.default_tags}"
 
   root_block_device {
     volume_type = "gp2"
@@ -107,9 +109,7 @@ resource "aws_instance" "master_node" {
   associate_public_ip_address = true
   depends_on                  = ["aws_internet_gateway.main"]
 
-  tags {
-    Name = "${var.resource_owner}"
-  }
+  tags = "${local.default_tags}"
 
   root_block_device {
     volume_type = "gp2"

diff --git a/hack/terraform-quickstart/variables.tf b/hack/terraform-quickstart/variables.tf
@@ -6,6 +6,11 @@ variable "access_key" {
   type = "string"
 }
 
+variable "kubernetes_id" {
+  description = "ID of the kubernetes cluster"
+  type        = "string"
+}
+
 variable "ssh_public_key" {
   description = "SSH Public Key"
   type        = "string"

diff --git a/hack/tests/conformance-test.sh b/hack/tests/conformance-test.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/kubernetes/kubernetes}
-CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.9.6}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.10.0}
 
 usage() {
     echo "USAGE:"

diff --git a/pkg/asset/images.go b/pkg/asset/images.go
@@ -7,7 +7,7 @@ var DefaultImages = ImageVersions{
 	FlannelCNI:      "quay.io/coreos/flannel-cni:v0.3.0",
 	Calico:          "quay.io/calico/node:v3.0.3",
 	CalicoCNI:       "quay.io/calico/cni:v2.0.0",
-	Hyperkube:       "gcr.io/google_containers/hyperkube:v1.9.6",
+	Hyperkube:       "gcr.io/google_containers/hyperkube:v1.10.0",
 	KubeDNS:         "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8",
 	KubeDNSMasq:     "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8",
 	KubeDNSSidecar:  "gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8",

diff --git a/pkg/asset/internal/templates.go b/pkg/asset/internal/templates.go
@@ -219,28 +219,26 @@ spec:
     command:
     - /hyperkube
     - apiserver
-    - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ValidatingAdmissionWebhook,ResourceQuota,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook
     - --advertise-address=$(POD_IP)
     - --allow-privileged=true
     - --authorization-mode=Node,RBAC
     - --bind-address=0.0.0.0
     - --client-ca-file=/etc/kubernetes/secrets/ca.crt
+    - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultTolerationSeconds,DefaultStorageClass,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota
     - --enable-bootstrap-token-auth=true
 {{- if .EtcdUseTLS }}
     - --etcd-cafile=/etc/kubernetes/secrets/etcd-client-ca.crt
     - --etcd-certfile=/etc/kubernetes/secrets/etcd-client.crt
     - --etcd-keyfile=/etc/kubernetes/secrets/etcd-client.key
 {{- end }}
     - --etcd-servers={{ range $i, $e := .EtcdServers }}{{ if $i }},{{end}}{{ $e }}{{end}}
-    - --insecure-port=0
     - --kubelet-client-certificate=/etc/kubernetes/secrets/apiserver.crt
     - --kubelet-client-key=/etc/kubernetes/secrets/apiserver.key
     - --secure-port={{ (index .APIServers 0).Port }}
     - --service-account-key-file=/etc/kubernetes/secrets/service-account.pub
     - --service-cluster-ip-range={{ .ServiceCIDR }}
     - --cloud-provider={{ .CloudProvider }}
     - --storage-backend=etcd3
-    - --tls-ca-file=/etc/kubernetes/secrets/ca.crt
     - --tls-cert-file=/etc/kubernetes/secrets/apiserver.crt
     - --tls-private-key-file=/etc/kubernetes/secrets/apiserver.key
     env: