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

This allows the user to specify an existing VCN instead of it being created #171

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

This allows the user to specify an existing VCN instead of it being created #171

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
965a2f8
Allow overriding of the DNS labels for the subnets
garthy Mar 20, 2018
eef22a8
Add Documentation
garthy Mar 20, 2018
2c59b46
Use the correct path
garthy Mar 20, 2018
d01a12d
Add prefix to bash source
garthy Mar 20, 2018
24b396f
Temporarily disable master LB in test cluster.
jlamillan Mar 20, 2018
0d860d8
Allow passing in VCN instead of creating
garthy Mar 21, 2018
8519170
Add example
garthy Mar 21, 2018
c357277
Document VCN input variables
garthy Mar 21, 2018
428f84a
Update docs with review comments and make outputs consistant
garthy Mar 22, 2018
bb494f1
Fix example to use correct name
garthy Mar 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions bashsource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resource null_resource "build_source" {
provisioner "local-exec" {
command = "echo \"export KUBECONFIG=${path.module}/generated/kubeconfig\" > source.sh "
command = "echo \"export KUBECONFIG=${path.root}/generated/kubeconfig\" > ${var.label_prefix}source.sh"
}
}

Expand All @@ -17,7 +17,7 @@ resource null_resource "etcd-ad1" {
}

provisioner "local-exec" {
command = "echo 'alias ${var.label_prefix}etcdad1-${count.index}=\"ssh -i ${path.module}/generated/instances_id_rsa opc@${element(module.instances-etcd-ad1.instance_public_ips, count.index)}\"' >> source.sh"
command = "echo 'alias ${var.label_prefix}etcdad1-${count.index}=\"ssh -i ${path.root}/generated/instances_id_rsa opc@${element(module.instances-etcd-ad1.instance_public_ips, count.index)}\"' >> source.sh"
}
}

Expand All @@ -34,7 +34,7 @@ resource null_resource "etcd-ad2" {
}

provisioner "local-exec" {
command = "echo 'alias ${var.label_prefix}etcdad2-${count.index}=\"ssh -i ${path.module}/generated/instances_id_rsa opc@${element(module.instances-etcd-ad2.instance_public_ips, count.index)}\"' >> source.sh"
command = "echo 'alias ${var.label_prefix}etcdad2-${count.index}=\"ssh -i ${path.root}/generated/instances_id_rsa opc@${element(module.instances-etcd-ad2.instance_public_ips, count.index)}\"' >> source.sh"
}
}

Expand All @@ -51,7 +51,7 @@ resource null_resource "etcd-ad3" {
}

provisioner "local-exec" {
command = "echo 'alias ${var.label_prefix}etcad3-${count.index}=\"ssh -i ${path.module}/generated/instances_id_rsa opc@${element(module.instances-etcd-ad3.instance_public_ips, count.index)}\"' >> source.sh"
command = "echo 'alias ${var.label_prefix}etcad3-${count.index}=\"ssh -i ${path.root}/generated/instances_id_rsa opc@${element(module.instances-etcd-ad3.instance_public_ips, count.index)}\"' >> source.sh"
}
}

Expand All @@ -71,7 +71,7 @@ resource null_resource "k8smaster-ad1" {
}

provisioner "local-exec" {
command = "echo 'alias ${var.label_prefix}masterad1-${count.index}=\"ssh -i ${path.module}/generated/instances_id_rsa opc@${element(module.instances-k8smaster-ad1.public_ips, count.index)}\"' >> source.sh"
command = "echo 'alias ${var.label_prefix}masterad1-${count.index}=\"ssh -i ${path.root}/generated/instances_id_rsa opc@${element(module.instances-k8smaster-ad1.public_ips, count.index)}\"' >> source.sh"
}
}

Expand All @@ -87,7 +87,7 @@ resource null_resource "k8smaster-ad2" {
}

