Skip to content

Commit 33782cb

Browse files
alpe5tefan
authored andcommitted
Extract hypercube version (kubernetes-digitalocean-terraform#16)
1 parent de188a3 commit 33782cb

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

01-master.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ write_files:
2727
ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests
2828
ExecStartPre=/usr/bin/mkdir -p /var/log/containers
2929
30-
Environment=KUBELET_VERSION=v1.3.6_coreos.0
30+
Environment=KUBELET_VERSION=${HYPERCUBE_VERSION}
3131
Environment="RKT_OPTS=--volume var-log,kind=host,source=/var/log \
3232
--mount volume=var-log,target=/var/log \
3333
--volume dns,kind=host,source=/etc/resolv.conf \
@@ -58,7 +58,7 @@ write_files:
5858
hostNetwork: true
5959
containers:
6060
- name: kube-apiserver
61-
image: quay.io/coreos/hyperkube:v1.3.6_coreos.0
61+
image: quay.io/coreos/hyperkube:${HYPERCUBE_VERSION}
6262
command:
6363
- /hyperkube
6464
- apiserver
@@ -110,7 +110,7 @@ write_files:
110110
hostNetwork: true
111111
containers:
112112
- name: kube-proxy
113-
image: quay.io/coreos/hyperkube:v1.3.6_coreos.0
113+
image: quay.io/coreos/hyperkube:${HYPERCUBE_VERSION}
114114
command:
115115
- /hyperkube
116116
- proxy
@@ -138,7 +138,7 @@ write_files:
138138
hostNetwork: true
139139
containers:
140140
- name: kube-controller-manager
141-
image: quay.io/coreos/hyperkube:v1.3.6_coreos.0
141+
image: quay.io/coreos/hyperkube:${HYPERCUBE_VERSION}
142142
command:
143143
- /hyperkube
144144
- controller-manager
@@ -179,7 +179,7 @@ write_files:
179179
hostNetwork: true
180180
containers:
181181
- name: kube-scheduler
182-
image: quay.io/coreos/hyperkube:v1.3.6_coreos.0
182+
image: quay.io/coreos/hyperkube:${HYPERCUBE_VERSION}
183183
command:
184184
- /hyperkube
185185
- scheduler

02-worker.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ write_files:
2828
ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests
2929
ExecStartPre=/usr/bin/mkdir -p /var/log/containers
3030
31-
Environment=KUBELET_VERSION=v1.3.6_coreos.0
31+
Environment=KUBELET_VERSION=${HYPERCUBE_VERSION}
3232
Environment="RKT_OPTS=--volume var-log,kind=host,source=/var/log \
3333
--mount volume=var-log,target=/var/log \
3434
--volume dns,kind=host,source=/etc/resolv.conf \
@@ -62,7 +62,7 @@ write_files:
6262
hostNetwork: true
6363
containers:
6464
- name: kube-proxy
65-
image: quay.io/coreos/hyperkube:v1.3.6_coreos.0
65+
image: quay.io/coreos/hyperkube:${HYPERCUBE_VERSION}
6666
command:
6767
- /hyperkube
6868
- proxy

deploy.tf

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ variable "do_region" {
1818
}
1919
variable "ssh_fingerprint" {}
2020
variable "number_of_workers" {}
21-
21+
variable "hypercube_version" {
22+
default = "v1.3.6_coreos.0"
23+
}
2224
###############################################################################
2325
#
2426
# Specify provider
@@ -123,6 +125,7 @@ data "template_file" "master_yaml" {
123125
ETCD_IP = "${digitalocean_droplet.k8s_etcd.ipv4_address}"
124126
POD_NETWORK = "10.2.0.0/16"
125127
SERVICE_IP_RANGE = "10.3.0.0/24"
128+
HYPERCUBE_VERSION = "${var.hypercube_version}"
126129
}
127130
}
128131

@@ -243,6 +246,7 @@ data "template_file" "worker_yaml" {
243246
DNS_SERVICE_IP = "10.3.0.10"
244247
ETCD_IP = "${digitalocean_droplet.k8s_etcd.ipv4_address}"
245248
MASTER_HOST = "${digitalocean_droplet.k8s_master.ipv4_address}"
249+
HYPERCUBE_VERSION = "${var.hypercube_version}"
246250
}
247251
}
248252

0 commit comments

Comments
 (0)