Skip to content

Commit

Permalink
Update Calico and Kubernetes
Browse files Browse the repository at this point in the history
  • Loading branch information
scholzj committed Mar 31, 2018
1 parent ed70ae5 commit 93e459e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ AWS Kubernetes is a Kubernetes cluster deployed using [Kubeadm](https://kubernet

## Updates

* *31.3.2018:* Update to Kubernetes 1.10.0, update Calico networking and update Kubernetes Dahsboard, Cluster Autoscaler, Ingress and Heapster addons
* *24.3.2018:* Update to Kubernetes 1.9.6
* *17.3.2018:* Update to Kubernetes 1.9.4
* *11.3.2018:* Fix further issues with Cluster Autoscaler
Expand Down
16 changes: 8 additions & 8 deletions scripts/calico.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Calico Version v3.0.1
# https://docs.projectcalico.org/v3.0/releases#v3.0.1
# Calico Version v3.0.4
# https://docs.projectcalico.org/v3.0/releases#v3.0.4
# This manifest includes the following component versions:
# calico/node:v3.0.1
# calico/cni:v2.0.0
# calico/kube-controllers:v2.0.0
# calico/node:v3.0.4
# calico/cni:v2.0.3
# calico/kube-controllers:v2.0.2

# This ConfigMap is used to configure a self-hosted Calico installation.
kind: ConfigMap
Expand Down Expand Up @@ -188,7 +188,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: quay.io/calico/node:v3.0.1
image: quay.io/calico/node:v3.0.4
env:
# The location of the Calico etcd cluster.
- name: ETCD_ENDPOINTS
Expand Down Expand Up @@ -262,7 +262,7 @@ spec:
# This container installs the Calico CNI binaries
# and CNI network config file on each node.
- name: install-cni
image: quay.io/calico/cni:v2.0.0
image: quay.io/calico/cni:v2.0.3
command: ["/install-cni.sh"]
env:
# Name of the CNI config file to create.
Expand Down Expand Up @@ -347,7 +347,7 @@ spec:
serviceAccountName: calico-kube-controllers
containers:
- name: calico-kube-controllers
image: quay.io/calico/kube-controllers:v2.0.0
image: quay.io/calico/kube-controllers:v2.0.2
env:
# The location of the Calico etcd cluster.
- name: ETCD_ENDPOINTS
Expand Down
2 changes: 1 addition & 1 deletion scripts/init-aws-kubernetes-master.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export ASG_MAX_NODES="${asg_max_nodes}"
export AWS_REGION=${aws_region}
export AWS_SUBNETS="${aws_subnets}"
export ADDONS="${addons}"
export KUBERNETES_VERSION="1.9.6"
export KUBERNETES_VERSION="1.10.0"

# Set this only after setting the defaults
set -o nounset
Expand Down
2 changes: 1 addition & 1 deletion scripts/init-aws-kubernetes-node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -o pipefail

export KUBEADM_TOKEN=${kubeadm_token}
export DNS_NAME=${dns_name}
export KUBERNETES_VERSION="1.9.6"
export KUBERNETES_VERSION="1.10.0"

# Set this only after setting the defaults
set -o nounset
Expand Down

0 comments on commit 93e459e

Please sign in to comment.