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

Commit dd3a9da

Browse files
garthyjrosinsk
garthy
authored and
jrosinsk
committed
Allow easy config of oci plugins (#140)
1 parent 0421697 commit dd3a9da

File tree

8 files changed

+63
-29
lines changed

8 files changed

+63
-29
lines changed

‎instances/k8smaster/datasources.tf‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,18 @@ data "template_file" "setup-template" {
1313
template = "${file("${path.module}/scripts/setup.template.sh")}"
1414

1515
vars = {
16-
domain_name = "${var.domain_name}"
17-
docker_ver = "${var.docker_ver}"
18-
etcd_ver = "${var.etcd_ver}"
19-
flannel_ver = "${var.flannel_ver}"
20-
k8s_ver = "${var.k8s_ver}"
21-
docker_max_log_size = "${var.master_docker_max_log_size}"
22-
docker_max_log_files = "${var.master_docker_max_log_files}"
23-
etcd_discovery_url = "${file("${path.root}/generated/discovery${var.etcd_discovery_url}")}"
24-
etcd_endpoints = "${var.etcd_endpoints}"
16+
domain_name = "${var.domain_name}"
17+
docker_ver = "${var.docker_ver}"
18+
etcd_ver = "${var.etcd_ver}"
19+
flannel_ver = "${var.flannel_ver}"
20+
k8s_ver = "${var.k8s_ver}"
21+
docker_max_log_size = "${var.master_docker_max_log_size}"
22+
docker_max_log_files = "${var.master_docker_max_log_files}"
23+
etcd_discovery_url = "${file("${path.root}/generated/discovery${var.etcd_discovery_url}")}"
24+
etcd_endpoints = "${var.etcd_endpoints}"
25+
cloud_controller_version = "${var.cloud_controller_version}"
26+
flexvolume_driver_version = "${var.flexvolume_driver_version}"
27+
volume_provisioner_version = "${var.volume_provisioner_version}"
2528
}
2629
}
2730

‎instances/k8smaster/scripts/setup.template.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ EOF
117117
## Install Flex Volume Driver for OCI
118118
#####################################
119119
mkdir -p /usr/libexec/kubernetes/kubelet-plugins/volume/exec/oracle~oci/
120-
curl -L --retry 3 https://github.com/oracle/oci-flexvolume-driver/releases/download/0.5.1/oci -o/usr/libexec/kubernetes/kubelet-plugins/volume/exec/oracle~oci/oci
120+
curl -L --retry 3 https://github.com/oracle/oci-flexvolume-driver/releases/download/${flexvolume_driver_version}/oci -o/usr/libexec/kubernetes/kubelet-plugins/volume/exec/oracle~oci/oci
121121
chmod a+x /usr/libexec/kubernetes/kubelet-plugins/volume/exec/oracle~oci/oci
122122
mv /root/flexvolume-driver-secret.yaml /usr/libexec/kubernetes/kubelet-plugins/volume/exec/oracle~oci/config.yaml
123123

@@ -188,8 +188,8 @@ done
188188

189189
# Install oci cloud controller manager
190190
kubectl apply -f /root/cloud-controller-secret.yaml
191-
kubectl apply -f https://github.com/oracle/oci-cloud-controller-manager/releases/download/0.2.0/oci-cloud-controller-manager-rbac.yaml
192-
kubectl apply -f https://github.com/oracle/oci-cloud-controller-manager/releases/download/0.2.0/oci-cloud-controller-manager.yaml
191+
kubectl apply -f https://github.com/oracle/oci-cloud-controller-manager/releases/download/${cloud_controller_version}/oci-cloud-controller-manager-rbac.yaml
192+
kubectl apply -f https://github.com/oracle/oci-cloud-controller-manager/releases/download/${cloud_controller_version}/oci-cloud-controller-manager.yaml
193193

194194
## install kube-dns
195195
kubectl create -f /root/services/kube-dns.yaml
@@ -199,10 +199,10 @@ kubectl create -f /root/services/kubernetes-dashboard.yaml
199199

200200
## Install Volume Provisioner of OCI
201201
kubectl create secret generic oci-volume-provisioner -n kube-system --from-file=config.yaml=/root/volume-provisioner-secret.yaml
202-
kubectl apply -f https://github.com/oracle/oci-volume-provisioner/releases/download/0.4.0/oci-volume-provisioner-rbac.yaml
203-
kubectl apply -f https://github.com/oracle/oci-volume-provisioner/releases/download/0.4.0/oci-volume-provisioner.yaml
204-
kubectl apply -f https://github.com/oracle/oci-volume-provisioner/releases/download/0.4.0/storage-class.yaml
205-
kubectl apply -f https://github.com/oracle/oci-volume-provisioner/releases/download/0.4.0/storage-class-ext3.yaml
202+
kubectl apply -f https://github.com/oracle/oci-volume-provisioner/releases/download/${volume_provisioner_version}/oci-volume-provisioner-rbac.yaml
203+
kubectl apply -f https://github.com/oracle/oci-volume-provisioner/releases/download/${volume_provisioner_version}/oci-volume-provisioner.yaml
204+
kubectl apply -f https://github.com/oracle/oci-volume-provisioner/releases/download/${volume_provisioner_version}/storage-class.yaml
205+
kubectl apply -f https://github.com/oracle/oci-volume-provisioner/releases/download/${volume_provisioner_version}/storage-class-ext3.yaml
206206

207207
## Mark OCI StorageClass as the default
208208
kubectl patch storageclass oci -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'

‎instances/k8smaster/variables.tf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,15 @@ variable "master_docker_max_log_files" {
7272
default = "5"
7373
}
7474

75+
variable "cloud_controller_version" {}
7576
variable "cloud_controller_secret" {}
7677

78+
variable "flexvolume_driver_version" {}
7779
variable "flexvolume_driver_secret" {}
7880

81+
variable "volume_provisioner_version" {}
7982
variable "volume_provisioner_secret" {}
83+
84+
85+
86+

‎instances/k8sworker/datasources.tf‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ data "template_file" "setup-template" {
1313
template = "${file("${path.module}/scripts/setup.template.sh")}"
1414

1515
vars = {
16-
master_lb = "${var.master_lb}"
17-
domain_name = "${var.domain_name}"
18-
docker_ver = "${var.docker_ver}"
19-
etcd_ver = "${var.etcd_ver}"
20-
flannel_ver = "${var.flannel_ver}"
21-
k8s_ver = "${var.k8s_ver}"
22-
docker_max_log_size = "${var.worker_docker_max_log_size}"
23-
docker_max_log_files = "${var.worker_docker_max_log_files}"
24-
etcd_discovery_url = "${file("${path.root}/generated/discovery${var.etcd_discovery_url}")}"
25-
etcd_endpoints = "${var.etcd_endpoints}"
26-
worker_iscsi_volume_mount = "${var.worker_iscsi_volume_mount}"
16+
master_lb = "${var.master_lb}"
17+
domain_name = "${var.domain_name}"
18+
docker_ver = "${var.docker_ver}"
19+
etcd_ver = "${var.etcd_ver}"
20+
flannel_ver = "${var.flannel_ver}"
21+
k8s_ver = "${var.k8s_ver}"
22+
docker_max_log_size = "${var.worker_docker_max_log_size}"
23+
docker_max_log_files = "${var.worker_docker_max_log_files}"
24+
etcd_discovery_url = "${file("${path.root}/generated/discovery${var.etcd_discovery_url}")}"
25+
etcd_endpoints = "${var.etcd_endpoints}"
26+
worker_iscsi_volume_mount = "${var.worker_iscsi_volume_mount}"
27+
flexvolume_driver_version = "${var.flexvolume_driver_version}"
2728
}
2829
}
2930

‎instances/k8sworker/scripts/setup.template.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ EOF
161161
## Install Flex Volume Driver for OCI
162162
#####################################
163163
mkdir -p /usr/libexec/kubernetes/kubelet-plugins/volume/exec/oracle~oci/
164-
curl -L --retry 3 https://github.com/oracle/oci-flexvolume-driver/releases/download/0.5.1/oci -o/usr/libexec/kubernetes/kubelet-plugins/volume/exec/oracle~oci/oci
164+
curl -L --retry 3 https://github.com/oracle/oci-flexvolume-driver/releases/download/${flexvolume_driver_version}/oci -o/usr/libexec/kubernetes/kubelet-plugins/volume/exec/oracle~oci/oci
165165
chmod a+x /usr/libexec/kubernetes/kubelet-plugins/volume/exec/oracle~oci/oci
166166

167167

‎instances/k8sworker/variables.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,5 @@ variable "worker_iscsi_volume_mount" {
8181
description = "Mount point of iscsi volume"
8282
default = "/var/lib/docker"
8383
}
84+
85+
variable "flexvolume_driver_version" {}

‎k8s-oci.tf‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,11 @@ module "instances-k8smaster-ad1" {
206206
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
207207
subnet_id = "${module.vcn.k8smaster_subnet_ad1_id}"
208208
tenancy_ocid = "${var.compartment_ocid}"
209+
cloud_controller_version = "${var.cloud_controller_version}"
209210
cloud_controller_secret = "${module.oci-cloud-controller.cloud-provider-json}"
211+
flexvolume_driver_version = "${var.flexvolume_driver_version}"
210212
flexvolume_driver_secret = "${module.oci-flexvolume-driver.flex-volume-driver-yaml}"
213+
volume_provisioner_version = "${var.volume_provisioner_version}"
211214
volume_provisioner_secret = "${module.oci-volume-provisioner.volume-provisioner-yaml}"
212215
etcd_endpoints = "${var.etcd_lb_enabled=="true" ?
213216
join(",",formatlist("http://%s:2379",
@@ -247,8 +250,11 @@ module "instances-k8smaster-ad2" {
247250
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
248251
subnet_id = "${module.vcn.k8smaster_subnet_ad2_id}"
249252
tenancy_ocid = "${var.compartment_ocid}"
253+
cloud_controller_version = "${var.cloud_controller_version}"
250254
cloud_controller_secret = "${module.oci-cloud-controller.cloud-provider-json}"
255+
flexvolume_driver_version = "${var.flexvolume_driver_version}"
251256
flexvolume_driver_secret = "${module.oci-flexvolume-driver.flex-volume-driver-yaml}"
257+
volume_provisioner_version = "${var.volume_provisioner_version}"
252258
volume_provisioner_secret = "${module.oci-volume-provisioner.volume-provisioner-yaml}"
253259
etcd_endpoints = "${var.etcd_lb_enabled=="true" ?
254260
join(",",formatlist("http://%s:2379",
@@ -288,8 +294,11 @@ module "instances-k8smaster-ad3" {
288294
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
289295
subnet_id = "${module.vcn.k8smaster_subnet_ad3_id}"
290296
tenancy_ocid = "${var.compartment_ocid}"
297+
cloud_controller_version = "${var.cloud_controller_version}"
291298
cloud_controller_secret = "${module.oci-cloud-controller.cloud-provider-json}"
299+
flexvolume_driver_version = "${var.flexvolume_driver_version}"
292300
flexvolume_driver_secret = "${module.oci-flexvolume-driver.flex-volume-driver-yaml}"
301+
volume_provisioner_version = "${var.volume_provisioner_version}"
293302
volume_provisioner_secret = "${module.oci-volume-provisioner.volume-provisioner-yaml}"
294303
etcd_endpoints = "${var.etcd_lb_enabled=="true" ?
295304
join(",",formatlist("http://%s:2379",
@@ -328,6 +337,7 @@ module "instances-k8sworker-ad1" {
328337
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
329338
subnet_id = "${module.vcn.k8worker_subnet_ad1_id}"
330339
tenancy_ocid = "${var.compartment_ocid}"
340+
flexvolume_driver_version = "${var.flexvolume_driver_version}"
331341
etcd_endpoints = "${var.etcd_lb_enabled=="true" ?
332342
join(",",formatlist("http://%s:2379",
333343
module.etcd-lb.ip_addresses)):
@@ -368,6 +378,7 @@ module "instances-k8sworker-ad2" {
368378
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
369379
subnet_id = "${module.vcn.k8worker_subnet_ad2_id}"
370380
tenancy_ocid = "${var.compartment_ocid}"
381+
flexvolume_driver_version = "${var.flexvolume_driver_version}"
371382
etcd_endpoints = "${var.etcd_lb_enabled=="true" ?
372383
join(",",formatlist("http://%s:2379",
373384
module.etcd-lb.ip_addresses)):
@@ -408,6 +419,7 @@ module "instances-k8sworker-ad3" {
408419
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
409420
subnet_id = "${module.vcn.k8worker_subnet_ad3_id}"
410421
tenancy_ocid = "${var.compartment_ocid}"
422+
flexvolume_driver_version = "${var.flexvolume_driver_version}"
411423
etcd_endpoints = "${var.etcd_lb_enabled=="true" ?
412424
join(",",formatlist("http://%s:2379",
413425
module.etcd-lb.ip_addresses)):

‎variables.tf‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,9 @@ variable "flannel_backend" {
396396
}
397397

398398
# Cloud controller
399+
variable "cloud_controller_version" {
400+
default = "0.2.0"
401+
}
399402
variable "cloud_controller_user_ocid" {
400403
default = ""
401404
}
@@ -411,6 +414,9 @@ variable "cloud_controller_user_private_key_password" {
411414

412415

413416
# Flexvolume driver
417+
variable "flexvolume_driver_version" {
418+
default = "0.5.1"
419+
}
414420
variable "flexvolume_driver_user_ocid" {
415421
default = ""
416422
}
@@ -425,7 +431,10 @@ variable "flexvolume_driver_user_private_key_password" {
425431
}
426432

427433

428-
# Flexvolume driver
434+
# Volume provisioner
435+
variable "volume_provisioner_version" {
436+
default = "0.4.1"
437+
}
429438
variable "volume_provisioner_user_ocid" {
430439
default = ""
431440
}

0 commit comments

Comments
 (0)