Skip to content

Commit 75def3b

Browse files
authored
Merge pull request #100 from AndiDog/kubeadm-latest-config-version
Use latest kubeadm config API version (breaking change: `apiserver_extra_args` variable changes from dictionary to array)
2 parents 4e69cf0 + abda31f commit 75def3b

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

service/kubernetes/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
variable "apiserver_extra_args" {
2-
type = map(any)
2+
type = list(any) # example item: `{ name: "myarg", value: "myvalue" }`
33

4-
default = {}
4+
default = []
55
}
66

77
variable "apiserver_extra_volumes" {
88
# Not specifying a `type` here since otherwise, Terraform may turn boolean values into strings
99
# and the server will not start (e.g., `"readOnly" = true` becomes stringified by `yamlencode`).
1010
#
1111
# This is a list of volume definitions.
12-
# See https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta3/#kubeadm-k8s-io-v1beta3-ControlPlaneComponent
12+
# See https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/#kubeadm-k8s-io-v1beta4-ControlPlaneComponent
1313

1414
default = []
1515
}

service/kubernetes/templates/master-configuration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
apiVersion: kubeadm.k8s.io/v1beta3
1+
apiVersion: kubeadm.k8s.io/v1beta4
22
kind: InitConfiguration
33
localAPIEndpoint:
44
advertiseAddress: ${api_advertise_address}
55
bindPort: 6443
66
---
7-
apiVersion: kubeadm.k8s.io/v1beta3
7+
apiVersion: kubeadm.k8s.io/v1beta4
88
kind: ClusterConfiguration
99
certificatesDir: /etc/kubernetes/pki
1010
apiServer:

0 commit comments

Comments
 (0)