provisioner "local-exec" {
command = "echo 'alias ${var.label_prefix}masterad2-${count.index}=\"ssh -i ${path.module}/generated/instances_id_rsa opc@${element(module.instances-k8smaster-ad2.public_ips, count.index)}\"' >> source.sh"
command = "echo 'alias ${var.label_prefix}masterad2-${count.index}=\"ssh -i ${path.root}/generated/instances_id_rsa opc@${element(module.instances-k8smaster-ad2.public_ips, count.index)}\"' >> source.sh"
}
}

Expand All @@ -104,23 +104,23 @@ resource null_resource "k8smaster-ad3" {
}

provisioner "local-exec" {
command = "echo 'alias ${var.label_prefix}masterad3-${count.index}=\"ssh -i ${path.module}/generated/instances_id_rsa opc@${element(module.instances-k8smaster-ad3.public_ips, count.index)}\"' >> source.sh"
command = "echo 'alias ${var.label_prefix}masterad3-${count.index}=\"ssh -i ${path.root}/generated/instances_id_rsa opc@${element(module.instances-k8smaster-ad3.public_ips, count.index)}\"' >> source.sh"
}
}

resource null_resource "k8sworker-ad1" {
count = "${var.k8sWorkerAd1Count}"
depends_on = [
"module.instances-k8sworker-ad1",
]
]

triggers {
worker_id = "${element(module.instances-k8sworker-ad1.ids, count.index)}"
build_source_id = "${null_resource.build_source.id}"
}

provisioner "local-exec" {
command = "echo 'alias ${var.label_prefix}workerad1-${count.index}=\"ssh -i ${path.module}/generated/instances_id_rsa opc@${element(module.instances-k8sworker-ad1.public_ips, count.index)}\"' >> source.sh"
command = "echo 'alias ${var.label_prefix}workerad1-${count.index}=\"ssh -i ${path.root}/generated/instances_id_rsa opc@${element(module.instances-k8sworker-ad1.public_ips, count.index)}\"' >> source.sh"
}
}

Expand All @@ -136,7 +136,7 @@ resource null_resource "k8sworker-ad2" {
}

provisioner "local-exec" {
command = "echo 'alias ${var.label_prefix}workerad2-${count.index}=\"ssh -i ${path.module}/generated/instances_id_rsa opc@${element(module.instances-k8sworker-ad2.public_ips, count.index)}\"' >> source.sh"
command = "echo 'alias ${var.label_prefix}workerad2-${count.index}=\"ssh -i ${path.root}/generated/instances_id_rsa opc@${element(module.instances-k8sworker-ad2.public_ips, count.index)}\"' >> source.sh"
}
}

Expand All @@ -153,7 +153,7 @@ resource null_resource "k8sworker-ad3" {
}

provisioner "local-exec" {
command = "echo 'alias ${var.label_prefix}workerad3-${count.index}=\"ssh -i ${path.module}/generated/instances_id_rsa opc@${element(module.instances-k8sworker-ad3.public_ips, count.index)}\"' >> source.sh"
command = "echo 'alias ${var.label_prefix}workerad3-${count.index}=\"ssh -i ${path.root}/generated/instances_id_rsa opc@${element(module.instances-k8sworker-ad3.public_ips, count.index)}\"' >> source.sh"
}
}

1 change: 1 addition & 0 deletions docs/input-variables.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ The following input variables are used to configure the inbound security rules o
name | default | description
------------------------------------|-------------------------|------------
network_cidrs | See map in variables.tf | A CIDR notation IP range of the VCN and its subnets.
network_subnet_dns | See map in variables.tf | A DNS label for each of the subnet in the VCN (Max 15 characters)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A DNS label for each of the subnet in the VCN => A DNS label for each of the subnets in the VCN

