Skip to content

Commit

Permalink
Update Kubernetes from v1.11.3 to v1.12.1
Browse files Browse the repository at this point in the history
* Mount an empty dir for the controller-manager to work around
kubernetes/kubernetes#68973
* Use a patched pod-checkpointer that strips affinity from
checkpointed pod manifests. Kubernetes v1.12.0-rc.1 introduced
a default affinity that appears on checkpointed manifests; but
it prevented scheduling and checkpointed pods should not have an
affinity, they're run directly by the Kubelet on the local node
* kubernetes-retired/bootkube#1001
* kubernetes/kubernetes#68173
  • Loading branch information
dghubble committed Oct 14, 2018
1 parent 2437023 commit 4340ec4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions resources/manifests/kube-controller-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ spec:
initialDelaySeconds: 15
timeoutSeconds: 15
volumeMounts:
- name: var-run-kubernetes
mountPath: /var/run/kubernetes
- name: secrets
mountPath: /etc/kubernetes/secrets
readOnly: true
Expand All @@ -79,6 +81,8 @@ spec:
operator: Exists
effect: NoSchedule
volumes:
- name: var-run-kubernetes
emptyDir: {}
- name: secrets
secret:
secretName: kube-controller-manager
Expand Down
4 changes: 2 additions & 2 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ variable "container_images" {
calico_cni = "quay.io/calico/cni:v3.2.3"
flannel = "quay.io/coreos/flannel:v0.10.0-amd64"
flannel_cni = "quay.io/coreos/flannel-cni:v0.3.0"
hyperkube = "k8s.gcr.io/hyperkube:v1.11.3"
hyperkube = "k8s.gcr.io/hyperkube:v1.12.1"
coredns = "k8s.gcr.io/coredns:1.2.2"
pod_checkpointer = "quay.io/coreos/pod-checkpointer:9dc83e1ab3bc36ca25c9f7c18ddef1b91d4a0558"
pod_checkpointer = "quay.io/dghubble/pod-checkpointer:966008d056125646559021663a2389f0f5d356a1"
}
}

Expand Down

0 comments on commit 4340ec4

Please sign in to comment.