Skip to content
This repository was archived by the owner on Oct 31, 2019. It is now read-only.

Commit dd4cb7a

Browse files
authored
Merge pull request #14 from oracle/jlamillan/kubernetes_1_7_4
Update version of Kubernetes to v1.7.4
2 parents 5b0295e + fd19cf2 commit dd4cb7a

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ name | default | description
234234
docker_ver | 17.03 | Version of Docker to install
235235
etcd_ver | v3.2.2 | Version of etcd to install
236236
flannel_ver | v0.7.1 | Version of Flannel to install
237-
k8s_ver | 1.7.0 | Version of K8s to install (master and workers)
237+
k8s_ver | 1.7.4 | Version of K8s to install (master and workers)
238238
k8s_dns_ver | 1.14.2 | Version of Kube DNS to install
239239
k8s_dashboard_ver | 1.6.3 | Version of Kubernetes dashboard to install
240240
instance_os_ver | 16.04 | Version of Ubuntu operating system
@@ -357,7 +357,7 @@ See [CONTRIBUTING](CONTRIBUTING.md) for details.
357357
* flannel - (default v0.7.1)
358358
* docker - (default 17.03.0-ce)
359359
* apt-transport-https - (default 1.2.20)
360-
* kubernetes - (default v1.7.0)
360+
* kubernetes - (default v1.7.4)
361361
* master(s) (`kube-apiserver`, `kube-controller-manager`, `kube-scheduler`, `kubernetes-cni`, `kubectl`)
362362
* worker(s) (`kubelet`, `kube-proxy`, `kubernetes-cni`, `kubectl`)
363363
* cluster add-ons: (`dashboard`, `kube-DNS`)

instances/k8smaster/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ variable "flannel_ver" {
3939

4040
# Kubernetes
4141
variable "k8s_ver" {
42-
default = "1.7.0"
42+
default = "1.7.4"
4343
}
4444

4545
variable "k8s_dashboard_ver" {

instances/k8sworker/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ variable "flannel_ver" {
4646
variable "master_lb" {}
4747

4848
variable "k8s_ver" {
49-
default = "1.7.0"
49+
default = "1.7.4"
5050
}
5151

5252
variable "root_ca_pem" {}

variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ variable "flannel_ver" {
192192
}
193193

194194
variable "k8s_ver" {
195-
default = "1.7.0"
195+
default = "1.7.4"
196196
}
197197

198198
variable "k8s_dashboard_ver" {

0 commit comments

Comments
 (0)