Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to schnauzer v2 for Bottlerocket Configuration Templates #3476

Merged
merged 10 commits into from
Sep 22, 2023
Merged

Migrate to schnauzer v2 for Bottlerocket Configuration Templates #3476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2fd9e78
schnauzer: move legacy api behind v1 namespace
cbgbt Aug 1, 2023
7cbbc97
schnauzer: add schnauzer-v2 settings generator
cbgbt Aug 1, 2023
0ba9c3a
schnauzer: update README
cbgbt Aug 1, 2023
b3b0e1b
Migrate setting-generators to schnauzer v2
cbgbt Aug 2, 2023
d5f623e
Add schnauzer-v2 settings generator migrations
cbgbt Aug 3, 2023
5a03c83
schnauzer: allow optional extensions
cbgbt Aug 2, 2023
2b3682c
Migrate config file rendering to schnauzer v2
cbgbt Aug 2, 2023
496ffd4
schnauzer: simplify template implementation
cbgbt Aug 2, 2023
9f3e345
schnauzer: move any_enabled helper to std
cbgbt Aug 25, 2023
aae7b08
schnauzer: fix helper composition bug
cbgbt Aug 27, 2023
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
1 change: 1 addition & 0 deletions Release.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,4 +239,5 @@ version = "1.16.0"
"migrate_v1.16.0_kernel-modules-autoload-files.lz4",
"migrate_v1.16.0_kernel-modules-autoload-restart.lz4",
"migrate_v1.16.0_kernel-modules-autoload-settings.lz4",
"migrate_v1.16.0_schnauzer-v2-generators.lz4",
]
3 changes: 3 additions & 0 deletions packages/chrony/chrony-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[required-extensions]
ntp = "v1"
+++
{{#each settings.ntp.time-servers}}
pool {{this}} iburst
{{/each}}
Expand Down
1 change: 1 addition & 0 deletions packages/containerd/containerd-config-toml_basic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
+++
version = 2
root = "/var/lib/containerd"
state = "/run/containerd"
Expand Down
6 changes: 6 additions & 0 deletions packages/containerd/containerd-config-toml_k8s_containerd_sock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[required-extensions]
container-registry = "v1"
container-runtime = "v1"
kubernetes = "v1"
std = { version = "v1", helpers = ["join_array"]}
+++
version = 2
root = "/var/lib/containerd"
state = "/run/containerd"
Expand Down
6 changes: 6 additions & 0 deletions packages/containerd/containerd-config-toml_k8s_nvidia_containerd_sock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[required-extensions]
container-registry = "v1"
container-runtime = "v1"
kubernetes = "v1"
std = { version = "v1", helpers = ["join_array"]}
+++
version = 2
root = "/var/lib/containerd"
state = "/run/containerd"
Expand Down
3 changes: 3 additions & 0 deletions packages/containerd/containerd-cri-base-json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[required-extensions]
oci-defaults = { version = "v1", helpers = ["oci_defaults"] }
+++
{
"ociVersion": "1.0.2-dev",
"process": {
Expand Down
5 changes: 5 additions & 0 deletions packages/docker-engine/daemon-json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[required-extensions]
container-registry = "v1"
oci-defaults = { version = "v1", helpers = ["oci_defaults"] }
bcressey marked this conversation as resolved.
Show resolved Hide resolved
std = { version = "v1", helpers = ["join_array"] }
+++
{
"log-driver": "journald",
"live-restore": true,
Expand Down
5 changes: 5 additions & 0 deletions packages/docker-engine/daemon-nvidia-json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[required-extensions]
container-registry = "v1"
oci-defaults = { version = "v1", helpers = ["oci_defaults"] }
std = { version = "v1", helpers = ["join_array"] }
+++
{
"log-driver": "journald",
"live-restore": true,
Expand Down
4 changes: 4 additions & 0 deletions packages/ecs-agent/ecs.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
container-registry = "v1"
ecs = "v1"
+++
ECS_LOGFILE=/var/log/ecs/ecs-agent.log
ECS_LOGLEVEL="{{settings.ecs.loglevel}}"
ECS_AGENT_CONFIG_FILE_PATH="/etc/ecs/ecs.config.json"
Expand Down
5 changes: 5 additions & 0 deletions packages/kubernetes-1.23/credential-provider-config-yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[required-extensions]
aws = { version = "v1", optional = true }
kubernetes = "v1"
std = { version = "v1", helpers = ["default"] }
+++
apiVersion: kubelet.config.k8s.io/v1alpha1
kind: CredentialProviderConfig
providers:
Expand Down
3 changes: 3 additions & 0 deletions packages/kubernetes-1.23/kubelet-bootstrap-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[required-extensions]
kubernetes = "v1"
+++
---
apiVersion: v1
kind: Config
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.23/kubelet-config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
std = { version = "v1", helpers = ["any_enabled", "default"] }
+++
---
kind: KubeletConfiguration
apiVersion: kubelet.config.k8s.io/v1beta1
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.23/kubelet-env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = { version = "v1", helpers = ["join_node_taints"] }
std = { version = "v1", helpers = ["join_map"] }
+++
NODE_IP={{settings.kubernetes.node-ip}}
NODE_LABELS={{join_map "=" "," "no-fail-if-missing" settings.kubernetes.node-labels}}
NODE_TAINTS={{join_node_taints settings.kubernetes.node-taints}}
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.23/kubelet-exec-start-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["any_enabled", "default"] }
+++
[Service]
ExecStart=
ExecStart=/usr/bin/kubelet \
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.23/kubelet-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
aws = { version = "v1", optional = true }
kubernetes = "v1"
+++
---
apiVersion: v1
kind: Config
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.23/kubelet-server-crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.server-certificate~}}
{{base64_decode settings.kubernetes.server-certificate}}
{{~/if~}}
4 changes: 4 additions & 0 deletions packages/kubernetes-1.23/kubelet-server-key
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.server-key~}}
{{base64_decode settings.kubernetes.server-key}}
{{~/if~}}
4 changes: 4 additions & 0 deletions packages/kubernetes-1.23/kubernetes-ca-crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.cluster-certificate~}}
{{base64_decode settings.kubernetes.cluster-certificate}}
{{~/if~}}
5 changes: 5 additions & 0 deletions packages/kubernetes-1.24/credential-provider-config-yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[required-extensions]
aws = { version = "v1", optional = true }
kubernetes = "v1"
std = { version = "v1", helpers = ["default"] }
+++
apiVersion: kubelet.config.k8s.io/v1beta1
kind: CredentialProviderConfig
providers:
Expand Down
3 changes: 3 additions & 0 deletions packages/kubernetes-1.24/kubelet-bootstrap-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[required-extensions]
kubernetes = "v1"
+++
---
apiVersion: v1
kind: Config
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.24/kubelet-config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
std = { version = "v1", helpers = ["any_enabled", "default"] }
+++
---
kind: KubeletConfiguration
apiVersion: kubelet.config.k8s.io/v1beta1
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.24/kubelet-env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = { version = "v1", helpers = ["join_node_taints"] }
std = { version = "v1", helpers = ["join_map"] }
+++
NODE_IP={{settings.kubernetes.node-ip}}
NODE_LABELS={{join_map "=" "," "no-fail-if-missing" settings.kubernetes.node-labels}}
NODE_TAINTS={{join_node_taints settings.kubernetes.node-taints}}
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.24/kubelet-exec-start-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["any_enabled", "default"] }
+++
[Service]
ExecStart=
ExecStart=/usr/bin/kubelet \
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.24/kubelet-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
aws = { version = "v1", optional = true }
kubernetes = "v1"
+++
---
apiVersion: v1
kind: Config
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.24/kubelet-server-crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.server-certificate~}}
{{base64_decode settings.kubernetes.server-certificate}}
{{~/if~}}
4 changes: 4 additions & 0 deletions packages/kubernetes-1.24/kubelet-server-key
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.server-key~}}
{{base64_decode settings.kubernetes.server-key}}
{{~/if~}}
4 changes: 4 additions & 0 deletions packages/kubernetes-1.24/kubernetes-ca-crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.cluster-certificate~}}
{{base64_decode settings.kubernetes.cluster-certificate}}
{{~/if~}}
5 changes: 5 additions & 0 deletions packages/kubernetes-1.25/credential-provider-config-yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[required-extensions]
aws = { version = "v1", optional = true }
kubernetes = "v1"
std = { version = "v1", helpers = ["default"] }
+++
apiVersion: kubelet.config.k8s.io/v1beta1
kind: CredentialProviderConfig
providers:
Expand Down
3 changes: 3 additions & 0 deletions packages/kubernetes-1.25/kubelet-bootstrap-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[required-extensions]
kubernetes = "v1"
+++
---
apiVersion: v1
kind: Config
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.25/kubelet-config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
std = { version = "v1", helpers = ["any_enabled", "default"] }
+++
---
kind: KubeletConfiguration
apiVersion: kubelet.config.k8s.io/v1beta1
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.25/kubelet-env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = { version = "v1", helpers = ["join_node_taints"] }
std = { version = "v1", helpers = ["join_map"] }
+++
NODE_IP={{settings.kubernetes.node-ip}}
NODE_LABELS={{join_map "=" "," "no-fail-if-missing" settings.kubernetes.node-labels}}
NODE_TAINTS={{join_node_taints settings.kubernetes.node-taints}}
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.25/kubelet-exec-start-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["any_enabled", "default"] }
+++
[Service]
ExecStart=
ExecStart=/usr/bin/kubelet \
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.25/kubelet-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
aws = { version = "v1", optional = true }
kubernetes = "v1"
+++
---
apiVersion: v1
kind: Config
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.25/kubelet-server-crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.server-certificate~}}
{{base64_decode settings.kubernetes.server-certificate}}
{{~/if~}}
4 changes: 4 additions & 0 deletions packages/kubernetes-1.25/kubelet-server-key
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.server-key~}}
{{base64_decode settings.kubernetes.server-key}}
{{~/if~}}
4 changes: 4 additions & 0 deletions packages/kubernetes-1.25/kubernetes-ca-crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.cluster-certificate~}}
{{base64_decode settings.kubernetes.cluster-certificate}}
{{~/if~}}
5 changes: 5 additions & 0 deletions packages/kubernetes-1.26/credential-provider-config-yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[required-extensions]
aws = { version = "v1", optional = true }
kubernetes = "v1"
std = { version = "v1", helpers = ["default"] }
+++
apiVersion: kubelet.config.k8s.io/v1
kind: CredentialProviderConfig
providers:
Expand Down
3 changes: 3 additions & 0 deletions packages/kubernetes-1.26/kubelet-bootstrap-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[required-extensions]
kubernetes = "v1"
+++
---
apiVersion: v1
kind: Config
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.26/kubelet-config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
std = { version = "v1", helpers = ["any_enabled", "default"] }
+++
---
kind: KubeletConfiguration
apiVersion: kubelet.config.k8s.io/v1beta1
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.26/kubelet-env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = { version = "v1", helpers = ["join_node_taints"] }
std = { version = "v1", helpers = ["join_map"] }
+++
NODE_IP={{settings.kubernetes.node-ip}}
NODE_LABELS={{join_map "=" "," "no-fail-if-missing" settings.kubernetes.node-labels}}
NODE_TAINTS={{join_node_taints settings.kubernetes.node-taints}}
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.26/kubelet-exec-start-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["any_enabled", "default"] }
+++
[Service]
ExecStart=
ExecStart=/usr/bin/kubelet \
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.26/kubelet-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
aws = { version = "v1", optional = true }
kubernetes = "v1"
+++
---
apiVersion: v1
kind: Config
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.26/kubelet-server-crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.server-certificate~}}
{{base64_decode settings.kubernetes.server-certificate}}
{{~/if~}}
4 changes: 4 additions & 0 deletions packages/kubernetes-1.26/kubelet-server-key
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.server-key~}}
{{base64_decode settings.kubernetes.server-key}}
{{~/if~}}
4 changes: 4 additions & 0 deletions packages/kubernetes-1.26/kubernetes-ca-crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["base64_decode"] }
+++
{{~#if settings.kubernetes.cluster-certificate~}}
{{base64_decode settings.kubernetes.cluster-certificate}}
{{~/if~}}
5 changes: 5 additions & 0 deletions packages/kubernetes-1.27/credential-provider-config-yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[required-extensions]
aws = { version = "v1", optional = true }
kubernetes = "v1"
std = { version = "v1", helpers = ["default"] }
+++
apiVersion: kubelet.config.k8s.io/v1
kind: CredentialProviderConfig
providers:
Expand Down
3 changes: 3 additions & 0 deletions packages/kubernetes-1.27/kubelet-bootstrap-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[required-extensions]
kubernetes = "v1"
+++
---
apiVersion: v1
kind: Config
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.27/kubelet-config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
std = { version = "v1", helpers = ["any_enabled", "default"] }
+++
---
kind: KubeletConfiguration
apiVersion: kubelet.config.k8s.io/v1beta1
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.27/kubelet-env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = { version = "v1", helpers = ["join_node_taints"] }
std = { version = "v1", helpers = ["join_map"] }
+++
NODE_IP={{settings.kubernetes.node-ip}}
NODE_LABELS={{join_map "=" "," "no-fail-if-missing" settings.kubernetes.node-labels}}
NODE_TAINTS={{join_node_taints settings.kubernetes.node-taints}}
Expand Down
4 changes: 4 additions & 0 deletions packages/kubernetes-1.27/kubelet-exec-start-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[required-extensions]
kubernetes = "v1"
std = { version = "v1", helpers = ["any_enabled", "default"] }
+++
[Service]
ExecStart=
ExecStart=/usr/bin/kubelet \
Expand Down
Loading