From d8e4ac172a83271d3a2ba78c20f58ea1275f1d9b Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sun, 17 Sep 2017 21:40:33 -0700 Subject: [PATCH 1/3] Add dghubble/pegasus AWS Kubernetes Terraform module --- aws/container-linux/kubernetes/ami.tf | 19 ++ aws/container-linux/kubernetes/bootkube.tf | 14 + .../kubernetes/cl/controller.yaml.tmpl | 147 ++++++++++ .../kubernetes/cl/worker.yaml.tmpl | 130 +++++++++ aws/container-linux/kubernetes/controllers.tf | 244 ++++++++++++++++ aws/container-linux/kubernetes/elb.tf | 48 ++++ aws/container-linux/kubernetes/ingress.tf | 32 +++ aws/container-linux/kubernetes/network.tf | 57 ++++ aws/container-linux/kubernetes/ssh.tf | 25 ++ aws/container-linux/kubernetes/variables.tf | 96 +++++++ aws/container-linux/kubernetes/workers.tf | 264 ++++++++++++++++++ 11 files changed, 1076 insertions(+) create mode 100644 aws/container-linux/kubernetes/ami.tf create mode 100644 aws/container-linux/kubernetes/bootkube.tf create mode 100644 aws/container-linux/kubernetes/cl/controller.yaml.tmpl create mode 100644 aws/container-linux/kubernetes/cl/worker.yaml.tmpl create mode 100644 aws/container-linux/kubernetes/controllers.tf create mode 100644 aws/container-linux/kubernetes/elb.tf create mode 100644 aws/container-linux/kubernetes/ingress.tf create mode 100644 aws/container-linux/kubernetes/network.tf create mode 100644 aws/container-linux/kubernetes/ssh.tf create mode 100644 aws/container-linux/kubernetes/variables.tf create mode 100644 aws/container-linux/kubernetes/workers.tf diff --git a/aws/container-linux/kubernetes/ami.tf b/aws/container-linux/kubernetes/ami.tf new file mode 100644 index 00000000..03c6c0f6 --- /dev/null +++ b/aws/container-linux/kubernetes/ami.tf @@ -0,0 +1,19 @@ +data "aws_ami" "coreos" { + most_recent = true + owners = ["595879546273"] + + filter { + name = "architecture" + values = ["x86_64"] + } + + filter { + name = "virtualization-type" + values = ["hvm"] + } + + filter { + name = "name" + values = ["CoreOS-${var.os_channel}-*"] + } +} diff --git a/aws/container-linux/kubernetes/bootkube.tf b/aws/container-linux/kubernetes/bootkube.tf new file mode 100644 index 00000000..81fed934 --- /dev/null +++ b/aws/container-linux/kubernetes/bootkube.tf @@ -0,0 +1,14 @@ +# Self-hosted Kubernetes assets (kubeconfig, manifests) +module "bootkube" { + source = "git::https://github.com/poseidon/bootkube-terraform.git?ref=dbfb11c6eafa08f839eac2834ca1aca35dafe965" + + cluster_name = "${var.cluster_name}" + api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] + etcd_servers = ["http://127.0.0.1:2379"] + asset_dir = "${var.asset_dir}" + networking = "${var.networking}" + network_mtu = "${var.network_mtu}" + pod_cidr = "${var.pod_cidr}" + service_cidr = "${var.service_cidr}" + experimental_self_hosted_etcd = "true" +} diff --git a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl new file mode 100644 index 00000000..59e779c3 --- /dev/null +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -0,0 +1,147 @@ +--- +systemd: + units: + - name: docker.service + enable: true + - name: locksmithd.service + mask: true + - name: wait-for-dns.service + enable: true + contents: | + [Unit] + Description=Wait for DNS entries + Wants=systemd-resolved.service + Before=kubelet.service + [Service] + Type=oneshot + RemainAfterExit=true + ExecStart=/bin/sh -c 'while ! /usr/bin/grep '^[^#[:space:]]' /etc/resolv.conf > /dev/null; do sleep 1; done' + [Install] + RequiredBy=kubelet.service + - name: kubelet.service + enable: true + contents: | + [Unit] + Description=Kubelet via Hyperkube ACI + [Service] + EnvironmentFile=/etc/kubernetes/kubelet.env + Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \ + --volume=resolv,kind=host,source=/etc/resolv.conf \ + --mount volume=resolv,target=/etc/resolv.conf \ + --volume var-lib-cni,kind=host,source=/var/lib/cni \ + --mount volume=var-lib-cni,target=/var/lib/cni \ + --volume opt-cni-bin,kind=host,source=/opt/cni/bin \ + --mount volume=opt-cni-bin,target=/opt/cni/bin \ + --volume var-log,kind=host,source=/var/log \ + --mount volume=var-log,target=/var/log" + ExecStartPre=/bin/mkdir -p /opt/cni/bin + ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests + ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets + ExecStartPre=/bin/mkdir -p /etc/kubernetes/inactive-manifests + ExecStartPre=/bin/mkdir -p /var/lib/cni + ExecStartPre=/usr/bin/bash -c "grep 'certificate-authority-data' /etc/kubernetes/kubeconfig | awk '{print $2}' | base64 -d > /etc/kubernetes/ca.crt" + ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/cache/kubelet-pod.uuid + ExecStart=/usr/lib/coreos/kubelet-wrapper \ + --allow-privileged \ + --anonymous-auth=false \ + --client-ca-file=/etc/kubernetes/ca.crt \ + --cluster_dns=${k8s_dns_service_ip} \ + --cluster_domain=cluster.local \ + --cni-conf-dir=/etc/kubernetes/cni/net.d \ + --exit-on-lock-contention \ + --kubeconfig=/etc/kubernetes/kubeconfig \ + --lock-file=/var/run/lock/kubelet.lock \ + --network-plugin=cni \ + --node-labels=node-role.kubernetes.io/master \ + --pod-manifest-path=/etc/kubernetes/manifests \ + --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \ + --require-kubeconfig + ExecStop=-/usr/bin/rkt stop --uuid-file=/var/cache/kubelet-pod.uuid + Restart=always + RestartSec=10 + [Install] + WantedBy=multi-user.target + - name: bootkube.service + contents: | + [Unit] + Description=Bootstrap a Kubernetes cluster + ConditionPathExists=!/opt/bootkube/init_bootkube.done + [Service] + Type=oneshot + RemainAfterExit=true + WorkingDirectory=/opt/bootkube + ExecStart=/opt/bootkube/bootkube-start + ExecStartPost=/bin/touch /opt/bootkube/init_bootkube.done + [Install] + WantedBy=multi-user.target +storage: + files: + - path: /etc/kubernetes/kubeconfig + filesystem: root + mode: 0644 + contents: + inline: | + apiVersion: v1 + kind: Config + clusters: + - name: local + cluster: + server: ${kubeconfig_server} + certificate-authority-data: ${kubeconfig_ca_cert} + users: + - name: kubelet + user: + client-certificate-data: ${kubeconfig_kubelet_cert} + client-key-data: ${kubeconfig_kubelet_key} + contexts: + - context: + cluster: local + user: kubelet + - path: /etc/kubernetes/kubelet.env + filesystem: root + mode: 0644 + contents: + inline: | + KUBELET_IMAGE_URL=quay.io/coreos/hyperkube + KUBELET_IMAGE_TAG=v1.7.5_coreos.0 + - path: /etc/sysctl.d/max-user-watches.conf + filesystem: root + contents: + inline: | + fs.inotify.max_user_watches=16184 + - path: /opt/bootkube/bootkube-start + filesystem: root + mode: 0544 + user: + id: 500 + group: + id: 500 + contents: + inline: | + #!/bin/bash + # Wrapper for bootkube start + set -e + # Move experimental manifests + [ -d /opt/bootkube/assets/manifests-* ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* + [ -d /opt/bootkube/assets/experimental/manifests ] && mv /opt/bootkube/assets/experimental/manifests/* /opt/bootkube/assets/manifests && rm -r /opt/bootkube/assets/experimental/manifests + [ -d /opt/bootkube/assets/experimental/bootstrap-manifests ] && mv /opt/bootkube/assets/experimental/bootstrap-manifests/* /opt/bootkube/assets/bootstrap-manifests && rm -r /opt/bootkube/assets/experimental/bootstrap-manifests + BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.6.2}" + BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" + exec /usr/bin/rkt run \ + --trust-keys-from-https \ + --volume assets,kind=host,source=$${BOOTKUBE_ASSETS} \ + --mount volume=assets,target=/assets \ + --volume bootstrap,kind=host,source=/etc/kubernetes \ + --mount volume=bootstrap,target=/etc/kubernetes \ + $${RKT_OPTS} \ + $${BOOTKUBE_ACI}:$${BOOTKUBE_VERSION} \ + --net=host \ + --dns=host \ + --exec=/bootkube -- start --asset-dir=/assets "$@" +passwd: + users: + - name: core + ssh_authorized_keys: + - "${ssh_authorized_key}" diff --git a/aws/container-linux/kubernetes/cl/worker.yaml.tmpl b/aws/container-linux/kubernetes/cl/worker.yaml.tmpl new file mode 100644 index 00000000..f6ab5d50 --- /dev/null +++ b/aws/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -0,0 +1,130 @@ +--- +systemd: + units: + - name: docker.service + enable: true + - name: locksmithd.service + mask: true + - name: wait-for-dns.service + enable: true + contents: | + [Unit] + Description=Wait for DNS entries + Wants=systemd-resolved.service + Before=kubelet.service + [Service] + Type=oneshot + RemainAfterExit=true + ExecStart=/bin/sh -c 'while ! /usr/bin/grep '^[^#[:space:]]' /etc/resolv.conf > /dev/null; do sleep 1; done' + [Install] + RequiredBy=kubelet.service + - name: kubelet.service + enable: true + contents: | + [Unit] + Description=Kubelet via Hyperkube ACI + [Service] + EnvironmentFile=/etc/kubernetes/kubelet.env + Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \ + --volume=resolv,kind=host,source=/etc/resolv.conf \ + --mount volume=resolv,target=/etc/resolv.conf \ + --volume var-lib-cni,kind=host,source=/var/lib/cni \ + --mount volume=var-lib-cni,target=/var/lib/cni \ + --volume opt-cni-bin,kind=host,source=/opt/cni/bin \ + --mount volume=opt-cni-bin,target=/opt/cni/bin \ + --volume var-log,kind=host,source=/var/log \ + --mount volume=var-log,target=/var/log" + ExecStartPre=/bin/mkdir -p /opt/cni/bin + ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests + ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets + ExecStartPre=/bin/mkdir -p /etc/kubernetes/inactive-manifests + ExecStartPre=/bin/mkdir -p /var/lib/cni + ExecStartPre=/usr/bin/bash -c "grep 'certificate-authority-data' /etc/kubernetes/kubeconfig | awk '{print $2}' | base64 -d > /etc/kubernetes/ca.crt" + ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/cache/kubelet-pod.uuid + ExecStart=/usr/lib/coreos/kubelet-wrapper \ + --allow-privileged \ + --anonymous-auth=false \ + --client-ca-file=/etc/kubernetes/ca.crt \ + --cluster_dns=${k8s_dns_service_ip} \ + --cluster_domain=cluster.local \ + --cni-conf-dir=/etc/kubernetes/cni/net.d \ + --exit-on-lock-contention \ + --kubeconfig=/etc/kubernetes/kubeconfig \ + --lock-file=/var/run/lock/kubelet.lock \ + --network-plugin=cni \ + --node-labels=node-role.kubernetes.io/node \ + --pod-manifest-path=/etc/kubernetes/manifests \ + --require-kubeconfig + ExecStop=-/usr/bin/rkt stop --uuid-file=/var/cache/kubelet-pod.uuid + Restart=always + RestartSec=5 + [Install] + WantedBy=multi-user.target + - name: delete-node.service + enable: true + contents: | + [Unit] + Description=Waiting to delete Kubernetes node on shutdown + [Service] + Type=oneshot + RemainAfterExit=true + ExecStart=/bin/true + ExecStop=/etc/kubernetes/delete-node + [Install] + WantedBy=multi-user.target +storage: + files: + - path: /etc/kubernetes/kubeconfig + filesystem: root + mode: 0644 + contents: + inline: | + apiVersion: v1 + kind: Config + clusters: + - name: local + cluster: + server: ${kubeconfig_server} + certificate-authority-data: ${kubeconfig_ca_cert} + users: + - name: kubelet + user: + client-certificate-data: ${kubeconfig_kubelet_cert} + client-key-data: ${kubeconfig_kubelet_key} + contexts: + - context: + cluster: local + user: kubelet + - path: /etc/kubernetes/kubelet.env + filesystem: root + mode: 0644 + contents: + inline: | + KUBELET_IMAGE_URL=quay.io/coreos/hyperkube + KUBELET_IMAGE_TAG=v1.7.5_coreos.0 + - path: /etc/sysctl.d/max-user-watches.conf + filesystem: root + contents: + inline: | + fs.inotify.max_user_watches=16184 + - path: /etc/kubernetes/delete-node + filesystem: root + mode: 0744 + contents: + inline: | + #!/bin/bash + set -e + exec /usr/bin/rkt run \ + --trust-keys-from-https \ + --volume config,kind=host,source=/etc/kubernetes \ + --mount volume=config,target=/etc/kubernetes \ + quay.io/coreos/hyperkube:v1.7.5_coreos.0 \ + --net=host \ + --dns=host \ + --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname) +passwd: + users: + - name: core + ssh_authorized_keys: + - "${ssh_authorized_key}" diff --git a/aws/container-linux/kubernetes/controllers.tf b/aws/container-linux/kubernetes/controllers.tf new file mode 100644 index 00000000..b6ad2ffd --- /dev/null +++ b/aws/container-linux/kubernetes/controllers.tf @@ -0,0 +1,244 @@ +# Controllers AutoScaling Group +resource "aws_autoscaling_group" "controllers" { + name = "${var.cluster_name}-controller" + load_balancers = ["${aws_elb.controllers.id}"] + + # count + desired_capacity = "${var.controller_count}" + min_size = "${var.controller_count}" + max_size = "${var.controller_count}" + + # network + vpc_zone_identifier = ["${aws_subnet.public.*.id}"] + + # template + launch_configuration = "${aws_launch_configuration.controller.name}" + + lifecycle { + # override the default destroy and replace update behavior + create_before_destroy = true + ignore_changes = ["image_id"] + } + + tags = [{ + key = "Name" + value = "${var.cluster_name}-controller" + propagate_at_launch = true + }] +} + +# Controller template +resource "aws_launch_configuration" "controller" { + name_prefix = "${var.cluster_name}-controller-template-" + image_id = "${data.aws_ami.coreos.image_id}" + instance_type = "${var.controller_type}" + + user_data = "${data.ct_config.controller_ign.rendered}" + + # storage + root_block_device { + volume_type = "standard" + volume_size = "${var.disk_size}" + } + + # network + associate_public_ip_address = true + security_groups = ["${aws_security_group.controller.id}"] + + lifecycle { + // Override the default destroy and replace update behavior + create_before_destroy = true + } +} + +# Controller Container Linux Config +data "template_file" "controller_config" { + template = "${file("${path.module}/cl/controller.yaml.tmpl")}" + + vars = { + k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" + k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" + ssh_authorized_key = "${var.ssh_authorized_key}" + kubeconfig_ca_cert = "${module.bootkube.ca_cert}" + kubeconfig_kubelet_cert = "${module.bootkube.kubelet_cert}" + kubeconfig_kubelet_key = "${module.bootkube.kubelet_key}" + kubeconfig_server = "${module.bootkube.server}" + } +} + +data "ct_config" "controller_ign" { + content = "${data.template_file.controller_config.rendered}" + pretty_print = false +} + +# Security Group (instance firewall) + +resource "aws_security_group" "controller" { + name = "${var.cluster_name}-controller" + description = "${var.cluster_name} controller security group" + + vpc_id = "${aws_vpc.network.id}" + + tags = "${map("Name", "${var.cluster_name}-controller")}" +} + +resource "aws_security_group_rule" "controller-icmp" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = "icmp" + from_port = 0 + to_port = 0 + cidr_blocks = ["0.0.0.0/0"] +} + +resource "aws_security_group_rule" "controller-ssh" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = "tcp" + from_port = 22 + to_port = 22 + cidr_blocks = ["0.0.0.0/0"] +} + +resource "aws_security_group_rule" "controller-apiserver" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = "tcp" + from_port = 443 + to_port = 443 + cidr_blocks = ["0.0.0.0/0"] +} + +resource "aws_security_group_rule" "controller-etcd" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = "tcp" + from_port = 2379 + to_port = 2380 + self = true +} + +resource "aws_security_group_rule" "controller-bootstrap-etcd" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = "tcp" + from_port = 12379 + to_port = 12380 + self = true +} + +resource "aws_security_group_rule" "controller-flannel" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = "udp" + from_port = 8472 + to_port = 8472 + source_security_group_id = "${aws_security_group.worker.id}" +} + +resource "aws_security_group_rule" "controller-flannel-self" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = "udp" + from_port = 8472 + to_port = 8472 + self = true +} + +resource "aws_security_group_rule" "controller-kubelet-read" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = "tcp" + from_port = 10255 + to_port = 10255 + source_security_group_id = "${aws_security_group.worker.id}" +} + +resource "aws_security_group_rule" "controller-kubelet-read-self" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = "tcp" + from_port = 10255 + to_port = 10255 + self = true +} + +resource "aws_security_group_rule" "controller-bgp" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = "tcp" + from_port = 179 + to_port = 179 + source_security_group_id = "${aws_security_group.worker.id}" +} + +resource "aws_security_group_rule" "controller-bgp-self" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = "tcp" + from_port = 179 + to_port = 179 + self = true +} + +resource "aws_security_group_rule" "controller-ipip" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = 4 + from_port = 0 + to_port = 0 + source_security_group_id = "${aws_security_group.worker.id}" +} + +resource "aws_security_group_rule" "controller-ipip-self" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = 4 + from_port = 0 + to_port = 0 + self = true +} + +resource "aws_security_group_rule" "controller-ipip-legacy" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = 94 + from_port = 0 + to_port = 0 + source_security_group_id = "${aws_security_group.worker.id}" +} + +resource "aws_security_group_rule" "controller-ipip-legacy-self" { + security_group_id = "${aws_security_group.controller.id}" + + type = "ingress" + protocol = 94 + from_port = 0 + to_port = 0 + self = true +} + +resource "aws_security_group_rule" "controller-egress" { + security_group_id = "${aws_security_group.controller.id}" + + type = "egress" + protocol = "-1" + from_port = 0 + to_port = 0 + cidr_blocks = ["0.0.0.0/0"] + ipv6_cidr_blocks = ["::/0"] +} diff --git a/aws/container-linux/kubernetes/elb.tf b/aws/container-linux/kubernetes/elb.tf new file mode 100644 index 00000000..51f526f5 --- /dev/null +++ b/aws/container-linux/kubernetes/elb.tf @@ -0,0 +1,48 @@ +# Controller Network Load Balancer DNS Record +resource "aws_route53_record" "controllers" { + zone_id = "${var.dns_zone_id}" + + name = "${format("%s.%s.", var.cluster_name, var.dns_zone)}" + type = "A" + + # AWS recommends their special "alias" records for ELBs + alias { + name = "${aws_elb.controllers.dns_name}" + zone_id = "${aws_elb.controllers.zone_id}" + evaluate_target_health = true + } +} + +# Controller Network Load Balancer +resource "aws_elb" "controllers" { + name = "${var.cluster_name}-controllers" + subnets = ["${aws_subnet.public.*.id}"] + security_groups = ["${aws_security_group.controller.id}"] + + listener { + lb_port = 22 + lb_protocol = "tcp" + instance_port = 22 + instance_protocol = "tcp" + } + + listener { + lb_port = 443 + lb_protocol = "tcp" + instance_port = 443 + instance_protocol = "tcp" + } + + # Kubelet HTTP health check + health_check { + target = "HTTP:10255/healthz" + healthy_threshold = 2 + unhealthy_threshold = 4 + timeout = 5 + interval = 6 + } + + idle_timeout = 1800 + connection_draining = true + connection_draining_timeout = 300 +} diff --git a/aws/container-linux/kubernetes/ingress.tf b/aws/container-linux/kubernetes/ingress.tf new file mode 100644 index 00000000..480c6d44 --- /dev/null +++ b/aws/container-linux/kubernetes/ingress.tf @@ -0,0 +1,32 @@ +# Ingress Network Load Balancer +resource "aws_elb" "ingress" { + name = "${var.cluster_name}-ingress" + subnets = ["${aws_subnet.public.*.id}"] + security_groups = ["${aws_security_group.worker.id}"] + + listener { + lb_port = 80 + lb_protocol = "tcp" + instance_port = 80 + instance_protocol = "tcp" + } + + listener { + lb_port = 443 + lb_protocol = "tcp" + instance_port = 443 + instance_protocol = "tcp" + } + + # Kubelet HTTP health check + health_check { + target = "HTTP:10254/healthz" + healthy_threshold = 2 + unhealthy_threshold = 4 + timeout = 5 + interval = 6 + } + + connection_draining = true + connection_draining_timeout = 300 +} diff --git a/aws/container-linux/kubernetes/network.tf b/aws/container-linux/kubernetes/network.tf new file mode 100644 index 00000000..1be5073b --- /dev/null +++ b/aws/container-linux/kubernetes/network.tf @@ -0,0 +1,57 @@ +data "aws_availability_zones" "all" {} + +# Network VPC, gateway, and routes + +resource "aws_vpc" "network" { + cidr_block = "${var.host_cidr}" + assign_generated_ipv6_cidr_block = true + enable_dns_support = true + enable_dns_hostnames = true + + tags = "${map("Name", "${var.cluster_name}")}" +} + +resource "aws_internet_gateway" "gateway" { + vpc_id = "${aws_vpc.network.id}" + + tags = "${map("Name", "${var.cluster_name}")}" +} + +resource "aws_route_table" "default" { + vpc_id = "${aws_vpc.network.id}" + + route { + cidr_block = "0.0.0.0/0" + gateway_id = "${aws_internet_gateway.gateway.id}" + } + + route { + ipv6_cidr_block = "::/0" + gateway_id = "${aws_internet_gateway.gateway.id}" + } + + tags = "${map("Name", "${var.cluster_name}")}" +} + +# Subnets (one per availability zone) + +resource "aws_subnet" "public" { + count = "${length(data.aws_availability_zones.all.names)}" + + vpc_id = "${aws_vpc.network.id}" + availability_zone = "${data.aws_availability_zones.all.names[count.index]}" + + cidr_block = "${cidrsubnet(var.host_cidr, 4, count.index)}" + ipv6_cidr_block = "${cidrsubnet(aws_vpc.network.ipv6_cidr_block, 8, count.index)}" + map_public_ip_on_launch = true + assign_ipv6_address_on_creation = true + + tags = "${map("Name", "${var.cluster_name}-public-${count.index}")}" +} + +resource "aws_route_table_association" "public" { + count = "${length(data.aws_availability_zones.all.names)}" + + route_table_id = "${aws_route_table.default.id}" + subnet_id = "${element(aws_subnet.public.*.id, count.index)}" +} diff --git a/aws/container-linux/kubernetes/ssh.tf b/aws/container-linux/kubernetes/ssh.tf new file mode 100644 index 00000000..8b9b89dd --- /dev/null +++ b/aws/container-linux/kubernetes/ssh.tf @@ -0,0 +1,25 @@ +# Secure copy bootkube assets to ONE controller and start bootkube to perform +# one-time self-hosted cluster bootstrapping. +resource "null_resource" "bootkube-start" { + depends_on = ["module.bootkube", "aws_autoscaling_group.controllers"] + + # TODO: SSH to a controller's IP instead of waiting on DNS resolution + connection { + type = "ssh" + host = "${aws_route53_record.controllers.fqdn}" + user = "core" + timeout = "15m" + } + + provisioner "file" { + source = "${var.asset_dir}" + destination = "$HOME/assets" + } + + provisioner "remote-exec" { + inline = [ + "sudo mv /home/core/assets /opt/bootkube", + "sudo systemctl start bootkube", + ] + } +} diff --git a/aws/container-linux/kubernetes/variables.tf b/aws/container-linux/kubernetes/variables.tf new file mode 100644 index 00000000..05f17ec7 --- /dev/null +++ b/aws/container-linux/kubernetes/variables.tf @@ -0,0 +1,96 @@ +variable "cluster_name" { + type = "string" + description = "Cluster name" +} + +variable "dns_zone" { + type = "string" + description = "AWS DNS Zone (e.g. aws.dghubble.io)" +} + +variable "dns_zone_id" { + type = "string" + description = "AWS DNS Zone ID (e.g. Z3PAABBCFAKEC0)" +} + +variable "ssh_authorized_key" { + type = "string" + description = "SSH public key for user 'core'" +} + +variable "os_channel" { + type = "string" + default = "stable" + description = "Container Linux AMI channel (stable, beta, alpha)" +} + +variable "disk_size" { + type = "string" + default = "40" + description = "The size of the disk in Gigabytes" +} + +variable "host_cidr" { + description = "CIDR IPv4 range to assign to EC2 nodes" + type = "string" + default = "10.0.0.0/16" +} + +variable "controller_count" { + type = "string" + default = "1" + description = "Number of controllers" +} + +variable "controller_type" { + type = "string" + default = "t2.small" + description = "Controller EC2 instance type" +} + +variable "worker_count" { + type = "string" + default = "1" + description = "Number of workers" +} + +variable "worker_type" { + type = "string" + default = "t2.small" + description = "Worker EC2 instance type" +} + +# bootkube assets + +variable "asset_dir" { + description = "Path to a directory where generated assets should be placed (contains secrets)" + type = "string" +} + +variable "networking" { + description = "Choice of networking provider (calico or flannel)" + type = "string" + default = "calico" +} + +variable "network_mtu" { + description = "CNI interface MTU (applies to calico only). Use 8981 if using instances types with Jumbo frames." + type = "string" + default = "1480" +} + +variable "pod_cidr" { + description = "CIDR IPv4 range to assign Kubernetes pods" + type = "string" + default = "10.2.0.0/16" +} + +variable "service_cidr" { + description = < Date: Sun, 17 Sep 2017 21:43:00 -0700 Subject: [PATCH 2/3] *: Fix Terraform fmt and comments --- bare-metal/container-linux/kubernetes/ssh.tf | 3 +-- digital-ocean/container-linux/kubernetes/controllers.tf | 4 ++-- digital-ocean/container-linux/kubernetes/ssh.tf | 2 +- digital-ocean/container-linux/kubernetes/workers.tf | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bare-metal/container-linux/kubernetes/ssh.tf b/bare-metal/container-linux/kubernetes/ssh.tf index 3d20d349..059b6e92 100644 --- a/bare-metal/container-linux/kubernetes/ssh.tf +++ b/bare-metal/container-linux/kubernetes/ssh.tf @@ -71,8 +71,7 @@ resource "null_resource" "copy-secrets" { resource "null_resource" "bootkube-start" { # Without depends_on, this remote-exec may start before the kubeconfig copy. # Terraform only does one task at a time, so it would try to bootstrap - # Kubernetes and Tectonic while no Kubelets are running. Ensure all nodes - # receive a kubeconfig before proceeding with bootkube. + # while no Kubelets are running. depends_on = ["null_resource.copy-secrets"] connection { diff --git a/digital-ocean/container-linux/kubernetes/controllers.tf b/digital-ocean/container-linux/kubernetes/controllers.tf index c0279e03..4a381f6e 100644 --- a/digital-ocean/container-linux/kubernetes/controllers.tf +++ b/digital-ocean/container-linux/kubernetes/controllers.tf @@ -46,8 +46,8 @@ data "template_file" "controller_config" { template = "${file("${path.module}/cl/controller.yaml.tmpl")}" vars = { - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" + k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" + k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" } } diff --git a/digital-ocean/container-linux/kubernetes/ssh.tf b/digital-ocean/container-linux/kubernetes/ssh.tf index 6e270916..166230b5 100644 --- a/digital-ocean/container-linux/kubernetes/ssh.tf +++ b/digital-ocean/container-linux/kubernetes/ssh.tf @@ -20,7 +20,7 @@ resource "null_resource" "copy-secrets" { ] } } - + # Secure copy bootkube assets to ONE controller and start bootkube to perform # one-time self-hosted cluster bootstrapping. resource "null_resource" "bootkube-start" { diff --git a/digital-ocean/container-linux/kubernetes/workers.tf b/digital-ocean/container-linux/kubernetes/workers.tf index 1f33a418..658a4a01 100644 --- a/digital-ocean/container-linux/kubernetes/workers.tf +++ b/digital-ocean/container-linux/kubernetes/workers.tf @@ -43,8 +43,8 @@ data "template_file" "worker_config" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars = { - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" + k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" + k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" } } From 47387d552ab67401b8c377b18e8c0f9273271f39 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sun, 17 Sep 2017 22:50:55 -0700 Subject: [PATCH 3/3] docs: Add tutorial for AWS usage --- README.md | 4 +- docs/aws.md | 248 +++++++++++++++++++++++++++++++++++++++++++ docs/bare-metal.md | 8 +- docs/concepts.md | 4 +- docs/google-cloud.md | 6 +- docs/index.md | 4 +- mkdocs.yml | 1 + 7 files changed, 264 insertions(+), 11 deletions(-) create mode 100644 docs/aws.md diff --git a/README.md b/README.md index f5772df5..98a4f8db 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features * Kubernetes v1.7.5 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) -* Single or multi-master, workloads isolated on workers, [flannel](https://github.com/coreos/flannel) or [Calico](https://www.projectcalico.org/) networking +* Single or multi-master, workloads isolated on workers, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) networking * On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, [network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/) * Ready for Ingress, Dashboards, Metrics, and other optional [addons](https://typhoon.psdn.io/addons/overview/) @@ -22,6 +22,7 @@ Typhoon provides a Terraform Module for each supported operating system and plat | Platform | Operating System | Terraform Module | |---------------|------------------|------------------| +| AWS | Container Linux | [aws/container-linux/kubernetes](aws/container-linux/kubernetes) | | Bare-Metal | Container Linux | [bare-metal/container-linux/kubernetes](bare-metal/container-linux/kubernetes) | | Digital Ocean | Container Linux | [digital-ocean/container-linux/kubernetes](digital-ocean/container-linux/kubernetes) | | Google Cloud | Container Linux | [google-cloud/container-linux/kubernetes](google-cloud/container-linux/kubernetes) | @@ -30,6 +31,7 @@ Typhoon provides a Terraform Module for each supported operating system and plat * [Docs](https://typhoon.psdn.io) * [Concepts](https://typhoon.psdn.io/concepts/) +* [AWS](https://typhoon.psdn.io/aws/) * [Bare-Metal](https://typhoon.psdn.io/bare-metal/) * [Digital Ocean](https://typhoon.psdn.io/digital-ocean/) * [Google-Cloud](https://typhoon.psdn.io/google-cloud/) diff --git a/docs/aws.md b/docs/aws.md new file mode 100644 index 00000000..be52280d --- /dev/null +++ b/docs/aws.md @@ -0,0 +1,248 @@ +# AWS + +In this tutorial, we'll create a Kubernetes v1.7.5 cluster on AWS. + +We'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module. On apply, a VPC, gateway, subnets, auto-scaling groups of controllers and workers, network load balancers for controllers and workers, and security groups will be created. + +Controllers and workers are provisioned to run a `kubelet`. A one-time [bootkube](https://github.com/kubernetes-incubator/bootkube) bootstrap schedules `etcd`, `apiserver`, `scheduler`, `controller-manager`, and `kube-dns` on controllers and runs `kube-proxy` and `flannel` or `calico` on each node. A generated `kubeconfig` provides `kubectl` access to the cluster. + +!!! warning "Alpha" + Typhoon Kubernetes clusters on AWS are marked as "alpha". + +!!! warning "Disabled" + Clusters do not use EC2 instances with elevated IAM roles. Kubernetes AWS integrations are not enabled. + +## Requirements + +* AWS Account and IAM credentials +* AWS Route53 DNS Zone (registered Domain Name or delegated subdomain) +* Terraform v0.10.1+ and [terraform-provider-ct](https://github.com/coreos/terraform-provider-ct) installed locally + +## Terraform Setup + +Install [Terraform](https://www.terraform.io/downloads.html) v0.10.1 on your system. + +```sh +$ terraform version +Terraform v0.10.1 +``` + +Add the [terraform-provider-ct](https://github.com/coreos/terraform-provider-ct) plugin binary for your system. + +```sh +wget https://github.com/coreos/terraform-provider-ct/releases/download/v0.2.0/terraform-provider-ct-v0.2.0-linux-amd64.tar.gz +tar xzf terraform-provider-ct-v0.2.0-linux-amd64.tar.gz +sudo mv terraform-provider-ct-v0.2.0-linux-amd64/terraform-provider-ct /usr/local/bin/ +``` + +Add the plugin to your `~/.terraformrc`. + +``` +providers { + ct = "/usr/local/bin/terraform-provider-ct" +} +``` + +Read [concepts](concepts.md) to learn about Terraform, modules, and organizing resources. Change to your infrastructure repository (e.g. `infra`). + +``` +cd infra/clusters +``` + +## Provider + +Login to your AWS IAM dashboard and find your IAM user. Select "Security Credentials" and create an access key. Save the id and secret to a file that can be referenced in configs. + +``` +[default] +aws_access_key_id = xxx +aws_secret_access_key = yyy +``` + +Configure the AWS provider to use your access key credentials in a `providers.tf` file. + +```tf +provider "aws" { + region = "eu-central-1" + shared_credentials_file = "/home/user/.config/aws/credentials" +} +``` + +Additional configuration options are described in the `aws` provider [docs](https://www.terraform.io/docs/providers/aws/). + +!!! tip + Regions are listed in [docs](http://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region) or with `aws ec2 describe-regions`. + +## Cluster + +Define a Kubernetes cluster using the module `aws/container-linux/kubernetes`. + +```tf +module "aws-tempest" { + source = "git::https://github.com/poseidon/typhoon//aws/container-linux/kubernetes" + + cluster_name = "tempest" + + # AWS + dns_zone = "aws.example.com" + dns_zone_id = "Z3PAABBCFAKEC0" + controller_count = 1 + controller_type = "t2.small" + worker_count = 2 + worker_type = "t2.small" + ssh_authorized_key = "ssh-rsa AAAAB3Nz..." + + # bootkube + asset_dir = "/home/user/.secrets/clusters/tempest" +} +``` + +Reference the [variables docs](#variables) or the [variables.tf](https://github.com/poseidon/typhoon/blob/master/aws/container-linux/kubernetes/variables.tf) source. + +## ssh-agent + +Initial bootstrapping requires `bootkube.service` be started on one controller node. Terraform uses `ssh-agent` to automate this step. Add your SSH private key to `ssh-agent`. + +```sh +ssh-add ~/.ssh/id_rsa +ssh-add -L +``` + +!!! warning + `terrafrom apply` will hang connecting to a controller if `ssh-agent` does not contain the SSH key. + +## Apply + +Initialize the config directory if this is the first use with Terraform. + +```sh +terraform init +``` + +Get or update Terraform modules. + +```sh +$ terraform get # downloads missing modules +$ terraform get --update # updates all modules +Get: git::https://github.com/poseidon/typhoon (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.2 (update) +``` + +Plan the resources to be created. + +```sh +$ terraform plan +Plan: 98 to add, 0 to change, 0 to destroy. +``` + +Apply the changes to create the cluster. + +```sh +$ terraform apply +... +module.aws-tempest.null_resource.bootkube-start: Still creating... (10m50s elapsed) +module.aws-tempest.null_resource.bootkube-start: Still creating... (11m0s elapsed) +module.aws-tempest.null_resource.bootkube-start: Creation complete after 11m8s (ID: 3961816482286168143) + +Apply complete! Resources: 98 added, 0 changed, 0 destroyed. +``` + +In 10-20 minutes, the Kubernetes cluster will be ready. + +!!! bug "" + Typhoon clusters on AWS take much longer to create than clusters on other platforms. This is related to DNS resolution time to the ASG, which will be resolved in a future version that uses static controllers. + +## Verify + +[Install kubectl](https://coreos.com/kubernetes/docs/latest/configure-kubectl.html) on your system. Use the generated `kubeconfig` credentials to access the Kubernetes cluster and list nodes. + +``` +$ KUBECONFIG=/home/user/.secrets/clusters/tempest/auth/kubeconfig +$ kubectl get nodes +NAME STATUS AGE VERSION +ip-10-0-12-221 Ready 34m v1.7.5+coreos.0 +ip-10-0-19-112 Ready 34m v1.7.5+coreos.0 +ip-10-0-4-22 Ready 34m v1.7.5+coreos.0 +``` + +List the pods. + +``` +$ kubectl get pods --all-namespaces +NAMESPACE NAME READY STATUS RESTARTS AGE +kube-system calico-node-1m5bf 2/2 Running 0 34m +kube-system calico-node-7jmr1 2/2 Running 0 34m +kube-system calico-node-bknc8 2/2 Running 0 34m +kube-system etcd-operator-2287495111-br512 1/1 Running 1 34m +kube-system kube-apiserver-4mjbk 1/1 Running 0 34m +kube-system kube-controller-manager-3597210155-j2jbt 1/1 Running 1 34m +kube-system kube-controller-manager-3597210155-j7g7x 1/1 Running 0 34m +kube-system kube-dns-1187388186-wx1lg 3/3 Running 0 34m +kube-system kube-etcd-0000 1/1 Running 0 32m +kube-system kube-etcd-network-checkpointer-dt5pt 1/1 Running 0 34m +kube-system kube-proxy-14wxv 1/1 Running 0 34m +kube-system kube-proxy-9vxh2 1/1 Running 0 34m +kube-system kube-proxy-sbbsh 1/1 Running 0 34m +kube-system kube-scheduler-3359497473-5plhf 1/1 Running 0 34m +kube-system kube-scheduler-3359497473-r7zg7 1/1 Running 1 34m +kube-system pod-checkpointer-4kxtl 1/1 Running 0 34m +kube-system pod-checkpointer-4kxtl-ip-10-0-12-221 1/1 Running 0 33m +``` + +## Going Further + +Learn about [version pinning](concepts.md#versioning), maintenance, and [addons](addons/overview.md). + +!!! note + On Container Linux clusters, install the `container-linux-update-operator` addon to coordinate reboots and drains when nodes auto-update. Otherwise, updates may not be applied until the next reboot. + +## Variables + +### Required + +| Name | Description | Example | +|:-----|:------------|:--------| +| cluster_name | Unique cluster name (prepended to dns_zone) | "tempest" | +| dns_zone | AWS Route53 DNS zone | "aws.example.com" | +| dns_zone_id | AWS Route53 DNS zone id | "Z3PAABBCFAKEC0" | +| ssh_authorized_key | SSH public key for ~/.ssh_authorized_keys | "ssh-rsa AAAAB3NZ..." | +| os_channel | Container Linux AMI channel | stable, beta, alpha | +| asset_dir | Path to a directory where generated assets should be placed (contains secrets) | "/home/user/.secrets/clusters/tempest" | + +#### DNS Zone + +Clusters create a DNS A record `${cluster_name}.${dns_zone}` to resolve a network load balancer backed by controller instances. This FQDN is used by workers and `kubectl` to access the apiserver. In this example, the cluster's apiserver would be accessible at `tempest.aws.example.com`. + +You'll need a registered domain name or subdomain registered in a AWS Route53 DNS zone. You can set this up once and create many clusters with unqiue names. + +```tf +resource "aws_route53_zone" "zone-for-clusters" { + name = "aws.example.com." +} +``` + +Reference the DNS zone id with `"${aws_route53_zone.zone-for-clusters.zone_id}"`. + +!!! tip "" + If you have an existing domain name with a zone file elsewhere, just carve out a subdomain that can be managed on Route53 (e.g. aws.mydomain.com) and [update nameservers](http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/SOA-NSrecords.html). + +### Optional + +| Name | Description | Default | Example | +|:-----|:------------|:--------|:--------| +| controller_count | Number of controllers (i.e. masters) | 1 | 1 | +| controller_type | Controller EC2 instance type | "t2.small" | "t2.medium" | +| worker_count | Number of workers | 1 | 3 | +| worker_type | Worker EC2 instance type | "t2.small" | "t2.medium" | +| disk_size | Size of the EBS volume in GB | "40" | "100" | +| networking | Choice of networking provider | "calico" | "calico" or "flannel" | +| network_mtu | CNI interface MTU (calico only) | 1480 | 8981 | +| host_cidr | CIDR range to assign to EC2 instances | "10.0.0.0/16" | "10.1.0.0/16" | +| pod_cidr | CIDR range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | +| service_cidr | CIDR range to assgin to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | + +Check the list of valid [instance types](https://aws.amazon.com/ec2/instance-types/). + +!!! tip "MTU" + If your EC2 instance type supports [Jumbo frames](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/network_mtu.html#jumbo_frame_instances) (most do), we recommend you change the `network_mtu` to 8991! You will get better pod-to-pod bandwidth. + diff --git a/docs/bare-metal.md b/docs/bare-metal.md index e1d5c75d..da43efd0 100644 --- a/docs/bare-metal.md +++ b/docs/bare-metal.md @@ -4,7 +4,7 @@ In this tutorial, we'll network boot and provison a Kubernetes v1.7.5 cluster on First, we'll deploy a [Matchbox](https://github.com/coreos/matchbox) service and setup a network boot environment. Then, we'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module and power on machines. On PXE boot, machines will install Container Linux to disk, reboot into the disk install, and provision themselves as Kubernetes controllers or workers. -Controllers are provisioned as etcd peers and run `etcd-member` (etcd3) and `kubelet`. Workers are provisioned to run a `kubelet`. A one-time [bootkube](https://github.com/kubernetes-incubator/bootkube) bootstrap schedules an `apiserver`, `scheduler`, `controller-manager`, and `kube-dns` on controllers and runs `kube-proxy` and `flannel` on each node. A generated `kubeconfig` provides `kubectl` access to the cluster. +Controllers are provisioned as etcd peers and run `etcd-member` (etcd3) and `kubelet`. Workers are provisioned to run a `kubelet`. A one-time [bootkube](https://github.com/kubernetes-incubator/bootkube) bootstrap schedules an `apiserver`, `scheduler`, `controller-manager`, and `kube-dns` on controllers and runs `kube-proxy` and `flannel` or `calico` on each node. A generated `kubeconfig` provides `kubectl` access to the cluster. ## Requirements @@ -305,14 +305,14 @@ List the pods. ``` $ kubectl get pods --all-namespaces NAMESPACE NAME READY STATUS RESTARTS AGE +kube-system calico-node-6qp7f 2/2 Running 1 11m +kube-system calico-node-gnjrm 2/2 Running 0 11m +kube-system calico-node-llbgt 2/2 Running 0 11m kube-system kube-apiserver-7336w 1/1 Running 0 11m kube-system kube-controller-manager-3271970485-b9chx 1/1 Running 0 11m kube-system kube-controller-manager-3271970485-v30js 1/1 Running 1 11m kube-system kube-dns-1187388186-mx9rt 3/3 Running 0 11m kube-system kube-etcd-network-checkpointer-q24f7 1/1 Running 0 11m -kube-system kube-flannel-6qp7f 2/2 Running 1 11m -kube-system kube-flannel-gnjrm 2/2 Running 0 11m -kube-system kube-flannel-llbgt 2/2 Running 0 11m kube-system kube-proxy-50sd4 1/1 Running 0 11m kube-system kube-proxy-bczhp 1/1 Running 0 11m kube-system kube-proxy-mp2fw 1/1 Running 0 11m diff --git a/docs/concepts.md b/docs/concepts.md index 94ed858c..4b4a08f9 100644 --- a/docs/concepts.md +++ b/docs/concepts.md @@ -8,7 +8,7 @@ Let's cover the concepts you'll need to get started. #### Nodes -Cluster nodes provision themselves from a declarative configuration upfront. Nodes run a `kubelet` service and register themselves with the control plane to join the higher order cluster. +Cluster nodes provision themselves from a declarative configuration upfront. Nodes run a `kubelet` service and register themselves with the control plane to join the higher order cluster. All nodes run `kube-proxy` and `calico` or `flannel` pods. #### Controllers @@ -16,7 +16,7 @@ Controller nodes are scheduled to run the Kubernetes `apiserver`, `scheduler`, ` #### Workers -Worker nodes register with the control plane and run application workloads. Workers, like all nodes, run `kube-proxy` and `flannel` pods. +Worker nodes register with the control plane and run application workloads. ## Terraform diff --git a/docs/google-cloud.md b/docs/google-cloud.md index adcda03b..3e4295bb 100644 --- a/docs/google-cloud.md +++ b/docs/google-cloud.md @@ -164,6 +164,9 @@ List the pods. ``` $ kubectl get pods --all-namespaces NAMESPACE NAME READY STATUS RESTARTS AGE +kube-system calico-node-1cs8z 2/2 Running 0 6m +kube-system calico-node-d1l5b 2/2 Running 0 6m +kube-system calico-node-sp9ps 2/2 Running 0 6m kube-system etcd-operator-3329263108-f443m 1/1 Running 1 6m kube-system kube-apiserver-zppls 1/1 Running 0 6m kube-system kube-controller-manager-3271970485-gh9kt 1/1 Running 0 6m @@ -171,9 +174,6 @@ kube-system kube-controller-manager-3271970485-h90v8 1/1 Running 1 kube-system kube-dns-1187388186-zj5dl 3/3 Running 0 6m kube-system kube-etcd-0000 1/1 Running 0 5m kube-system kube-etcd-network-checkpointer-crznb 1/1 Running 0 6m -kube-system kube-flannel-1cs8z 2/2 Running 0 6m -kube-system kube-flannel-d1l5b 2/2 Running 0 6m -kube-system kube-flannel-sp9ps 2/2 Running 0 6m kube-system kube-proxy-117v6 1/1 Running 0 6m kube-system kube-proxy-9886n 1/1 Running 0 6m kube-system kube-proxy-njn47 1/1 Running 0 6m diff --git a/docs/index.md b/docs/index.md index e7be313f..e623e815 100644 --- a/docs/index.md +++ b/docs/index.md @@ -12,7 +12,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features * Kubernetes v1.7.5 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) -* Single or multi-master, workloads isolated on workers, [flannel](https://github.com/coreos/flannel) or [Calico](https://www.projectcalico.org/) networking +* Single or multi-master, workloads isolated on workers, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) networking * On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, [network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/) * Ready for Ingress, Dashboards, Metrics and other optional [addons](addons/overview.md) * Provided via Terraform Modules @@ -23,6 +23,7 @@ Typhoon provides a Terraform Module for each supported operating system and plat | Platform | Operating System | Terraform Module | Status | |---------------|------------------|------------------|--------| +| AWS | Container Linux | [aws/container-linux/kubernetes](aws.md) | alpha | | Bare-Metal | Container Linux | [bare-metal/container-linux/kubernetes](bare-metal.md) | production | | Digital Ocean | Container Linux | [digital-ocean/container-linux/kubernetes](digital-ocean.md) | beta | | Google Cloud | Container Linux | [google-cloud/container-linux/kubernetes](google-cloud.md) | production | @@ -31,6 +32,7 @@ Typhoon provides a Terraform Module for each supported operating system and plat * [Concepts](concepts.md) * Tutorials + * [AWS](aws.md) * [Bare-Metal](bare-metal.md) * [Digital Ocean](digital-ocean.md) * [Google-Cloud](google-cloud.md) diff --git a/mkdocs.yml b/mkdocs.yml index ce276df6..e5f6b9fa 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -40,6 +40,7 @@ markdown_extensions: pages: - Home: 'index.md' - 'Concepts': 'concepts.md' + - 'AWS': 'aws.md' - 'Bare-Metal': 'bare-metal.md' - 'Digital Ocean': 'digital-ocean.md' - 'Google Cloud': 'google-cloud.md'