feat: bump and make api version configurable

This commit is contained in:
Christian Ludwig 2024-12-12 07:37:33 +01:00
parent 210a0ab262
commit 03100b4c41
2 changed files with 20 additions and 12 deletions

View File

@ -1,13 +1,13 @@
--- ---
kubernetes_packages: kubernetes_packages:
- name: kubelet - name: kubelet
state: present state: present
- name: kubectl - name: kubectl
state: present state: present
- name: kubeadm - name: kubeadm
state: present state: present
- name: kubernetes-cni - name: kubernetes-cni
state: present state: present
kubernetes_version: '1.25' kubernetes_version: '1.25'
kubernetes_version_rhel_package: '1.25.1' 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: kubernetes_config_kubelet_configuration:
cgroupDriver: "systemd" cgroupDriver: "systemd"
kubernetes_config_kubelet_configuration_api_version: kubelet.config.k8s.io/v1beta1
kubernetes_config_init_configuration: kubernetes_config_init_configuration:
localAPIEndpoint: localAPIEndpoint:
advertiseAddress: "{{ kubernetes_apiserver_advertise_address | default(ansible_default_ipv4.address, true) }}" advertiseAddress: "{{ kubernetes_apiserver_advertise_address | default(ansible_default_ipv4.address, true) }}"
@ -40,13 +42,19 @@ kubernetes_config_init_configuration:
# ignorePreflightErrors: # ignorePreflightErrors:
# - all # - all
kubernetes_config_init_configuration_api_version: kubeadm.k8s.io/v1beta4
kubernetes_config_cluster_configuration: kubernetes_config_cluster_configuration:
networking: networking:
podSubnet: "{{ kubernetes_pod_network.cidr }}" podSubnet: "{{ kubernetes_pod_network.cidr }}"
kubernetesVersion: "{{ kubernetes_version_kubeadm }}" kubernetesVersion: "{{ kubernetes_version_kubeadm }}"
kubernetes_config_cluster_configuration_api_version: kubeadm.k8s.io/v1beta4
kubernetes_config_kube_proxy_configuration: {} kubernetes_config_kube_proxy_configuration: {}
kubernetes_config_kube_proxy_configuration_api_version: kubeproxy.config.k8s.io/v1alpha1
kubernetes_apiserver_advertise_address: '' kubernetes_apiserver_advertise_address: ''
kubernetes_version_kubeadm: 'stable-{{ kubernetes_version }}' kubernetes_version_kubeadm: 'stable-{{ kubernetes_version }}'
kubernetes_ignore_preflight_errors: 'all' kubernetes_ignore_preflight_errors: 'all'

View File

@ -1,20 +1,20 @@
--- ---
apiVersion: kubeadm.k8s.io/v1beta3 apiVersion: {{ kubernetes_config_init_configuration_api_version }}
kind: InitConfiguration kind: InitConfiguration
{{ kubernetes_config_init_configuration | to_nice_yaml }} {{ kubernetes_config_init_configuration | to_nice_yaml }}
--- ---
apiVersion: kubeadm.k8s.io/v1beta3 apiVersion: {{ kubernetes_config_cluster_configuration_api_version }}
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: {{ kubernetes_config_kubelet_configuration_api_version }}
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: {{ kubernetes_config_kube_proxy_configuration_api_version }}
kind: KubeProxyConfiguration kind: KubeProxyConfiguration
{{ kubernetes_config_kube_proxy_configuration | to_nice_yaml }} {{ kubernetes_config_kube_proxy_configuration | to_nice_yaml }}
{% endif %} {% endif %}