Skip to content

Commit bec5250

Browse files
committed
Remove unofficial bare-metal *_networkds variables
* Remove controller_networkds and worker_networkds variables. These variables were always listed as experimental, unsupported, and excluded from documentation in anticipation of Container Linux Config snippets * Use Container Linux Config snippets on bare-metal instead. They provide safer, more powerful, and more elegant host customization
1 parent dbdc3fc commit bec5250

File tree

5 files changed

+6
-24
lines changed

5 files changed

+6
-24
lines changed

CHANGES.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
Notable changes between versions.
44

5+
## Latest
6+
7+
#### Bare-Metal
8+
9+
* Remove `controller_networkds` and `worker_networkds` variables. Use Container Linux Config snippets [#277](https://github.com/poseidon/typhoon/pull/277)
10+
511
## v1.11.2
612

713
* Kubernetes [v1.11.2](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#v1112)

bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl

-2
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ storage:
163163
--net=host \
164164
--dns=host \
165165
--exec=/bootkube -- start --asset-dir=/assets "$@"
166-
networkd:
167-
${networkd_content}
168166
passwd:
169167
users:
170168
- name: core

bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl

-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ storage:
9696
contents:
9797
inline: |
9898
fs.inotify.max_user_watches=16184
99-
networkd:
100-
${networkd_content}
10199
passwd:
102100
users:
103101
- name: core

bare-metal/container-linux/kubernetes/profiles.tf

-6
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@ data "template_file" "controller-configs" {
142142
k8s_dns_service_ip = "${module.bootkube.kube_dns_service_ip}"
143143
cluster_domain_suffix = "${var.cluster_domain_suffix}"
144144
ssh_authorized_key = "${var.ssh_authorized_key}"
145-
146-
# Terraform evaluates both sides regardless and element cannot be used on 0 length lists
147-
networkd_content = "${length(var.controller_networkds) == 0 ? "" : element(concat(var.controller_networkds, list("")), count.index)}"
148145
}
149146
}
150147

@@ -174,9 +171,6 @@ data "template_file" "worker-configs" {
174171
k8s_dns_service_ip = "${module.bootkube.kube_dns_service_ip}"
175172
cluster_domain_suffix = "${var.cluster_domain_suffix}"
176173
ssh_authorized_key = "${var.ssh_authorized_key}"
177-
178-
# Terraform evaluates both sides regardless and element cannot be used on 0 length lists
179-
networkd_content = "${length(var.worker_networkds) == 0 ? "" : element(concat(var.worker_networkds, list("")), count.index)}"
180174
}
181175
}
182176

bare-metal/container-linux/kubernetes/variables.tf

-14
Original file line numberDiff line numberDiff line change
@@ -141,17 +141,3 @@ variable "kernel_args" {
141141
type = "list"
142142
default = []
143143
}
144-
145-
# unofficial, undocumented, unsupported, temporary
146-
147-
variable "controller_networkds" {
148-
type = "list"
149-
description = "Controller Container Linux config networkd section"
150-
default = []
151-
}
152-
153-
variable "worker_networkds" {
154-
type = "list"
155-
description = "Worker Container Linux config networkd section"
156-
default = []
157-
}

0 commit comments

Comments
 (0)