Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit c439f68

Browse files
dghubblerphillips
authored andcommitted
Update Kubernetes from v1.11.3 to v1.12.1 (#1003)
* Workaround kubernetes/kubernetes#68973 by providing an emptyDir for auto-generated certs
1 parent 4095668 commit c439f68

File tree

7 files changed

+10
-6
lines changed

7 files changed

+10
-6
lines changed

hack/jenkins/scripts/conformance.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euo pipefail
33

44
export KUBECONFIG="${KUBECONFIG:-"${DIR}/../../quickstart/cluster/auth/kubeconfig"}"
5-
export KUBERNETES_VERSION="v1.11.2"
5+
export KUBERNETES_VERSION="v1.12.1"
66

77
# Set up kubectl
88
curl -L -O -v https://storage.googleapis.com/kubernetes-release/release/$KUBERNETES_VERSION/bin/linux/amd64/kubectl

hack/multi-node/user-data.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ coreos:
99
[Service]
1010
EnvironmentFile=/etc/environment
1111
Environment=KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
12-
Environment=KUBELET_IMAGE_TAG=v1.11.2
12+
Environment=KUBELET_IMAGE_TAG=v1.12.1
1313
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
1414
--volume var-lib-cni,kind=host,source=/var/lib/cni \
1515
--volume var-lib-kubelet,kind=host,source=/var/lib/kubelet \

hack/quickstart/kubelet.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Service]
22
EnvironmentFile=-/etc/kubernetes/kubelet.env
33
Environment=KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
4-
Environment=KUBELET_IMAGE_TAG=v1.11.2
4+
Environment=KUBELET_IMAGE_TAG=v1.12.1
55
Environment=KUBELET_MINIMUM_CONTAINER_TTL_DURATION=3m0s
66
Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS=-1
77
Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS_PER_CONTAINER=1

hack/single-node/user-data.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ coreos:
99
[Service]
1010
EnvironmentFile=/etc/environment
1111
Environment=KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
12-
Environment=KUBELET_IMAGE_TAG=v1.11.2
12+
Environment=KUBELET_IMAGE_TAG=v1.12.1
1313
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
1414
--volume var-lib-cni,kind=host,source=/var/lib/cni \
1515
--volume var-lib-kubelet,kind=host,source=/var/lib/kubelet \

hack/tests/conformance-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euo pipefail
33

44
CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/kubernetes/kubernetes}
5-
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.11.2}
5+
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.12.1}
66

77
usage() {
88
echo "USAGE:"

pkg/asset/images.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ var DefaultImages = ImageVersions{
88
Calico: "quay.io/calico/node:v3.0.3",
99
CalicoCNI: "quay.io/calico/cni:v2.0.0",
1010
CoreDNS: "k8s.gcr.io/coredns:1.1.3",
11-
Hyperkube: "k8s.gcr.io/hyperkube:v1.11.2",
11+
Hyperkube: "k8s.gcr.io/hyperkube:v1.12.1",
1212
PodCheckpointer: "quay.io/coreos/pod-checkpointer:018007e77ccd61e8e59b7e15d7fc5e318a5a2682",
1313
}

pkg/asset/internal/templates.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,8 @@ spec:
433433
initialDelaySeconds: 15
434434
timeoutSeconds: 15
435435
volumeMounts:
436+
- name: var-run-kubernetes
437+
mountPath: /var/run/kubernetes
436438
- name: secrets
437439
mountPath: /etc/kubernetes/secrets
438440
readOnly: true
@@ -450,6 +452,8 @@ spec:
450452
operator: Exists
451453
effect: NoSchedule
452454
volumes:
455+
- name: var-run-kubernetes
456+
emptyDir: {}
453457
- name: secrets
454458
secret:
455459
secretName: kube-controller-manager

0 commit comments

Comments
 (0)