Mirrors/geerlingguy.ansible-role-kubernetes
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-kubernetes.git synced 2025-08-01 13:49:01 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #166 from vivian-hafener/master

Browse Source 
Moves apiversions for kubeadm, kubelet, and kubeproxy from kubeadm-kubelet-config.j2 into defaults/main.yml
This commit is contained in:
Jeff Geerling 2025-07-26 20:03:13 -07:00 committed by GitHub
commit 83e86bb88b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -29,6 +29,11 @@ kubernetes_pod_network:
# cidr: '192.168.0.0/16' # cidr: '192.168.0.0/16'
kubernetes_kubeadm_kubelet_config_file_path: '/etc/kubernetes/kubeadm-kubelet-config.yaml' kubernetes_kubeadm_kubelet_config_file_path: '/etc/kubernetes/kubeadm-kubelet-config.yaml'
kubernetes_config_kubeadm_apiversion: v1beta3
kubenetes_config_kubelet_apiversion: v1beta1
kubernetes_config_kubeproxy_apiversion: v1alpha1
kubernetes_config_kubelet_configuration: kubernetes_config_kubelet_configuration:
cgroupDriver: "systemd" cgroupDriver: "systemd"

8
templates/kubeadm-kubelet-config.j2
View File

@ -1,20 +1,20 @@
--- ---
apiVersion: kubeadm.k8s.io/v1beta3 apiVersion: kubeadm.k8s.io/{{ kubernetes_config_kubeadm_apiversion }}
kind: InitConfiguration kind: InitConfiguration
{{ kubernetes_config_init_configuration | to_nice_yaml }} {{ kubernetes_config_init_configuration | to_nice_yaml }}
--- ---
apiVersion: kubeadm.k8s.io/v1beta3 apiVersion: kubeadm.k8s.io/{{ kubernetes_config_kubeadm_apiversion }}
kind: ClusterConfiguration kind: ClusterConfiguration
{{ kubernetes_config_cluster_configuration | to_nice_yaml }} {{ kubernetes_config_cluster_configuration | to_nice_yaml }}
{% if kubernetes_config_kubelet_configuration|length > 0 %} {% if kubernetes_config_kubelet_configuration|length > 0 %}
--- ---
apiVersion: kubelet.config.k8s.io/v1beta1 apiVersion: kubelet.config.k8s.io/{{ kubenetes_config_kubelet_apiversion }}
kind: KubeletConfiguration kind: KubeletConfiguration
{{ kubernetes_config_kubelet_configuration | to_nice_yaml }} {{ kubernetes_config_kubelet_configuration | to_nice_yaml }}
{% endif %} {% endif %}
{% if kubernetes_config_kube_proxy_configuration|length > 0 %} {% if kubernetes_config_kube_proxy_configuration|length > 0 %}
--- ---
apiVersion: kubeproxy.config.k8s.io/v1alpha1 apiVersion: kubeproxy.config.k8s.io/{{ kubernetes_config_kubeproxy_apiversion }}
kind: KubeProxyConfiguration kind: KubeProxyConfiguration
{{ kubernetes_config_kube_proxy_configuration | to_nice_yaml }} {{ kubernetes_config_kube_proxy_configuration | to_nice_yaml }}
{% endif %} {% endif %}