Skip to content

Commit

Permalink
Anchor kubeadm_patches_dir_path vars under /tmp
Browse files Browse the repository at this point in the history
This was done because the kubeadm patches do not contain information
derived from a system since it was booted. Knowing this, to adhere to
the file hierarchy standard, it is more appropriate for these patches to
be placed within the /tmp directory.
  • Loading branch information
cavcrosby committed Aug 19, 2024
1 parent ed11abd commit ae7dfd7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion playbooks/group_vars/poseidon_k8s_controllers
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ k8s_cert_dir_path: /etc/kubernetes/pki
k8s_root_cacert_path: "{{ k8s_cert_dir_path }}/ca.crt"
ca_key: poseidon_k8s_ca.key
ca_cert: poseidon_k8s_ca.crt
k8s_control_plane_kubeadm_patches_dir_path: /run/ansible
k8s_control_plane_kubeadm_patches_dir_path: /tmp/ansible
k8s_control_plane_iptables_rules_path: /etc/iptables/rules.v4 # used by the deb package 'iptables-persistent'
2 changes: 1 addition & 1 deletion playbooks/group_vars/poseidon_k8s_workers
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
cri_socket_path: unix:///var/run/containerd/containerd.sock
k8s_worker_node_kubeadm_patches_dir_path: /run/ansible
k8s_worker_node_kubeadm_patches_dir_path: /tmp/ansible
k8s_worker_node_iptables_rules_path: /etc/iptables/rules.v4
k8s_worker_node_join_config_template: poseidon/k8s-worker.yml.j2
k8s_worker_node_join_patch_templates:
Expand Down
2 changes: 1 addition & 1 deletion roles/k8s_control_plane/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# Dir that will contain patches to combine with InitConfiguration and
# JoinConfiguration on individual nodes.
k8s_control_plane_kubeadm_patches_dir_path: /run/ansible
k8s_control_plane_kubeadm_patches_dir_path: /tmp/ansible

# file that contains elements specific to 'kubeadm init' runtime information
k8s_control_plane_init_config_template: ""
Expand Down
2 changes: 1 addition & 1 deletion roles/k8s_worker_node/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# Dir that will contain patches to combine with InitConfiguration and
# JoinConfiguration on individual nodes.
k8s_worker_node_kubeadm_patches_dir_path: /run/ansible
k8s_worker_node_kubeadm_patches_dir_path: /tmp/ansible

# file that contains elements specific to 'kubeadm join' runtime information
k8s_worker_node_join_config_template: ""
Expand Down

0 comments on commit ae7dfd7

Please sign in to comment.