Fix CICD playbooks

This commit is contained in:
2025-09-27 18:50:28 +03:00
parent 61f83b4567
commit aa8bbb6984
6 changed files with 17 additions and 28 deletions

View File

@@ -38,7 +38,6 @@
creates: /etc/apt/keyrings/kubernetes-apt-keyring.gpg
when: not kube_keyring.stat.exists
- name: Add Kubernetes apt repository
apt_repository:
repo: "{{ k8s_repo_url }}"
@@ -61,9 +60,6 @@
shell: |
containerd config default > /etc/containerd/config.toml
args:
creates: /etc/containerd/config.toml
- name: Ensure SystemdCgroup = true
replace:
path: /etc/containerd/config.toml
@@ -71,9 +67,9 @@
replace: '\1true'
notify: Restart_containerd
- name: Update pause image to 3.9
- name: Update pause image to 3.10.1
replace:
path: /etc/containerd/config.toml
regexp: 'registry.k8s.io/pause:3.6'
replace: 'registry.k8s.io/pause:3.9'
regexp: 'registry.k8s.io/pause:3.8'
replace: 'registry.k8s.io/pause:3.10.1'
notify: Restart_containerd

View File

@@ -2,9 +2,7 @@
- block:
# - include_tasks: k8s-pre.yml
- include_tasks: k8s-control-plane-setup.yml
- include_tasks: k8s-pre.yml
# - include_tasks: k8s-control-plane-setup.yml
when: ansible_distribution == "Debian" and ansible_distribution_major_version == "12"
when: ansible_distribution == "Debian" and ( ansible_distribution_major_version == "12" or ansible_distribution_major_version == "13" )

View File

@@ -1,8 +1,8 @@
---
k8s_apt_key_url: "https://pkgs.k8s.io/core:/stable:/v1.33/deb/Release.key"
k8s_repo_url: "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.33/deb/ /"
k8s_apt_key_url: "https://pkgs.k8s.io/core:/stable:/v1.34/deb/Release.key"
k8s_repo_url: "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.34/deb/ /"
k8s_pkg_list:
- apt-transport-https
@@ -16,10 +16,9 @@ k8s_pkg_list:
- kubectl
k8s_clusterApi: "k8s-cl01-api.k8s-test.local:6443"
k8s_clusterName: "k8s-cl01.k8s-test.local"
k8s_clusterApi: "k8s01-api.lab.loc:6443"
k8s_clusterName: "k8s-cl01.k8s-cl01.local"
k8s_dnsDomain: "k8s-cl01.local"
k8s_podSubnet: "10.111.111.0/16"
k8s_calico_manifest_file: "https://raw.githubusercontent.com/projectcalico/calico/v3.26.0/manifests/calico.yaml"