etcd_cluster_ingress | 10.0.0.0/16 (VCN only) | A CIDR notation IP range that is allowed to access the etcd cluster. Must be a subset of the VCN CIDR.
etcd_ssh_ingress | 10.0.0.0/16 (VCN only) | A CIDR notation IP range that is allowed to SSH to etcd nodes. Must be a subset of the VCN CIDR.
master_ssh_ingress | 10.0.0.0/16 (VCN only) | A CIDR notation IP range that is allowed to access the master(s). Must be a subset of the VCN CIDR.
Expand Down
84 changes: 53 additions & 31 deletions k8s-oci.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@

locals {
master_lb_ip = "${var.master_oci_lb_enabled == "true" ? element(concat(flatten(module.k8smaster-public-lb.ip_addresses), list("")), 0) : "127.0.0.1"}"
master_lb_address = "${format("https://%s:%s", local.master_lb_ip, var.master_oci_lb_enabled == "true" ? "443" : "6443")}"

reverse_proxy_clount_init = "${var.master_oci_lb_enabled == "true" ? "" : module.reverse-proxy.clount_init}"
reverse_proxy_setup = "${var.master_oci_lb_enabled == "true" ? "" : module.reverse-proxy.setup}"

etcd_endpoints = "${var.etcd_lb_enabled == "true" ?
join(",",formatlist("http://%s:2379", module.etcd-lb.ip_addresses)) :
join(",",formatlist("http://%s:2379", compact(concat(
module.instances-etcd-ad1.private_ips,
module.instances-etcd-ad2.private_ips,
module.instances-etcd-ad3.private_ips)))) }"
}

### CA and Cluster Certificates

