kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upcloud: update terraform provider strict anti-affinity (#10474)

pull/10508/head
Robin Wallace 2023-10-07 04:45:41 +02:00 committed by GitHub
parent 4846f33136
commit 5194d8306e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 179 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/terraform/upcloud/README.md
View File

@ -140,4 +140,4 @@ terraform destroy --var-file cluster-settings.tfvars \
* `backend_servers`: List of servers that traffic to the port should be forwarded to. * `backend_servers`: List of servers that traffic to the port should be forwarded to.
* `server_groups`: Group servers together * `server_groups`: Group servers together
* `servers`: The servers that should be included in the group. * `servers`: The servers that should be included in the group.
* `anti_affinity`: If anti-affinity should be enabled, try to spread the VMs out on separate nodes. * `anti_affinity_policy`: Defines if a server group is an anti-affinity group. Setting this to "strict" or yes" will result in all servers in the group being placed on separate compute hosts. The value can be "strict", "yes" or "no". "strict" refers to strict policy doesn't allow servers in the same server group to be on the same host. "yes" refers to best-effort policy and tries to put servers on different hosts, but this is not guaranteed.

8
contrib/terraform/upcloud/cluster-settings.tfvars
View File

@ -18,7 +18,7 @@ ssh_public_keys = [
# check list of available plan https://developers.upcloud.com/1.3/7-plans/ # check list of available plan https://developers.upcloud.com/1.3/7-plans/
machines = { machines = {
"master-0" : { "control-plane-0" : {
"node_type" : "master", "node_type" : "master",
# plan to use instead of custom cpu/mem # plan to use instead of custom cpu/mem
"plan" : null, "plan" : null,
@ -133,9 +133,9 @@ loadbalancers = {
server_groups = { server_groups = {
# "control-plane" = { # "control-plane" = {
# servers = [ # servers = [
# "master-0" # "control-plane-0"
# ] # ]
# anti_affinity = true # anti_affinity_policy = "strict"
# }, # },
# "workers" = { # "workers" = {
# servers = [ # servers = [
@ -143,6 +143,6 @@ server_groups = {
# "worker-1", # "worker-1",
# "worker-2" # "worker-2"
# ] # ]
# anti_affinity = true # anti_affinity_policy = "yes"
# } # }
} }

42
contrib/terraform/upcloud/modules/kubernetes-cluster/main.tf
View File

@ -165,7 +165,7 @@ resource "upcloud_firewall_rules" "master" {
for_each = upcloud_server.master for_each = upcloud_server.master
server_id = each.value.id server_id = each.value.id
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.master_allowed_remote_ips for_each = var.master_allowed_remote_ips
content { content {
@ -181,7 +181,7 @@ resource "upcloud_firewall_rules" "master" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = length(var.master_allowed_remote_ips) > 0 ? [1] : [] for_each = length(var.master_allowed_remote_ips) > 0 ? [1] : []
content { content {
@ -197,7 +197,7 @@ resource "upcloud_firewall_rules" "master" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.k8s_allowed_remote_ips for_each = var.k8s_allowed_remote_ips
content { content {
@ -213,7 +213,7 @@ resource "upcloud_firewall_rules" "master" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = length(var.k8s_allowed_remote_ips) > 0 ? [1] : [] for_each = length(var.k8s_allowed_remote_ips) > 0 ? [1] : []
content { content {
@ -229,7 +229,7 @@ resource "upcloud_firewall_rules" "master" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.master_allowed_ports for_each = var.master_allowed_ports
content { content {
@ -245,7 +245,7 @@ resource "upcloud_firewall_rules" "master" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : [] for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : []
content { content {
@ -261,7 +261,7 @@ resource "upcloud_firewall_rules" "master" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : [] for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : []
content { content {
@ -277,7 +277,7 @@ resource "upcloud_firewall_rules" "master" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : [] for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : []
content { content {
@ -293,7 +293,7 @@ resource "upcloud_firewall_rules" "master" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : [] for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : []
content { content {
@ -309,7 +309,7 @@ resource "upcloud_firewall_rules" "master" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["udp"] : [] for_each = var.firewall_default_deny_in ? ["udp"] : []
content { content {
@ -325,7 +325,7 @@ resource "upcloud_firewall_rules" "master" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["udp"] : [] for_each = var.firewall_default_deny_in ? ["udp"] : []
content { content {
@ -354,7 +354,7 @@ resource "upcloud_firewall_rules" "k8s" {
for_each = upcloud_server.worker for_each = upcloud_server.worker
server_id = each.value.id server_id = each.value.id
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.k8s_allowed_remote_ips for_each = var.k8s_allowed_remote_ips
content { content {
@ -370,7 +370,7 @@ resource "upcloud_firewall_rules" "k8s" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = length(var.k8s_allowed_remote_ips) > 0 ? [1] : [] for_each = length(var.k8s_allowed_remote_ips) > 0 ? [1] : []
content { content {
@ -386,7 +386,7 @@ resource "upcloud_firewall_rules" "k8s" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.worker_allowed_ports for_each = var.worker_allowed_ports
content { content {
@ -402,7 +402,7 @@ resource "upcloud_firewall_rules" "k8s" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : [] for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : []
content { content {
@ -418,7 +418,7 @@ resource "upcloud_firewall_rules" "k8s" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : [] for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : []
content { content {
@ -434,7 +434,7 @@ resource "upcloud_firewall_rules" "k8s" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : [] for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : []
content { content {
@ -450,7 +450,7 @@ resource "upcloud_firewall_rules" "k8s" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : [] for_each = var.firewall_default_deny_in ? ["tcp", "udp"] : []
content { content {
@ -466,7 +466,7 @@ resource "upcloud_firewall_rules" "k8s" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["udp"] : [] for_each = var.firewall_default_deny_in ? ["udp"] : []
content { content {
@ -482,7 +482,7 @@ resource "upcloud_firewall_rules" "k8s" {
} }
} }
dynamic firewall_rule { dynamic "firewall_rule" {
for_each = var.firewall_default_deny_in ? ["udp"] : [] for_each = var.firewall_default_deny_in ? ["udp"] : []
content { content {
@ -552,7 +552,7 @@ resource "upcloud_loadbalancer_static_backend_member" "lb_backend_member" {
resource "upcloud_server_group" "server_groups" { resource "upcloud_server_group" "server_groups" {
for_each = var.server_groups for_each = var.server_groups
title = each.key title = each.key
anti_affinity = each.value.anti_affinity anti_affinity_policy = each.value.anti_affinity_policy
labels = {} labels = {}
members = [for server in each.value.servers : merge(upcloud_server.master, upcloud_server.worker)[server].id] members = [for server in each.value.servers : merge(upcloud_server.master, upcloud_server.worker)[server].id]
} }

2
contrib/terraform/upcloud/modules/kubernetes-cluster/variables.tf
View File

@ -99,7 +99,7 @@ variable "server_groups" {
description = "Server groups" description = "Server groups"
type = map(object({ type = map(object({
anti_affinity = bool anti_affinity_policy = string
servers = list(string) servers = list(string)
})) }))
} }

2
contrib/terraform/upcloud/modules/kubernetes-cluster/versions.tf
View File

@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
upcloud = { upcloud = {
source = "UpCloudLtd/upcloud" source = "UpCloudLtd/upcloud"
version = "~>2.7.1" version = "~>2.12.0"
} }
} }
required_version = ">= 0.13" required_version = ">= 0.13"

8
contrib/terraform/upcloud/sample-inventory/cluster.tfvars
View File

@ -18,7 +18,7 @@ ssh_public_keys = [
# check list of available plan https://developers.upcloud.com/1.3/7-plans/ # check list of available plan https://developers.upcloud.com/1.3/7-plans/
machines = { machines = {
"master-0" : { "control-plane-0" : {
"node_type" : "master", "node_type" : "master",
# plan to use instead of custom cpu/mem # plan to use instead of custom cpu/mem
"plan" : null, "plan" : null,
@ -134,9 +134,9 @@ loadbalancers = {
server_groups = { server_groups = {
# "control-plane" = { # "control-plane" = {
# servers = [ # servers = [
# "master-0" # "control-plane-0"
# ] # ]
# anti_affinity = true # anti_affinity_policy = "strict"
# }, # },
# "workers" = { # "workers" = {
# servers = [ # servers = [
@ -144,6 +144,6 @@ server_groups = {
# "worker-1", # "worker-1",
# "worker-2" # "worker-2"
# ] # ]
# anti_affinity = true # anti_affinity_policy = "yes"
# } # }
} }

2
contrib/terraform/upcloud/variables.tf
View File

@ -136,7 +136,7 @@ variable "server_groups" {
description = "Server groups" description = "Server groups"
type = map(object({ type = map(object({
anti_affinity = bool anti_affinity_policy = string
servers = list(string) servers = list(string)
})) }))

2
contrib/terraform/upcloud/versions.tf
View File

@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
upcloud = { upcloud = {
source = "UpCloudLtd/upcloud" source = "UpCloudLtd/upcloud"
version = "~>2.7.1" version = "~>2.12.0"
} }
} }
required_version = ">= 0.13" required_version = ">= 0.13"