Skip to content
This repository has been archived by the owner on Apr 29, 2019. It is now read-only.

Commit

Permalink
Bump Kubernetes to v1.10.2
Browse files Browse the repository at this point in the history
Signed-off-by: Paulo Pires <pjpires@gmail.com>
  • Loading branch information
pires committed May 9, 2018
1 parent 3bb306d commit 4b07cf8
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ Most aspects of your cluster setup can be customized with environment variables.

- **KUBERNETES_VERSION** defines the specific kubernetes version being used.

Defaults to `1.9.7`.
Versions prior to `1.9.0` **may not work** with current cloud-configs and Kubernetes descriptors.
Defaults to `1.10.2`.
Versions prior to `1.10.0` **may not work** with current cloud-configs and Kubernetes descriptors.

- **USE_KUBE_UI** defines whether to deploy or not the Kubernetes UI

Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ DOCKERCFG = File.expand_path(ENV['DOCKERCFG'] || "~/.dockercfg")

DOCKER_OPTIONS = ENV['DOCKER_OPTIONS'] || ''

KUBERNETES_VERSION = ENV['KUBERNETES_VERSION'] || '1.9.7'
KUBERNETES_VERSION = ENV['KUBERNETES_VERSION'] || '1.10.2'

CHANNEL = ENV['CHANNEL'] || 'alpha'

Expand Down
3 changes: 1 addition & 2 deletions manifests/master-apiserver-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ spec:
command:
- /hyperkube
- apiserver
- --storage-media-type=application/json
- --bind-address=0.0.0.0
- --insecure-bind-address=0.0.0.0
- --etcd-servers=http://127.0.0.1:2379
Expand All @@ -20,7 +19,7 @@ spec:
- --service-cluster-ip-range=10.100.0.0/16
- --secure-port=443
- --advertise-address=__MASTER_IP__
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota
- --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota
- --tls-cert-file=/etc/kubernetes/ssl/apiserver.pem
- --tls-private-key-file=/etc/kubernetes/ssl/apiserver-key.pem
- --client-ca-file=/etc/kubernetes/ssl/ca.pem
Expand Down
3 changes: 1 addition & 2 deletions manifests/master-apiserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ spec:
command:
- /hyperkube
- apiserver
- --storage-media-type=application/json
- --bind-address=0.0.0.0
- --insecure-bind-address=0.0.0.0
- --etcd-servers=http://127.0.0.1:2379
Expand All @@ -20,7 +19,7 @@ spec:
- --service-cluster-ip-range=10.100.0.0/16
- --secure-port=443
- --advertise-address=__MASTER_IP__
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota
- --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota
- --tls-cert-file=/etc/kubernetes/ssl/apiserver.pem
- --tls-private-key-file=/etc/kubernetes/ssl/apiserver-key.pem
- --client-ca-file=/etc/kubernetes/ssl/ca.pem
Expand Down
2 changes: 1 addition & 1 deletion master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ coreos:
Description=etcd
Documentation=https://github.com/coreos/etcd
[Service]
Environment='ETCD_IMAGE_TAG=v3.1.8'
Environment='ETCD_IMAGE_TAG=v3.3.4'
Environment='ETCD_DATA_DIR=/var/lib/etcd'
Environment='ETCD_USER=etcd'
Type=notify
Expand Down
2 changes: 1 addition & 1 deletion plugins/dns/coredns/coredns.yaml.sed
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ spec:
operator: "Exists"
containers:
- name: coredns
image: coredns/coredns:1.0.2
image: coredns/coredns:1.1.2
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down

0 comments on commit 4b07cf8

Please sign in to comment.