From 040a10d252a3003bc1397b51afd71e141ca64767 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 26 Oct 2022 12:38:20 -0500 Subject: [PATCH] Attempt to get tests working with debug. --- README.md | 2 +- molecule/default/calico.yml | 4 ++-- molecule/default/converge.yml | 4 ++-- molecule/default/molecule.yml | 1 + tasks/control-plane-setup.yml | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8126133..6fb94f4 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ kubernetes_kubeadm_kubelet_config_file_path: '/etc/kubernetes/kubeadm-kubelet-co Path for ``. If the directory does not exist, this role will create it. -The following variables are parsed as options to . To understand its syntax, see https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/kubelet-integration and https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file . The skeleton (`apiVersion`, `kind`) of the config file will be created by this role, so do not define them within the variables. (See `templates/kubeadm-kubelet-config.j2`). +The following variables are parsed as options to . To understand its syntax, see [kubelet-integration](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/kubelet-integration) and [kubeadm-config-file](https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file) . The skeleton (`apiVersion`, `kind`) of the config file will be created by this role, so do not define them within the variables. (See `templates/kubeadm-kubelet-config.j2`). ```yaml kubernetes_config_init_configuration: diff --git a/molecule/default/calico.yml b/molecule/default/calico.yml index b2060ba..74998b2 100644 --- a/molecule/default/calico.yml +++ b/molecule/default/calico.yml @@ -12,8 +12,8 @@ kubernetes_config_kubelet_configuration: cgroupDriver: "systemd" failSwapOn: false - cgroupsPerQOS: false - enforceNodeAllocatable: "" + cgroupsPerQOS: true + enforceNodeAllocatable: ['pods'] containerd_config_cgroup_driver_systemd: true pre_tasks: diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 248ed37..1e953b6 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -8,8 +8,8 @@ kubernetes_config_kubelet_configuration: cgroupDriver: "systemd" failSwapOn: false - cgroupsPerQOS: false - enforceNodeAllocatable: "" + cgroupsPerQOS: true + enforceNodeAllocatable: ['pods'] containerd_config_cgroup_driver_systemd: true pre_tasks: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 514da27..518aa05 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -11,6 +11,7 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw - /var/lib/containerd + cgroupns_mode: host privileged: true pre_build_image: true provisioner: diff --git a/tasks/control-plane-setup.yml b/tasks/control-plane-setup.yml index f092cff..96c20da 100644 --- a/tasks/control-plane-setup.yml +++ b/tasks/control-plane-setup.yml @@ -29,7 +29,7 @@ # TODO REMOVE - name: Print kubeadm init output - debug: var=kubeadmin_init.stdout + debug: var=kubeadmin_init # TODO REMOVE - name: Get kubelet status @@ -39,7 +39,7 @@ # TODO REMOVE - name: Print kubelet status - debug: var=journalctl.stdout + debug: var=journalctl - name: Print the init output to screen. debug: