Skip to content

Commit 863fc40

Browse files
authored
Merge pull request #848 from ExpediaDotCom/kops_ami
Kops k8s ami upgrade from deprecated 1.8 -> 1.9
2 parents 139cb88 + 4a505bf commit 863fc40

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

deployment/terraform/cluster/aws/infrastructure/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ variable "kops_kubernetes" {
133133
monitoring-nodes_instance_count = 2
134134
monitoring-nodes_instance_volume = 128
135135
k8s_version = "1.8.6"
136-
node_ami = "ami-7ee37206"
137-
master_ami = "ami-7ee37206"
136+
node_ami = "ami-070a2702b64c27a51"
137+
master_ami = "ami-070a2702b64c27a51"
138138
}
139139
}
140140

deployment/terraform/modules/k8s-cluster/aws/kops/templates/cluster.tpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ metadata:
8989
name: master-${aws_zone}-1
9090
spec:
9191
associatePublicIp: false
92-
image: kope.io/k8s-1.8-debian-stretch-amd64-hvm-ebs-2018-03-11
92+
image: kope.io/k8s-1.9-debian-stretch-amd64-hvm-ebs-2018-08-17
9393
machineType: ${master_instance_type}
9494
maxSize: 1
9595
minSize: 1
@@ -112,7 +112,7 @@ metadata:
112112
name: master-${aws_zone}-2
113113
spec:
114114
associatePublicIp: false
115-
image: kope.io/k8s-1.8-debian-stretch-amd64-hvm-ebs-2018-03-11
115+
image: kope.io/k8s-1.9-debian-stretch-amd64-hvm-ebs-2018-08-17
116116
machineType: ${master_instance_type}
117117
maxSize: 1
118118
minSize: 1
@@ -135,7 +135,7 @@ metadata:
135135
name: master-${aws_zone}-3
136136
spec:
137137
associatePublicIp: false
138-
image: kope.io/k8s-1.8-debian-stretch-amd64-hvm-ebs-2018-03-11
138+
image: kope.io/k8s-1.9-debian-stretch-amd64-hvm-ebs-2018-08-17
139139
machineType: ${master_instance_type}
140140
maxSize: 1
141141
minSize: 1
@@ -158,7 +158,7 @@ metadata:
158158
name: app-nodes
159159
spec:
160160
associatePublicIp: false
161-
image: kope.io/k8s-1.8-debian-stretch-amd64-hvm-ebs-2018-03-11
161+
image: kope.io/k8s-1.9-debian-stretch-amd64-hvm-ebs-2018-08-17
162162
machineType: ${app-nodes_instance_type}
163163
maxSize: ${app-nodes_instance_count}
164164
minSize: ${app-nodes_instance_count}
@@ -181,7 +181,7 @@ metadata:
181181
name: monitoring-nodes
182182
spec:
183183
associatePublicIp: false
184-
image: kope.io/k8s-1.8-debian-stretch-amd64-hvm-ebs-2018-08-17
184+
image: kope.io/k8s-1.9-debian-stretch-amd64-hvm-ebs-2018-08-17
185185
machineType: ${monitoring-node_instance_type}
186186
maxSize: ${monitoring-node_instance_count}
187187
minSize: ${monitoring-node_instance_count}

0 commit comments

Comments
 (0)