Skip to content
This repository has been archived by the owner on Oct 7, 2021. It is now read-only.

[kops] Add support for running kubernetes cluster in existing VPC #23

Merged
merged 2 commits into from
Apr 13, 2019
Merged

[kops] Add support for running kubernetes cluster in existing VPC #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad67651
Add support for running kubernetes cluster in existing VPC
Nuru Apr 11, 2019
31fbf16
s/KOPS_CONFIGURED/KOPS_SHARED/
Nuru Apr 12, 2019
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
4 changes: 3 additions & 1 deletion configs/root.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ org_network_offset = 100
org_network_newbits = 8 # /8 + /8 = /16
Copy link
Contributor

Choose a reason for hiding this comment

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

this comment seems perhaps out of date?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know, seem right to me, but I'm not fully following it. It says to me we are starting with a CIDR of 10/8 and creating networks of 10.x/16 starting with 10.100/16, which is what, in fact, we are doing.


# Pod IP address space (must not overlap with org_network_cidr)
kops_non_masquerade_cidr = "172.16.0.0/12"
# 100.64.0.0/10 is the default used by kops, even though it is technically reserved for carrier-grade NAT
# See https://github.com/cloudposse/docs/issues/455
kops_non_masquerade_cidr = "100.64.0.0/10"


# The docker registry that will be used for the images built (nothing will get pushed)
Expand Down
4 changes: 3 additions & 1 deletion templates/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ export DOCKER_ORG ?= ${docker_registry}
export DOCKER_IMAGE ?= $(DOCKER_ORG)/${image_name}
export DOCKER_TAG ?= latest
export DOCKER_IMAGE_NAME ?= $(DOCKER_IMAGE):$(DOCKER_TAG)
export DOCKER_BUILD_FLAGS = --pull
# If you do not want to use locally built Geodesic images ever, then you can uncomment the line below
# DOCKER_BUILD_FLAGS = --pull ensures that local images will never be used for your build
# export DOCKER_BUILD_FLAGS = --pull
export README_DEPS ?= docs/targets.md docs/terraform.md
export INSTALL_PATH ?= /usr/local/bin
export SCRIPT ?= $(notdir $(DOCKER_IMAGE))
Expand Down
22 changes: 19 additions & 3 deletions templates/kops/kops-private-topology.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,12 @@ spec:
{{- if bool (getenv "KOPS_AUTHORIZATION_RBAC_ENABLED" "false") }}
anonymousAuth: false
authorizationMode: {{ getenv "KOPS_KUBE_API_SERVER_AUTHORIZATION_MODE" "RBAC" }}
authorizationRbacSuperUser: {{ getenv "KOPS_KUBE_API_SERVER_AUTHORIZATION_RBAC_SUPER_USER" "admin" }}
osterman marked this conversation as resolved.
Show resolved Hide resolved
{{- end }}
{{- if bool (getenv "KOPS_ADMISSION_CONTROL_ENABLED" "true") }}
admissionControl:
- NamespaceLifecycle
- LimitRanger
- ServiceAccount
- PersistentVolumeLabel
Nuru marked this conversation as resolved.
Show resolved Hide resolved
- DefaultStorageClass
- DefaultTolerationSeconds
- MutatingAdmissionWebhook
Expand Down Expand Up @@ -201,24 +199,42 @@ spec:
kubernetesVersion: {{ getenv "KUBERNETES_VERSION" }}
masterPublicName: api.{{ getenv "KOPS_CLUSTER_NAME" }}
networkCIDR: {{ getenv "KOPS_NETWORK_CIDR" "172.20.0.0/16" }}
{{- if getenv "KOPS_SHARED_VPC_ID" }}
networkID: {{ getenv "KOPS_SHARED_VPC_ID" }}
{{- end }}
networking:
calico: {}
nonMasqueradeCIDR: {{ getenv "KOPS_NON_MASQUERADE_CIDR" "100.64.0.0/10" }}
sshAccess:
- 0.0.0.0/0
subnets:
{{- range $index, $value := (getenv "KOPS_AVAILABILITY_ZONES" | strings.Split ",") }}
{{- $privateSubnets := getenv "KOPS_PRIVATE_SUBNETS" }}
{{- $privateSubnets := getenv "KOPS_PRIVATE_SUBNETS" | required "KOPS_PRIVATE_SUBNETS must be defined" }}
{{- $privateSubnetIDs := getenv "KOPS_SHARED_PRIVATE_SUBNET_IDS" }}
{{- $natGateways := getenv "KOPS_SHARED_NAT_GATEWAYS" }}
{{- $subnet := strings.Split "," $privateSubnets }}
{{- $subnetID := strings.Split "," $privateSubnetIDs }}
{{- $nat := strings.Split "," $natGateways }}
- cidr: {{ index $subnet $index }}
{{- if $privateSubnetIDs }}
id: {{ index $subnetID $index }}
{{- end }}
name: {{ $value }}
{{- if $natGateways }}
egress: {{ index $nat $index }}
{{- end }}
type: Private
zone: {{ $value }}
{{- end }}
{{- range $index, $value := (getenv "KOPS_AVAILABILITY_ZONES" | strings.Split ",") }}
{{- $utilitySubnets := getenv "KOPS_UTILITY_SUBNETS" }}
{{- $utilitySubnetIDs := getenv "KOPS_SHARED_UTILITY_SUBNET_IDS" }}
{{- $subnet := strings.Split "," $utilitySubnets }}
{{- $subnetID := strings.Split "," $utilitySubnetIDs }}
- cidr: {{ index $subnet $index }}
{{- if $utilitySubnetIDs }}
id: {{ index $subnetID $index }}
{{- end }}
name: utility-{{ $value }}
type: Utility
zone: {{ $value }}
Expand Down