module "k8s-tls" {
Expand All @@ -31,10 +16,29 @@ module "k8s-tls" {
### Virtual Cloud Network

module "vcn" {
create_vcn = "${var.vcn_id == "" ? 1 : 0}"
Copy link
Member

@owainlewis owainlewis Mar 21, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is clever since the value is used later but from reading the code it feels like this should be a boolean and the later expressions later should reference it

count = "${var.create_vcn ? "1" : "0"}"

The above feels more consistent with how count is derived elsewhere in the code i.e in resource "oci_core_route_table" "NATInstanceAD1RouteTable"

source = "./network/vcn"
compartment_ocid = "${var.compartment_ocid}"
label_prefix = "${var.label_prefix}"
vcn_dns_name = "${var.vcn_dns_name}"
vcn_cidr = "${var.vcn_cidr}"
}


module "subnets" {
source = "./network/subnets"
compartment_ocid = "${var.compartment_ocid}"
label_prefix = "${var.label_prefix}"
tenancy_ocid = "${var.tenancy_ocid}"

# Use a existing VCN and public route table and dhcp options
vcn_id = "${var.vcn_id == "" ? join(" ",module.vcn.vcn_id) : var.vcn_id}"
dhcp_options_id = "${var.vcn_id == "" ? join(" ",module.vcn.dhcp_options_id) : var.dhcp_options_id}"
public_routetable_id = "${var.vcn_id == "" ? join(" ",module.vcn.public_routetable_id) : var.public_routetable_id}"
#vcn_id = "${module.vcn.vcn_id}"
#dhcp_options_id = "${module.vcn.dhcp_options_id}"
#public_routetable_id = "${module.vcn.public_routetable_id}"

vcn_dns_name = "${var.vcn_dns_name}"
additional_etcd_security_lists_ids = "${var.additional_etcd_security_lists_ids}"
additional_k8smaster_security_lists_ids = "${var.additional_k8s_master_security_lists_ids}"
Expand All @@ -61,6 +65,7 @@ module "vcn" {
master_nodeport_ingress = "${var.master_nodeport_ingress}"
external_icmp_ingress = "${var.external_icmp_ingress}"
internal_icmp_ingress = "${var.internal_icmp_ingress}"
network_subnet_dns = "${var.network_subnet_dns}"
}

module "oci-cloud-controller" {
Expand All @@ -77,14 +82,14 @@ module "oci-cloud-controller" {
// var.cloud_controller_user_private_key_path has been provided but has an empty password
cloud_controller_user_private_key_password = "${var.cloud_controller_user_private_key_path == "" ? var.private_key_password : var.cloud_controller_user_private_key_password}"

subnet1 = "${element(module.vcn.ccmlb_subnet_ad1_id,0)}"
subnet2 = "${element(module.vcn.ccmlb_subnet_ad2_id,0)}"
subnet1 = "${element(module.subnets.ccmlb_subnet_ad1_id,0)}"
subnet2 = "${element(module.subnets.ccmlb_subnet_ad2_id,0)}"
}

module "oci-flexvolume-driver" {
source = "./kubernetes/oci-flexvolume-driver"
tenancy = "${var.tenancy_ocid}"
vcn = "${module.vcn.id}"
vcn = "${module.subnets.id}"

flexvolume_driver_user_ocid = "${var.flexvolume_driver_user_ocid == "" ? var.user_ocid : var.flexvolume_driver_user_ocid}"
flexvolume_driver_user_fingerprint = "${var.flexvolume_driver_user_fingerprint == "" ? var.fingerprint : var.flexvolume_driver_user_fingerprint}"
Expand Down Expand Up @@ -128,7 +133,7 @@ module "instances-etcd-ad1" {
shape = "${var.etcdShape}"
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
network_cidrs = "${var.network_cidrs}"
subnet_id = "${module.vcn.etcd_subnet_ad1_id}"
subnet_id = "${module.subnets.etcd_subnet_ad1_id}"
subnet_name = "etcdSubnetAD1"
tenancy_ocid = "${var.compartment_ocid}"
etcd_docker_max_log_size = "${var.etcd_docker_max_log_size}"
Expand Down Expand Up @@ -156,7 +161,7 @@ module "instances-etcd-ad2" {
shape = "${var.etcdShape}"
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
network_cidrs = "${var.network_cidrs}"
subnet_id = "${module.vcn.etcd_subnet_ad2_id}"
subnet_id = "${module.subnets.etcd_subnet_ad2_id}"
subnet_name = "etcdSubnetAD2"
tenancy_ocid = "${var.compartment_ocid}"
etcd_docker_max_log_size = "${var.etcd_docker_max_log_size}"
Expand Down Expand Up @@ -186,7 +191,7 @@ module "instances-etcd-ad3" {
shape = "${var.etcdShape}"
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
network_cidrs = "${var.network_cidrs}"
subnet_id = "${module.vcn.etcd_subnet_ad3_id}"
subnet_id = "${module.subnets.etcd_subnet_ad3_id}"
subnet_name = "etcdSubnetAD3"
tenancy_ocid = "${var.compartment_ocid}"
etcd_docker_max_log_size = "${var.etcd_docker_max_log_size}"
Expand Down Expand Up @@ -225,7 +230,7 @@ module "instances-k8smaster-ad1" {
ssh_private_key = "${module.k8s-tls.ssh_private_key}"
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
network_cidrs = "${var.network_cidrs}"
subnet_id = "${module.vcn.k8smaster_subnet_ad1_id}"
subnet_id = "${module.subnets.k8smaster_subnet_ad1_id}"
subnet_name = "masterSubnetAD1"
tenancy_ocid = "${var.compartment_ocid}"
cloud_controller_version = "${var.cloud_controller_version}"
Expand Down Expand Up @@ -267,7 +272,7 @@ module "instances-k8smaster-ad2" {
ssh_private_key = "${module.k8s-tls.ssh_private_key}"
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
network_cidrs = "${var.network_cidrs}"
subnet_id = "${module.vcn.k8smaster_subnet_ad2_id}"
subnet_id = "${module.subnets.k8smaster_subnet_ad2_id}"
subnet_name = "masterSubnetAD2"
tenancy_ocid = "${var.compartment_ocid}"
cloud_controller_version = "${var.cloud_controller_version}"
Expand Down Expand Up @@ -309,7 +314,7 @@ module "instances-k8smaster-ad3" {
ssh_private_key = "${module.k8s-tls.ssh_private_key}"
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
network_cidrs = "${var.network_cidrs}"
subnet_id = "${module.vcn.k8smaster_subnet_ad3_id}"
subnet_id = "${module.subnets.k8smaster_subnet_ad3_id}"
subnet_name = "masterSubnetAD3"
tenancy_ocid = "${var.compartment_ocid}"
cloud_controller_version = "${var.cloud_controller_version}"
Expand Down Expand Up @@ -350,7 +355,7 @@ module "instances-k8sworker-ad1" {
shape = "${var.k8sWorkerShape}"
ssh_private_key = "${module.k8s-tls.ssh_private_key}"
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
subnet_id = "${module.vcn.k8worker_subnet_ad1_id}"
subnet_id = "${module.subnets.k8worker_subnet_ad1_id}"
tenancy_ocid = "${var.compartment_ocid}"
flexvolume_driver_version = "${var.flexvolume_driver_version}"
etcd_endpoints = "${local.etcd_endpoints}"
Expand Down Expand Up @@ -387,7 +392,7 @@ module "instances-k8sworker-ad2" {
shape = "${var.k8sWorkerShape}"
ssh_private_key = "${module.k8s-tls.ssh_private_key}"
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
subnet_id = "${module.vcn.k8worker_subnet_ad2_id}"
subnet_id = "${module.subnets.k8worker_subnet_ad2_id}"
tenancy_ocid = "${var.compartment_ocid}"
flexvolume_driver_version = "${var.flexvolume_driver_version}"
etcd_endpoints = "${local.etcd_endpoints}"
Expand Down Expand Up @@ -424,7 +429,7 @@ module "instances-k8sworker-ad3" {
shape = "${var.k8sWorkerShape}"
ssh_private_key = "${module.k8s-tls.ssh_private_key}"
ssh_public_key_openssh = "${module.k8s-tls.ssh_public_key_openssh}"
subnet_id = "${module.vcn.k8worker_subnet_ad3_id}"
subnet_id = "${module.subnets.k8worker_subnet_ad3_id}"
tenancy_ocid = "${var.compartment_ocid}"
flexvolume_driver_version = "${var.flexvolume_driver_version}"
etcd_endpoints = "${local.etcd_endpoints}"
Expand All @@ -442,8 +447,8 @@ module "etcd-lb" {
is_private = "${var.etcd_lb_access == "private" ? "true": "false"}"

# Handle case where var.etcd_lb_access=public, but var.control_plane_subnet_access=private
etcd_subnet_0_id = "${var.etcd_lb_access == "private" ? module.vcn.etcd_subnet_ad1_id: coalesce(join(" ", module.vcn.public_subnet_ad1_id), join(" ", list(module.vcn.etcd_subnet_ad1_id)))}"
etcd_subnet_1_id = "${var.etcd_lb_access == "private" ? "": coalesce(join(" ", module.vcn.public_subnet_ad2_id), join(" ", list(module.vcn.etcd_subnet_ad2_id)))}"
etcd_subnet_0_id = "${var.etcd_lb_access == "private" ? module.subnets.etcd_subnet_ad1_id: coalesce(join(" ", module.subnets.public_subnet_ad1_id), join(" ", list(module.subnets.etcd_subnet_ad1_id)))}"
etcd_subnet_1_id = "${var.etcd_lb_access == "private" ? "": coalesce(join(" ", module.subnets.public_subnet_ad2_id), join(" ", list(module.subnets.etcd_subnet_ad2_id)))}"
etcd_ad1_private_ips = "${module.instances-etcd-ad1.private_ips}"
etcd_ad2_private_ips = "${module.instances-etcd-ad2.private_ips}"
etcd_ad3_private_ips = "${module.instances-etcd-ad3.private_ips}"
Expand All @@ -461,8 +466,8 @@ module "k8smaster-public-lb" {
is_private = "${var.k8s_master_lb_access == "private" ? "true": "false"}"

# Handle case where var.k8s_master_lb_access=public, but var.control_plane_subnet_access=private
k8smaster_subnet_0_id = "${var.k8s_master_lb_access == "private" ? module.vcn.k8smaster_subnet_ad1_id: coalesce(join(" ", module.vcn.public_subnet_ad1_id), join(" ", list(module.vcn.k8smaster_subnet_ad1_id)))}"
k8smaster_subnet_1_id = "${var.k8s_master_lb_access == "private" ? "": coalesce(join(" ", module.vcn.public_subnet_ad2_id), join(" ", list(module.vcn.k8smaster_subnet_ad2_id)))}"
k8smaster_subnet_0_id = "${var.k8s_master_lb_access == "private" ? module.subnets.k8smaster_subnet_ad1_id: coalesce(join(" ", module.subnets.public_subnet_ad1_id), join(" ", list(module.subnets.k8smaster_subnet_ad1_id)))}"
k8smaster_subnet_1_id = "${var.k8s_master_lb_access == "private" ? "": coalesce(join(" ", module.subnets.public_subnet_ad2_id), join(" ", list(module.subnets.k8smaster_subnet_ad2_id)))}"
k8smaster_ad1_private_ips = "${module.instances-k8smaster-ad1.private_ips}"
k8smaster_ad2_private_ips = "${module.instances-k8smaster-ad2.private_ips}"
k8smaster_ad3_private_ips = "${module.instances-k8smaster-ad3.private_ips}"
Expand All @@ -484,3 +489,20 @@ module "kubeconfig" {
api_server_cert_pem = "${module.k8s-tls.api_server_cert_pem}"
k8s_master = "${var.master_oci_lb_enabled == "true" ? local.master_lb_address : format("https://%s:%s", element(coalescelist(module.instances-k8smaster-ad1.public_ips, module.instances-k8smaster-ad2.public_ips, module.instances-k8smaster-ad3.public_ips), 0), "443")}"
}



locals {
master_lb_ip = "${var.master_oci_lb_enabled == "true" ? element(concat(flatten(module.k8smaster-public-lb.ip_addresses), list("")), 0) : "127.0.0.1"}"
master_lb_address = "${format("https://%s:%s", local.master_lb_ip, var.master_oci_lb_enabled == "true" ? "443" : "6443")}"

reverse_proxy_clount_init = "${var.master_oci_lb_enabled == "true" ? "" : module.reverse-proxy.clount_init}"
reverse_proxy_setup = "${var.master_oci_lb_enabled == "true" ? "" : module.reverse-proxy.setup}"

etcd_endpoints = "${var.etcd_lb_enabled == "true" ?
join(",",formatlist("http://%s:2379", module.etcd-lb.ip_addresses)) :
join(",",formatlist("http://%s:2379", compact(concat(
module.instances-etcd-ad1.private_ips,
module.instances-etcd-ad2.private_ips,
module.instances-etcd-ad3.private_ips)))) }"
}
0 ...rk/vcn/cloud_init/bootstrap.template.yaml → ...ubnets/cloud_init/bootstrap.template.yaml
View file
Open in desktop
File renamed without changes.
0 network/vcn/datasources.tf → network/subnets/datasources.tf
View file
Open in desktop
File renamed without changes.
0 network/vcn/natinstance.tf → network/subnets/natinstance.tf
View file
Open in desktop
File renamed without changes.
9 changes: 1 addition & 8 deletions network/vcn/outputs.tf → network/subnets/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
output "id" {
value = "${oci_core_virtual_network.CompleteVCN.id}"
value = "${var.vcn_id}"
}

output "etcd_subnet_ad1_id" {
Expand Down Expand Up @@ -104,10 +104,3 @@ output "control_plane_subnet_access" {
value = "${var.control_plane_subnet_access}"
}

output "route_for_complete_id" {
value = "${oci_core_route_table.PublicRouteTable.id}"
}

output "dhcp_options_id" {
value = "${oci_core_virtual_network.CompleteVCN.default_dhcp_options_id}"
}
Loading