diff --git a/defaults/main.yml b/defaults/main.yml index e850ed0..1f980ac 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,13 +1,13 @@ --- kubernetes_packages: - - name: kubelet - state: present - - name: kubectl - state: present - - name: kubeadm - state: present - - name: kubernetes-cni - state: present +- name: kubelet + state: present +- name: kubectl + state: present +- name: kubeadm + state: present +- name: kubernetes-cni + state: present kubernetes_version: '1.25' kubernetes_version_rhel_package: '1.25.1' @@ -32,6 +32,8 @@ kubernetes_kubeadm_kubelet_config_file_path: '/etc/kubernetes/kubeadm-kubelet-co kubernetes_config_kubelet_configuration: cgroupDriver: "systemd" +kubernetes_config_kubelet_configuration_api_version: kubelet.config.k8s.io/v1beta1 + kubernetes_config_init_configuration: localAPIEndpoint: advertiseAddress: "{{ kubernetes_apiserver_advertise_address | default(ansible_default_ipv4.address, true) }}" @@ -40,13 +42,19 @@ kubernetes_config_init_configuration: # ignorePreflightErrors: # - all +kubernetes_config_init_configuration_api_version: kubeadm.k8s.io/v1beta4 + kubernetes_config_cluster_configuration: networking: podSubnet: "{{ kubernetes_pod_network.cidr }}" kubernetesVersion: "{{ kubernetes_version_kubeadm }}" +kubernetes_config_cluster_configuration_api_version: kubeadm.k8s.io/v1beta4 + kubernetes_config_kube_proxy_configuration: {} +kubernetes_config_kube_proxy_configuration_api_version: kubeproxy.config.k8s.io/v1alpha1 + kubernetes_apiserver_advertise_address: '' kubernetes_version_kubeadm: 'stable-{{ kubernetes_version }}' kubernetes_ignore_preflight_errors: 'all' diff --git a/templates/kubeadm-kubelet-config.j2 b/templates/kubeadm-kubelet-config.j2 index 3c49c2e..b11322d 100644 --- a/templates/kubeadm-kubelet-config.j2 +++ b/templates/kubeadm-kubelet-config.j2 @@ -1,20 +1,20 @@ --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: {{ kubernetes_config_init_configuration_api_version }} kind: InitConfiguration {{ kubernetes_config_init_configuration | to_nice_yaml }} --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: {{ kubernetes_config_cluster_configuration_api_version }} kind: ClusterConfiguration {{ kubernetes_config_cluster_configuration | to_nice_yaml }} {% if kubernetes_config_kubelet_configuration|length > 0 %} --- -apiVersion: kubelet.config.k8s.io/v1beta1 +apiVersion: {{ kubernetes_config_kubelet_configuration_api_version }} kind: KubeletConfiguration {{ kubernetes_config_kubelet_configuration | to_nice_yaml }} {% endif %} {% if kubernetes_config_kube_proxy_configuration|length > 0 %} --- -apiVersion: kubeproxy.config.k8s.io/v1alpha1 +apiVersion: {{ kubernetes_config_kube_proxy_configuration_api_version }} kind: KubeProxyConfiguration {{ kubernetes_config_kube_proxy_configuration | to_nice_yaml }} {% endif %}