From e57e958a39df815731c3d2567c6fdf3c133cbb67 Mon Sep 17 00:00:00 2001 From: Jorge Isnardo Altamirano Date: Thu, 2 May 2024 08:15:01 +0200 Subject: [PATCH 01/32] Update kube-vip to v0.8.0 --- README.md | 2 +- roles/kubernetes/node/defaults/main.yml | 2 +- roles/kubespray-defaults/defaults/main/download.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f67d25ef9ca..ab31a8fb528 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ Note: Upstart/SysV init based OS types are not supported. - [kube-router](https://github.com/cloudnativelabs/kube-router) v2.0.0 - [multus](https://github.com/k8snetworkplumbingwg/multus-cni) v3.8 - [weave](https://github.com/weaveworks/weave) v2.8.1 - - [kube-vip](https://github.com/kube-vip/kube-vip) v0.5.12 + - [kube-vip](https://github.com/kube-vip/kube-vip) v0.8.0 - Application - [cert-manager](https://github.com/jetstack/cert-manager) v1.13.2 - [coredns](https://github.com/coredns/coredns) v1.11.1 diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml index 69cfa4540a9..cc1b2701f4a 100644 --- a/roles/kubernetes/node/defaults/main.yml +++ b/roles/kubernetes/node/defaults/main.yml @@ -67,7 +67,7 @@ eviction_hard_control_plane: {} kubelet_status_update_frequency: 10s # kube-vip -kube_vip_version: v0.5.12 +kube_vip_version: v0.8.0 kube_vip_arp_enabled: false kube_vip_interface: diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index 84d4978c2af..f66ebbb382b 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -283,7 +283,7 @@ multus_image_repo: "{{ github_image_repo }}/k8snetworkplumbingwg/multus-cni" multus_image_tag: "{{ multus_version }}" kube_vip_image_repo: "{{ github_image_repo }}/kube-vip/kube-vip" -kube_vip_image_tag: v0.5.12 +kube_vip_image_tag: v0.8.0 nginx_image_repo: "{{ docker_image_repo }}/library/nginx" nginx_image_tag: 1.25.2-alpine haproxy_image_repo: "{{ docker_image_repo }}/library/haproxy" From 537891a3807f3155ea5424d7cb73e09b6cf99960 Mon Sep 17 00:00:00 2001 From: Jorge Isnardo Altamirano Date: Thu, 2 May 2024 16:37:49 +0200 Subject: [PATCH 02/32] Update kube-vip manifests to v0.8.0 --- .../sample/group_vars/k8s_cluster/addons.yml | 4 ++++ roles/kubernetes/node/defaults/main.yml | 4 ++++ .../templates/manifests/kube-vip.manifest.j2 | 20 ++++++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/inventory/sample/group_vars/k8s_cluster/addons.yml b/inventory/sample/group_vars/k8s_cluster/addons.yml index bf0588dda9c..50a5938f371 100644 --- a/inventory/sample/group_vars/k8s_cluster/addons.yml +++ b/inventory/sample/group_vars/k8s_cluster/addons.yml @@ -259,6 +259,10 @@ kube_vip_enabled: false # port: 6443 # kube_vip_interface: eth0 # kube_vip_services_enabled: false +#kube_vip_dns_mode: first +#kube_vip_cp_detect: false +#kube_vip_leasename: plndr-cp-lock +#kube_vip_enable_node_labeling: false # Node Feature Discovery node_feature_discovery_enabled: false diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml index cc1b2701f4a..02ce4603272 100644 --- a/roles/kubernetes/node/defaults/main.yml +++ b/roles/kubernetes/node/defaults/main.yml @@ -73,8 +73,10 @@ kube_vip_arp_enabled: false kube_vip_interface: kube_vip_services_interface: kube_vip_cidr: 32 +kube_vip_dns_mode: first kube_vip_controlplane_enabled: false kube_vip_ddns_enabled: false +kube_vip_cp_detect: false kube_vip_services_enabled: false kube_vip_leader_election_enabled: "{{ kube_vip_arp_enabled }}" kube_vip_bgp_enabled: false @@ -88,9 +90,11 @@ kube_vip_address: kube_vip_enableServicesElection: false kube_vip_lb_enable: false kube_vip_lb_fwdmethod: local +kube_vip_leasename: plndr-cp-lock kube_vip_leaseduration: 5 kube_vip_renewdeadline: 3 kube_vip_retryperiod: 1 +kube_vip_enable_node_labeling: false # Requests for load balancer app loadbalancer_apiserver_memory_requests: 32M diff --git a/roles/kubernetes/node/templates/manifests/kube-vip.manifest.j2 b/roles/kubernetes/node/templates/manifests/kube-vip.manifest.j2 index ead73495d5c..11a971e9321 100644 --- a/roles/kubernetes/node/templates/manifests/kube-vip.manifest.j2 +++ b/roles/kubernetes/node/templates/manifests/kube-vip.manifest.j2 @@ -1,4 +1,4 @@ -# Inspired by https://github.com/kube-vip/kube-vip/blob/v0.5.11/pkg/kubevip/config_generator.go#L13 +# Inspired by https://github.com/kube-vip/kube-vip/blob/v0.8.0/pkg/kubevip/config_generator.go#L103 apiVersion: v1 kind: Pod metadata: @@ -16,6 +16,8 @@ spec: value: {{ kube_vip_arp_enabled | string | to_json }} - name: port value: {{ kube_apiserver_port | string | to_json }} + - name: vip_nodename + value: {{ inventory_hostname }} {% if kube_vip_interface %} - name: vip_interface value: {{ kube_vip_interface | string | to_json }} @@ -28,6 +30,10 @@ spec: - name: vip_cidr value: {{ kube_vip_cidr | string | to_json }} {% endif %} +{% if kube_vip_dns_mode %} + - name: dns_mode + value: {{ kube_vip_dns_mode | string | to_json }} +{% endif %} {% if kube_vip_controlplane_enabled %} - name: cp_enable value: "true" @@ -35,11 +41,17 @@ spec: value: kube-system - name: vip_ddns value: {{ kube_vip_ddns_enabled | string | to_json }} + - name: cp_detect + value: {{ kube_vip_cp_detect | string | to_json }} {% endif %} {% if kube_vip_services_enabled %} - name: svc_enable value: "true" {% endif %} +{% if kube_vip_svc_leasename %} + - name: svc_leasename + value: {{ kube_vip_svc_leasename | string | to_json }} +{% endif %} {% if kube_vip_enableServicesElection %} - name: svc_election value: "true" @@ -47,6 +59,8 @@ spec: {% if kube_vip_leader_election_enabled %} - name: vip_leaderelection value: "true" + - name: vip_leasename + value: {{ kube_vip_leasename | string | to_json }} - name: vip_leaseduration value: {{ kube_vip_leaseduration | string | to_json }} - name: vip_renewdeadline @@ -54,6 +68,10 @@ spec: - name: vip_retryperiod value: {{ kube_vip_retryperiod | string | to_json }} {% endif %} +{% if kube_vip_enable_node_labeling %} + - name: enable_node_labeling + value: {{ kube_vip_enable_node_labeling | string | to_json }} +{% endif %} {% if kube_vip_bgp_enabled %} - name: bgp_enable value: "true" From def88b26a4630d69fcc5d35a358bf9b398b61af8 Mon Sep 17 00:00:00 2001 From: Jorge Isnardo Altamirano Date: Thu, 2 May 2024 16:46:53 +0200 Subject: [PATCH 03/32] Update kube-vip manifests to v0.8.0 --- inventory/sample/group_vars/k8s_cluster/addons.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/sample/group_vars/k8s_cluster/addons.yml b/inventory/sample/group_vars/k8s_cluster/addons.yml index 50a5938f371..37afdae943d 100644 --- a/inventory/sample/group_vars/k8s_cluster/addons.yml +++ b/inventory/sample/group_vars/k8s_cluster/addons.yml @@ -259,10 +259,10 @@ kube_vip_enabled: false # port: 6443 # kube_vip_interface: eth0 # kube_vip_services_enabled: false -#kube_vip_dns_mode: first -#kube_vip_cp_detect: false -#kube_vip_leasename: plndr-cp-lock -#kube_vip_enable_node_labeling: false +# kube_vip_dns_mode: first +# kube_vip_cp_detect: false +# kube_vip_leasename: plndr-cp-lock +# kube_vip_enable_node_labeling: false # Node Feature Discovery node_feature_discovery_enabled: false From a09c73a356815935000aa0cbd76391a2f145bc01 Mon Sep 17 00:00:00 2001 From: Jorge Isnardo Altamirano Date: Tue, 7 May 2024 11:38:13 +0200 Subject: [PATCH 04/32] Update kube-vip manifests to v0.8.0 --- roles/kubernetes/node/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml index 02ce4603272..eaf70ab40e1 100644 --- a/roles/kubernetes/node/defaults/main.yml +++ b/roles/kubernetes/node/defaults/main.yml @@ -91,6 +91,7 @@ kube_vip_enableServicesElection: false kube_vip_lb_enable: false kube_vip_lb_fwdmethod: local kube_vip_leasename: plndr-cp-lock +kube_vip_svc_leasename: plndr-svcs-lock kube_vip_leaseduration: 5 kube_vip_renewdeadline: 3 kube_vip_retryperiod: 1 From d8a4aea9bc5dfe83f1151bc659f28944ea7e4f28 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Mon, 13 May 2024 21:51:11 +0000 Subject: [PATCH 05/32] Revert "support CoreDNS use host network and config dns port (#10617)" (#11185) This reverts commit bc5b38a77127de126bd35175862414367102e1bf. --- roles/kubernetes-apps/ansible/defaults/main.yml | 2 -- .../kubernetes-apps/ansible/templates/coredns-config.yml.j2 | 2 +- .../ansible/templates/coredns-deployment.yml.j2 | 5 ++--- roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/roles/kubernetes-apps/ansible/defaults/main.yml b/roles/kubernetes-apps/ansible/defaults/main.yml index cb2317b1e05..726e7fc21bf 100644 --- a/roles/kubernetes-apps/ansible/defaults/main.yml +++ b/roles/kubernetes-apps/ansible/defaults/main.yml @@ -16,8 +16,6 @@ coredns_ordinal_suffix: "" coredns_deployment_nodeselector: "kubernetes.io/os: linux" coredns_default_zone_cache_block: | cache 30 -coredns_host_network: false -coredns_port: 53 coredns_pod_disruption_budget: false # value for coredns pdb diff --git a/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 index 587a4e65d2a..8a481193777 100644 --- a/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 @@ -34,7 +34,7 @@ data: } {% endfor %} {% endif %} - .:{{ coredns_port }} { + .:53 { {% if coredns_additional_configs is defined %} {{ coredns_additional_configs | indent(width=8, first=False) }} {% endif %} diff --git a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 index cbdca572759..e929dba6286 100644 --- a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 @@ -24,7 +24,6 @@ spec: annotations: createdby: 'kubespray' spec: - hostNetwork: {{ coredns_host_network | default(false) }} securityContext: seccompProfile: type: RuntimeDefault @@ -76,10 +75,10 @@ spec: - name: config-volume mountPath: /etc/coredns ports: - - containerPort: {{ coredns_port }} + - containerPort: 53 name: dns protocol: UDP - - containerPort: {{ coredns_port }} + - containerPort: 53 name: dns-tcp protocol: TCP - containerPort: 9153 diff --git a/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 index 961e02a6aad..0e051c34678 100644 --- a/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 @@ -20,11 +20,9 @@ spec: - name: dns port: 53 protocol: UDP - targetPort: "dns" - name: dns-tcp port: 53 protocol: TCP - targetPort: "dns-tcp" - name: metrics port: 9153 protocol: TCP From 6dbb09435cb834f353d4bfe620d34e62ac9efb3a Mon Sep 17 00:00:00 2001 From: Mohamed Omar Zaian Date: Tue, 14 May 2024 03:39:10 +0200 Subject: [PATCH 06/32] [ingress-nginx] upgrade to 1.10.1 (#11184) --- README.md | 2 +- docs/ingress_controller/ingress_nginx.md | 2 +- roles/kubespray-defaults/defaults/main/download.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5e1010fe7f8..6a8d51b4e4a 100644 --- a/README.md +++ b/README.md @@ -178,7 +178,7 @@ Note: Upstart/SysV init based OS types are not supported. - Application - [cert-manager](https://github.com/jetstack/cert-manager) v1.13.2 - [coredns](https://github.com/coredns/coredns) v1.11.1 - - [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v1.9.6 + - [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v1.10.1 - [krew](https://github.com/kubernetes-sigs/krew) v0.4.4 - [argocd](https://argoproj.github.io/) v2.8.4 - [helm](https://helm.sh/) v3.14.2 diff --git a/docs/ingress_controller/ingress_nginx.md b/docs/ingress_controller/ingress_nginx.md index a77ae480d27..f465dc60f59 100644 --- a/docs/ingress_controller/ingress_nginx.md +++ b/docs/ingress_controller/ingress_nginx.md @@ -35,7 +35,7 @@ kubectl create clusterrolebinding cluster-admin-binding \ The following **Mandatory Command** is required for all deployments except for AWS. See below for the AWS version. ```console -kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.9.6/deploy/static/provider/cloud/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.10.1/deploy/static/provider/cloud/deploy.yaml ``` ### Provider Specific Steps diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index 97b1e8a276a..a6f46a98aac 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -331,13 +331,13 @@ rbd_provisioner_image_tag: "{{ rbd_provisioner_version }}" local_path_provisioner_version: "v0.0.24" local_path_provisioner_image_repo: "{{ docker_image_repo }}/rancher/local-path-provisioner" local_path_provisioner_image_tag: "{{ local_path_provisioner_version }}" -ingress_nginx_version: "v1.9.6" +ingress_nginx_version: "v1.10.1" ingress_nginx_controller_image_repo: "{{ kube_image_repo }}/ingress-nginx/controller" ingress_nginx_opentelemetry_image_repo: "{{ kube_image_repo }}/ingress-nginx/opentelemetry" ingress_nginx_controller_image_tag: "{{ ingress_nginx_version }}" ingress_nginx_opentelemetry_image_tag: "v20230721-3e2062ee5" ingress_nginx_kube_webhook_certgen_image_repo: "{{ kube_image_repo }}/ingress-nginx/kube-webhook-certgen" -ingress_nginx_kube_webhook_certgen_image_tag: "v20231011-8b53cabe0" +ingress_nginx_kube_webhook_certgen_image_tag: "v1.4.1" alb_ingress_image_repo: "{{ docker_image_repo }}/amazon/aws-alb-ingress-controller" alb_ingress_image_tag: "v1.1.9" cert_manager_version: "v1.13.2" From 3e4ea1065a2b28168dd508408fbbe6da978f4167 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Tue, 14 May 2024 01:43:10 +0000 Subject: [PATCH 07/32] Add the official vagrant boxes for debian 11/12 (#11135) --- Vagrantfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 3c292669032..e280b6f1d9f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -37,6 +37,8 @@ SUPPORTED_OS = { "oraclelinux8" => {box: "generic/oracle8", user: "vagrant"}, "rhel7" => {box: "generic/rhel7", user: "vagrant"}, "rhel8" => {box: "generic/rhel8", user: "vagrant"}, + "debian11" => {box: "debian/bullseye64", user: "vagrant"}, + "debian12" => {box: "debian/bookworm64", user: "vagrant"}, } if File.exist?(CONFIG) From 0b2533143f1b564057c7b4cd71c0195bc89da898 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Tue, 14 May 2024 02:51:11 +0000 Subject: [PATCH 08/32] Don't force python interpreter on ubuntu (#11183) This allows local override in tasks for using virtualenvs. --- tests/scripts/testcases_run.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/scripts/testcases_run.sh b/tests/scripts/testcases_run.sh index ec22a4dcb04..a1c09be66ce 100755 --- a/tests/scripts/testcases_run.sh +++ b/tests/scripts/testcases_run.sh @@ -2,7 +2,6 @@ set -euxo pipefail echo "CI_JOB_NAME is $CI_JOB_NAME" -CI_TEST_ADDITIONAL_VARS="" if [[ "$CI_JOB_NAME" =~ "upgrade" ]]; then if [ "${UPGRADE_TEST}" == "false" ]; then @@ -42,11 +41,6 @@ if [[ "$CI_JOB_NAME" =~ "opensuse" ]]; then ansible all -m raw -a 'zypper --gpg-auto-import-keys refresh' fi -if [[ "$CI_JOB_NAME" =~ "ubuntu" ]]; then - # We need to tell ansible that ubuntu hosts are python3 only - CI_TEST_ADDITIONAL_VARS="-e ansible_python_interpreter=/usr/bin/python3" -fi - # Check out latest tag if testing upgrade test "${UPGRADE_TEST}" != "false" && git fetch --all && git checkout "$KUBESPRAY_VERSION" # Checkout the CI vars file so it is available @@ -63,7 +57,7 @@ ansible-playbook --limit "all:!fake_hosts" \ $ANSIBLE_LOG_LEVEL \ -e @${CI_TEST_SETTING} \ -e @${CI_TEST_REGISTRY_MIRROR} \ - -e @${CI_TEST_VARS} ${CI_TEST_ADDITIONAL_VARS} \ + -e @${CI_TEST_VARS} \ -e local_release_dir=${PWD}/downloads \ "$@" \ ${playbook} From e410e306949ea972eb7fd01502def1f8726d45e2 Mon Sep 17 00:00:00 2001 From: hayden Date: Tue, 14 May 2024 16:39:11 +0900 Subject: [PATCH 09/32] Change a task name in preinstall/0080-system-configurations.yml (#11171) --- .../kubernetes/preinstall/tasks/0080-system-configurations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml b/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml index 8159dcc2339..768cd62c9ab 100644 --- a/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml +++ b/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml @@ -104,7 +104,7 @@ reload: yes when: fs_may_detach_mounts.stat.exists | d(false) -- name: Ensure kube-bench parameters are set +- name: Ensure kubelet expected parameters are set ansible.posix.sysctl: sysctl_file: "{{ sysctl_file_path }}" name: "{{ item.name }}" From a5714a8c6b3deed5db2f0d21b943cd5d26ce27ba Mon Sep 17 00:00:00 2001 From: Kay Yan Date: Tue, 14 May 2024 18:09:11 +0800 Subject: [PATCH 10/32] change dependbot to interval weekly (#11189) --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 56c03a193e3..3707b690a6f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,5 +3,5 @@ updates: - package-ecosystem: "pip" directory: "/" schedule: - interval: "daily" + interval: "weekly" labels: [ "dependencies" ] From 73c2722d0084168408d02d754d9c0d7bfe6dc452 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Tue, 14 May 2024 16:11:12 +0000 Subject: [PATCH 11/32] rockylinux vagrant boxes only boot in UEFI mode (#11192) https://forums.rockylinux.org/t/vagrant-box-rockylinux-8-v7-0-0-with-libvirt-provider-fails-to-boot/8212 --- Vagrantfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index e280b6f1d9f..df48261f7b9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -246,6 +246,13 @@ Vagrant.configure("2") do |config| SHELL end + # Rockylinux boxes needs UEFI + if ["rockylinux8", "rockylinux9"].include? $os + config.vm.provider "libvirt" do |domain| + domain.loader = "/usr/share/OVMF/x64/OVMF_CODE.fd" + end + end + # Disable firewalld on oraclelinux/redhat vms if ["oraclelinux","oraclelinux8","rhel7","rhel8","rockylinux8"].include? $os node.vm.provision "shell", inline: "systemctl stop firewalld; systemctl disable firewalld" From fe1a2d5dd9e09eed66070414ebc274ae13e25f22 Mon Sep 17 00:00:00 2001 From: Mohamed Omar Zaian Date: Wed, 15 May 2024 04:34:31 +0200 Subject: [PATCH 12/32] [argocd] update argocd to v2.11.0 (#11193) --- README.md | 2 +- inventory/sample/group_vars/k8s_cluster/addons.yml | 2 +- roles/kubernetes-apps/argocd/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6a8d51b4e4a..19e89bcf3df 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ Note: Upstart/SysV init based OS types are not supported. - [coredns](https://github.com/coredns/coredns) v1.11.1 - [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v1.10.1 - [krew](https://github.com/kubernetes-sigs/krew) v0.4.4 - - [argocd](https://argoproj.github.io/) v2.8.4 + - [argocd](https://argoproj.github.io/) v2.11.0 - [helm](https://helm.sh/) v3.14.2 - [metallb](https://metallb.universe.tf/) v0.13.9 - [registry](https://github.com/distribution/distribution) v2.8.1 diff --git a/inventory/sample/group_vars/k8s_cluster/addons.yml b/inventory/sample/group_vars/k8s_cluster/addons.yml index d0efa673a1d..0a4eb841378 100644 --- a/inventory/sample/group_vars/k8s_cluster/addons.yml +++ b/inventory/sample/group_vars/k8s_cluster/addons.yml @@ -234,7 +234,7 @@ metallb_namespace: "metallb-system" # - pool2 argocd_enabled: false -# argocd_version: v2.8.4 +# argocd_version: v2.11.0 # argocd_namespace: argocd # Default password: # - https://argo-cd.readthedocs.io/en/stable/getting_started/#4-login-using-the-cli diff --git a/roles/kubernetes-apps/argocd/defaults/main.yml b/roles/kubernetes-apps/argocd/defaults/main.yml index f98a9d32e5b..b164b624f16 100644 --- a/roles/kubernetes-apps/argocd/defaults/main.yml +++ b/roles/kubernetes-apps/argocd/defaults/main.yml @@ -1,6 +1,6 @@ --- argocd_enabled: false -argocd_version: v2.8.4 +argocd_version: v2.11.0 argocd_namespace: argocd # argocd_admin_password: argocd_install_url: "https://raw.githubusercontent.com/argoproj/argo-cd/{{ argocd_version }}/manifests/install.yaml" From 08293f2ef772cb84c38e7d060c5885b5960e9a77 Mon Sep 17 00:00:00 2001 From: Mohamed Omar Zaian Date: Wed, 15 May 2024 10:42:03 +0200 Subject: [PATCH 13/32] [kubernetes] Add hashes for kubernetes 1.29.5, 1.28.10, 1.27.14 --- README.md | 2 +- .../group_vars/k8s_cluster/k8s-cluster.yml | 2 +- .../defaults/main/checksums.yml | 36 +++++++++++++++++++ .../kubespray-defaults/defaults/main/main.yml | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 19e89bcf3df..a502e4c26ba 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,7 @@ Note: Upstart/SysV init based OS types are not supported. ## Supported Components - Core - - [kubernetes](https://github.com/kubernetes/kubernetes) v1.29.4 + - [kubernetes](https://github.com/kubernetes/kubernetes) v1.29.5 - [etcd](https://github.com/etcd-io/etcd) v3.5.12 - [docker](https://www.docker.com/) v24.0 (see [Note](#container-runtime-notes)) - [containerd](https://containerd.io/) v1.7.16 diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml index 6e67e21d263..e64a6ee839a 100644 --- a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml +++ b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml @@ -17,7 +17,7 @@ kube_token_dir: "{{ kube_config_dir }}/tokens" kube_api_anonymous_auth: true ## Change this to use another Kubernetes version, e.g. a current beta release -kube_version: v1.29.4 +kube_version: v1.29.5 # Where the binaries will be downloaded. # Note: ensure that you've enough disk space (about 1G) diff --git a/roles/kubespray-defaults/defaults/main/checksums.yml b/roles/kubespray-defaults/defaults/main/checksums.yml index b4680460527..ee511ae6bd2 100644 --- a/roles/kubespray-defaults/defaults/main/checksums.yml +++ b/roles/kubespray-defaults/defaults/main/checksums.yml @@ -81,11 +81,13 @@ crio_archive_checksums: # Kubernetes versions above Kubespray's current target version are untested and should be used with caution. kubelet_checksums: arm: + v1.29.5: 0 v1.29.4: 0 v1.29.3: 0 v1.29.2: 0 v1.29.1: 0 v1.29.0: 0 + v1.28.10: 0 v1.28.9: 0 v1.28.8: 0 v1.28.7: 0 @@ -96,6 +98,7 @@ kubelet_checksums: v1.28.2: 0 v1.28.1: 0 v1.28.0: 0 + v1.27.14: 0 v1.27.13: 0 v1.27.12: 0 v1.27.11: 0 @@ -111,11 +114,13 @@ kubelet_checksums: v1.27.1: 0 v1.27.0: 0 arm64: + v1.29.5: 0d4328a3c67e4f0dbf270fa49343f3eab9316adde1a1bd2a857fa56876a9aff1 v1.29.4: dc4bb6ea6cd35b024d63cc20d1c1800a9c695bd6f70411c57358d7c407513b00 v1.29.3: 891dce19ed0eae34050c2eca0454204892e97bfe1a926f988cd044a987a9c7c9 v1.29.2: 9b4aa572d4cd51a41b1067161d961423d0d12b120fb636ea887a12a975d4b19a v1.29.1: e46417ab1ceae995f0e00d4177959a36ed34b807829422bc9dda70b263fe5c5d v1.29.0: 0e0e4544c2a0a3475529154b7534d0d58683466efa04a2bb2e763b476db0bb16 + v1.28.10: feae161e374ee0155b5263cda339f30f16b525631535a003be7aa437661e1580 v1.28.9: 312471ad255acfcdeea2c5849b171467af4518e96d69d727a3197ff334e9299d v1.28.8: 90d61f40b7bb061b0fc6d08b8b9ddae51f90863c899b098e19eaa89dc855f2c0 v1.28.7: e2c98b39b0b0745ef3e30febaeb8eaaf31ec721012405bd0dcf25e84026c221e @@ -126,6 +131,7 @@ kubelet_checksums: v1.28.2: 32269e9ec38c561d028b65c3048ea6a100e1292cbe9e505565222455c8096577 v1.28.1: 9b7fa64b2785da4a38768377961e227f8da629c56a5df43ca1b665dd07b56f3c v1.28.0: 05dd12e35783cab4960e885ec0e7d0e461989b94297e7bea9018ccbd15c4dce9 + v1.27.14: 31c97a723021ccc90a47a15ad1de1ffdf58ba109aea922eb359ad2fcb8e8ce4b v1.27.13: d7bfb14d0b0fc2c41074baf02617cf98589fd029fb3539ea017825e36371f19c v1.27.12: 0d7d2d25c8b909d6cec7c1c2a5bfe51428ec33eaa5e8b209c718b77983e9dcba v1.27.11: e81987a864fb47afe14f65fa4e93760bc19c424335e0f0540c6c725b727ce22a @@ -141,11 +147,13 @@ kubelet_checksums: v1.27.1: dbb09d297d924575654db38ed2fc627e35913c2d4000c34613ac6de4995457d0 v1.27.0: 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157 amd64: + v1.29.5: 261dc3f3c384d138835fe91a02071c642af94abb0cca56ebc04719240440944c v1.29.4: 58571f0ed62543a9bbac541e52c15d8385083113a463e23aec1341d0b5043939 v1.29.3: d8b55a2f8a87c8cd2cbf867d76d1d7f98b7198a740db19bad6ed7b8b813de771 v1.29.2: f71a85039b71fe08f1c063a93d61a1c952dc8f9a8c6be9b13fbdac8f0d9ff960 v1.29.1: 1b1975c58d38be1a99a8bcba4564ac489afd223b0abe9f2ab08bbde89d2412a3 v1.29.0: e1c38137db8d8777eed8813646b59bf4d22d19b9011ab11dc28e2e34f6b80a05 + v1.28.10: a361e744aaeef4539f0636ecd1827c85207a5f2b0c2b0a98dbbce1498061f509 v1.28.9: f3af46cff11c675a80d91ebb38ebc4e85a9f813ce93e56ee131e7fea1491b786 v1.28.8: 049b412a5861255cd3922f612acb79ab51135e166c5d80acf12fba9179eebf0c v1.28.7: 120b1495babc4364f7e16a9d0f8b8e6b6f78316d047e4f6de77b5569b05813c7 @@ -156,6 +164,7 @@ kubelet_checksums: v1.28.2: 17edb866636f14eceaad58c56eab12af7ab3be3c78400aff9680635d927f1185 v1.28.1: 2bc22332f44f8fcd3fce57879fd873f977949ebd261571fbae31fbb2713a5dd3 v1.28.0: bfb6b977100963f2879a33e5fbaa59a5276ba829a957a6819c936e9c1465f981 + v1.27.14: f28defa43f80f82ce909940c1b57b71cba1fcf0de6fc4723e798ef5c72376c28 v1.27.13: ed68df2a77f3057ab47f57eacb6e9310e91731e4f43c58a3c3b5c857d78d0080 v1.27.12: aae861a21913c274228ccdad1609b370e5198c9f4b39b8924b20a7ffe7f148e0 v1.27.11: 2ce92a5d8985b93bd8ffc4f5519cd79bf2f844590aa38228a3d809c5bf5986e0 @@ -171,11 +180,13 @@ kubelet_checksums: v1.27.1: cb2845fff0ce41c400489393da73925d28fbee54cfeb7834cd4d11e622cbd3a7 v1.27.0: 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29 ppc64le: + v1.29.5: b0caa52184a3e89a7f529c776ebabd7d34aecad560614f787fe08cff777a43cb v1.29.4: 1ecc89b6f17df357835e3e56f553ec27f2aea69a5865dfb39cff77e6e70e6adb v1.29.3: 811f2b17f443cd694b8650f5ec2c7e3a59394f8bf3e25d16182549aaab16a420 v1.29.2: b0eb5e0362a4e153ed1239c65b0abb02b2d9fbbca6846d0bab8b285de8c84fca v1.29.1: 467d2b457205363f53f72081295ea390fc25215b0ccc29dc04c4f82925266067 v1.29.0: 67f09f866d3e4aee8211ce9887ec8bc427b188474a882a7af999fc0fee939028 + v1.28.10: 0ba43fda35f588eaf65955481a7c6f633e4e787a45322bf55a7558ece4944e39 v1.28.9: cf33fbff3fb852ce9f8afda8818381af343fb5e7d30dde72999cc0d273631815 v1.28.8: f3e4551e5234d296344a481196e607d88581705fedd561e8c807db1de8a9cc4b v1.28.7: c67277445af9a97a375da3caa6a7dae7bb52fa454deb811c5bc89c2838b3322f @@ -186,6 +197,7 @@ kubelet_checksums: v1.28.2: 79f568ac700d29f88d669c6b6a09adb3b726bdd13c10aa0839cbc70b414372e5 v1.28.1: 547fc76f0c1d78352fad841ebeacd387fe48750b2648565dfd49197621622fbb v1.28.0: 22de59965f2d220afa24bf04f4c6d6b65a4bb1cd80756c13381973b1ac3b4578 + v1.27.14: dadfffb524b3c7e825c2742fb7723846eef4dfdf47c90e3bec90c0ca325b4b30 v1.27.13: c3e589e5ec1aabc1e9a0b2700a13ae9541dc8a678fbedad68b0fc82dee4fd866 v1.27.12: 9d6da53ca98e58b947ef0073feff96f03000c32efcee8af93716728b501d7290 v1.27.11: ce4dc48a61399038eff680b952386ed9be471c5af1e43dc461e0fb5339de9356 @@ -202,11 +214,13 @@ kubelet_checksums: v1.27.0: 17c061a9f7919697ac71c151c19337f65b86f59f59441687ac92e977d851c75b kubectl_checksums: arm: + v1.29.5: f3c83a9674098c5a4f27defed001934719f487897dd61db1992057e5ed103b3e v1.29.4: ff4a1f437dc902b73505841a7705a6405694856a798e962ec2fdf7793f0aeadb v1.29.3: 12f72bd88eaa04cd8f09827c64195a695fdd5fb64e11c98524c83d21bcb0e37a v1.29.2: f1bab202f0ce0c4209af0a977fc3dd4076397b1983544e09942ca4f586dff900 v1.29.1: a4b478cc0e9adaab0c5bb3627c20c5228ea0fe2aeff9e805d611eb3edb761972 v1.29.0: a2388eb458d07ec734e4fa02fd0147456a1922a7d6b8e67a32db9d64a4d7621c + v1.28.10: e7b977779169f394383696afe872f6f0a4274789adbce1b70f5b28a20ee2cbd0 v1.28.9: 2da7aead4f58aefee6892b2cc8184de26ef7808bf2d599553267d5cdbc1ce83a v1.28.8: 98c44038dd978a58aa01849c25c2bd522fab7494a39bb3fd56c90944ba6e872f v1.28.7: d0c2e9228aff23bdcc62072ef9cebf5ebb0b14fb8638b6df8f7f6d5220c36bd9 @@ -217,6 +231,7 @@ kubectl_checksums: v1.28.2: 6576aa70413ff00c593a07b549b8b9d9e5ef73c42bb39ab4af475e0fdb540613 v1.28.1: eaa05dab1bffb8593d8e5caa612530ee5c914ee2be73429b7ce36c3becad893f v1.28.0: 372c4e7bbe98c7067c4b7820c4a440c931ad77f7cb83d3237b439ca3c14d3d37 + v1.27.14: 75caa5e6845887a273a3bebc0f67994b8aaeaab65f5ecd4c2a7d1f9f5c14e3ee v1.27.13: 8008a94f57e1aaa88097f4ac9ceae33d86e78bf0bf306a8c1942ab9adf7c5ea0 v1.27.12: eed221f15d1a00ca723afe690ca35ee5c74faa64fa7af432479686f4f26d3510 v1.27.11: 11586f333abaf2776e0d2f9e02c71ae5eeff3ad8e629815aa8bb7d7e9a406301 @@ -232,11 +247,13 @@ kubectl_checksums: v1.27.1: fe704e355bf2c5f69964cd12772687535a11a5e9ec0baf4f27e0a8fb156bc615 v1.27.0: 288470e3eb89a2f55273d753ce6674dfb00e732f2971428acb964810aa726188 arm64: + v1.29.5: 9ee9168def12ac6a6c0c6430e0f73175e756ed262db6040f8aa2121ad2c1f62e v1.29.4: 61537408eedcad064d7334384aed508a8aa1ea786311b87b505456a2e0535d36 v1.29.3: 191a96b27e3c6ae28b330da4c9bfefc9592762670727df4fcf124c9f1d5a466a v1.29.2: 3507ecb4224cf05ae2151a98d4932253624e7762159936d5347b19fe037655ca v1.29.1: 96d6dc7b2bdcd344ce58d17631c452225de5bbf59b83fd3c89c33c6298fb5d8b v1.29.0: 8f7a4bd6bae900a4ddab12bd1399aa652c0d59ea508f39b910e111d248893ff7 + v1.28.10: e659d23d442c2706debe5b96742326c0a1e1d7b5c695a9fe7dfe8ea7402caee8 v1.28.9: e0341d3973213f8099e7fcbbf6d1d506967bc2b7a4faac3fb3b4340f226e9b2f v1.28.8: 93d60dd36093b4c719f1f1bafcf59437c17cb2209341c7c94771e7dd9acdab33 v1.28.7: 13d547495bdea49b223fe06bffb6d2bef96436634847f759107655aa80fc990e @@ -247,6 +264,7 @@ kubectl_checksums: v1.28.2: ea6d89b677a8d9df331a82139bb90d9968131530b94eab26cee561531eff4c53 v1.28.1: 46954a604b784a8b0dc16754cfc3fa26aabca9fd4ffd109cd028bfba99d492f6 v1.28.0: f5484bd9cac66b183c653abed30226b561f537d15346c605cc81d98095f1717c + v1.27.14: 29f3a1f520d929df38873c68dec73519c1e5e521140e01cf9d7701f7b5ffe4f3 v1.27.13: bfc6cb71041ebc0f048402988eccc107cfff2b866c864231c9ada05ab328e5bf v1.27.12: bfc6cb71041ebc0f048402988eccc107cfff2b866c864231c9ada05ab328e5bf v1.27.11: d30e1aa873e78eb376ddee3c785aa78c44eddc56ce2ef901dac1ce0c2c4f50b0 @@ -262,11 +280,13 @@ kubectl_checksums: v1.27.1: fd3cb8f16e6ed8aee9955b76e3027ac423b6d1cc7356867310d128082e2db916 v1.27.0: f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc amd64: + v1.29.5: 603c8681fc0d8609c851f9cc58bcf55eeb97e2934896e858d0232aa8d1138366 v1.29.4: 10e343861c3cb0010161e703307ba907add2aeeeaffc6444779ad915f9889c88 v1.29.3: 89c0435cec75278f84b62b848b8c0d3e15897d6947b6c59a49ddccd93d7312bf v1.29.2: 7816d067740f47f949be826ac76943167b7b3a38c4f0c18b902fffa8779a5afa v1.29.1: 69ab3a931e826bf7ac14d38ba7ca637d66a6fcb1ca0e3333a2cafdf15482af9f v1.29.0: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 + v1.28.10: 389c17a9700a4b01ebb055e39b8bc0886330497440dde004b5ed90f2a3a028db v1.28.9: b4693d0b22f509250694b10c7727c42b427d570af04f2065fe23a55d6c0051f1 v1.28.8: e02aad5c0bac52c970700b814645b62c4f18b634144398ac344875dbaf1072f8 v1.28.7: aff42d3167685e4d8e86fda0ad9c6ce6ec6c047bc24d608041d54717a18192ba @@ -277,6 +297,7 @@ kubectl_checksums: v1.28.2: c922440b043e5de1afa3c1382f8c663a25f055978cbc6e8423493ec157579ec5 v1.28.1: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 v1.28.0: 4717660fd1466ec72d59000bb1d9f5cdc91fac31d491043ca62b34398e0799ce + v1.27.14: 1d2431c68bb6dfa9de3cd40fd66d97a9ac73593c489f9467249eea43e9c16a1e v1.27.13: e991f163197cbd85bbff22f656a74d48b69db5addfa43cc04cca0cf5328f57f1 v1.27.12: d639eda39be2dce42fbec21e038942ab5734541715e3ea5fb29c9ad76686bd7f v1.27.11: 7ae327978a1edb43700070c86f5fd77215792c6b58a7ea70192647e0da848e29 @@ -292,11 +313,13 @@ kubectl_checksums: v1.27.1: 7fe3a762d926fb068bae32c399880e946e8caf3d903078bea9b169dcd5c17f6d v1.27.0: 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87 ppc64le: + v1.29.5: 1d2635f6bd0218c53037c113171479e15e51b60823f7f1b93afb48ae1d9e5b09 v1.29.4: 10a1a7e4423483a386ab1ab9237cda1e9d24423c2cf23b7fa514f533aa23ce87 v1.29.3: 84292286ed2941e52a9df9ccaaf30c3bfebe02a096b67e553d8b643295f231f0 v1.29.2: 382552d15a1aa7ec5a316b2a912e7fbdaaff2f3c714cd38b2b0c6a48b670fed8 v1.29.1: b7780124ccfe9640f3a37d242d31e8dbb252bcd379bd0d7bf3776d15baf15ca3 v1.29.0: ea926d8cf25e2ce982ff5c375da32b51ccbd122b721b1bc4a32f52a9a0d073ab + v1.28.10: aea8f54280e56dd58822fa4ae835ce6c6586727b32fb7bc915c2bee5038ccba9 v1.28.9: 6c5f40b6467b67fe2cc1540c7e7cb15ba6ad092361395aa7989c2c26e3de0697 v1.28.8: c9c21c1db306ec34bdc0f8179d1a1e20f8bcdd6d42fccf84267a5686e3218ad1 v1.28.7: 1394cc047551bbecffee7f1c28cccd0f3c9839a72344854362a08e98d6513c18 @@ -307,6 +330,7 @@ kubectl_checksums: v1.28.2: 87cca30846fec99a4fbea122b21e938717b309631bd2220de52049fce30d2e81 v1.28.1: 81b45c27abbdf2be6c5203dfccfd76ded1ac273f9f7672e6dcdf3440aa191324 v1.28.0: 7a9dcb4c75b33b9dac497c1a756b1f12c7c63f86fc0f321452360fbe1a79ce0f + v1.27.14: 04e07e0f74f9890ce4e391476ca9404e30a09f541726c6ad9ab43e93fe672cf8 v1.27.13: 39341fa0aa075af4bf0dc0bc0ce4ee628b0301a8ecd18a6277abf4e4cb6c4e5d v1.27.12: d08c112cba1a2244fa04f6ead792aad37170f828ec2301301256df25fc6ebe59 v1.27.11: af736cbdb7ae42e696fa3543e483726c1728c95039b9520797511965caca56b6 @@ -323,11 +347,13 @@ kubectl_checksums: v1.27.0: daa9f1d4fe3f217de2546bca4ac14601f34b34a25c1f571f1e44eb313aee1385 kubeadm_checksums: arm: + v1.29.5: 0 v1.29.4: 0 v1.29.3: 0 v1.29.2: 0 v1.29.1: 0 v1.29.0: 0 + v1.28.10: 0 v1.28.9: 0 v1.28.8: 0 v1.28.7: 0 @@ -338,6 +364,7 @@ kubeadm_checksums: v1.28.2: 0 v1.28.1: 0 v1.28.0: 0 + v1.27.14: 0 v1.27.13: 0 v1.27.12: 0 v1.27.11: 0 @@ -353,11 +380,13 @@ kubeadm_checksums: v1.27.1: 0 v1.27.0: 0 arm64: + v1.29.5: d4db8c514f2764edc039462c218dbcd316577f76f21b209b76e9a4b1f08e3100 v1.29.4: 438287a91e08cbefecab79be8ac893a935c3dbf6e87bea895fb99f2bc38cf06e v1.29.3: ce2e4c230f954e59ae77e34c4ff2ae08cad3970505ae1e21b6337e6d83b21682 v1.29.2: e05720feb9d2d67eff25b0156a5c22e2de37be2ffab4e1f4d31e8c526fafd0e1 v1.29.1: 3bff8c50c104c45e416cce9991706c6ac46365f0defbcd54f8cf4ace0fa68dcf v1.29.0: bbddee2d46d2e1643ae3623698b45b13aa2e858616d61c642f2f49e5bb14c980 + v1.28.10: f6809d72ed1bf6fde460e48e5c714c3bc92f680e328defa9bd592a796347b644 v1.28.9: cd6aefad8144a9771fd470529ff14be2675df7b561f7c56dee3fed4f81332dc4 v1.28.8: e0f47adc69ef84e2f6c42cc341b8a790904a929ad10ed1c23c2e822ec804e247 v1.28.7: f556e49494737f97a15bf15bb4b27d45f8747b477302cdfd22dd61816bc02203 @@ -368,6 +397,7 @@ kubeadm_checksums: v1.28.2: 010789a94cf512d918ec4a3ef8ec734dea0061d89a8293059ef9101ca1bf6bff v1.28.1: 7d2f68917470a5d66bd2a7d62897f59cb4afaeffb2f26c028afa119acd8c3fc8 v1.28.0: b9b473d2d9136559b19eb465006af77df45c09862cd7ce6673a33aae517ff5ab + v1.27.14: cb840eb83404047cdafec0b15054023c90a47491b56d2dceba1050040f37cc7e v1.27.13: f334ba0612fada50e98a7ea56b686b35c22f0e3243ec2210f2a6a87e841a139f v1.27.12: e74d47c14b5a251cff961dcce92cd632abcfd0fba4a07e78f0a5a5b2796e4b84 v1.27.11: b8452d6c3f1331beb3d5fa42466a9bc96638a76c40980dba9822300f230c0858 @@ -383,11 +413,13 @@ kubeadm_checksums: v1.27.1: 024a59cd6fc76784b597c0c1cf300526e856e8c9fefa5fa7948158929b739551 v1.27.0: acd805c6783b678ee0068b9dd8165bbfd879c345fd9c25d6a978dbc965f48544 amd64: + v1.29.5: e424dcdbe661314b6ca1fcc94726eb554bc3f4392b060b9626f9df8d7d44d42c v1.29.4: ea20ab064f716ab7f69a36d72df340257b31c9721ea86e1cf9d70b35999ddeea v1.29.3: 6abaa1208bf40b6d1f49e518bd68c8ae4a1be0c5b7d3e45d87979999ab070d8b v1.29.2: 2d4e4fa8685bcbfb661cb41050cd4756f50a7aa147f68492d51a99f9cdfd69ac v1.29.1: d4d81d9020b550c896376fb9e0586a9f15a332175890d061619b52b3e9bc6cbd v1.29.0: 629d4630657caace9c819fd3797f4a70c397fbd41a2a7e464a0507dad675d52c + v1.28.10: 1a344d34755c5f005120308f09a730e7564c8f857de6606b6bc5f18a69606e5a v1.28.9: a4d8acf0a74cb1d07d96a1a34148f54c6420874221af16d8ec902d9bffc7ef89 v1.28.8: c11946cbfd962e1197062534514226cfd70230349e6343ff3ecebfca5476ee64 v1.28.7: 8aa005bdf6af43e47fc818b26f4cb9f361aae8ec4390519e8d4033be65fbef2b @@ -398,6 +430,7 @@ kubeadm_checksums: v1.28.2: 6a4808230661c69431143db2e200ea2d021c7f1b1085e6353583075471310d00 v1.28.1: 6134dbc92dcb83c3bae1a8030f7bb391419b5d13ea94badd3a79b7ece75b2736 v1.28.0: 12ea68bfef0377ccedc1a7c98a05ea76907decbcf1e1ec858a60a7b9b73211bb + v1.27.14: 1ce264643e521494e111b1c9ee59694a54d1f2464bbac3a7a531324ffeae0182 v1.27.13: b88c30b7067f095b7fa02c5560cc50d6e69a5a9fecc606ef477dc7efc86453b9 v1.27.12: 06ee36cc80cfdfc01c937d750783d3ca6169a3da76382c7af3dd172d9f6bfa4e v1.27.11: 31bf446a712fb08190838c35d1f4c93b0f975708c59634a5dc3d8915a241c83e @@ -413,11 +446,13 @@ kubeadm_checksums: v1.27.1: c7d32d698e99b90f877025104cb4a9f3f8c707e99e6817940f260135b6d1ad0a v1.27.0: 78d0e04705a7bdb76a514d60f60c073b16334b15f57ee87f064354ca8a233e80 ppc64le: + v1.29.5: 05c92f52d75268f0aaff5056e0d6b3e03002b2d17432360750100ada9b2c381b v1.29.4: ec47a2dbe1969b9513b0313b5b07b72a870e5da54864d9c8391ec5e857404659 v1.29.3: c0e1f6e9451f28c7b8abf7d3a081fe97578ada69908135e3390f5783511ff7f8 v1.29.2: a0f8ffa8cbfa4bb061ff028df2f6dbb31a9527c561d8c0186d679559f9f347b4 v1.29.1: 3ec6d90c05dd8e4c6bb1f42fd2fe0f091d85317efaf47d9baebd9af506b3878b v1.29.0: 4c414a463ed4277e9062c797d1c0435aa7aec2fd1688c5d34e3161c898113cb5 + v1.28.10: 39a5a27b70ea9eb7e86a37c8862691d875f462a6d52a02355873ffca4595e045 v1.28.9: 616d06ae90a8e3eb79d99a06b1a7dd304da02e7a2d8c58c1c0e501bdd3982a00 v1.28.8: 5a42d2c06f553c4284ce6f3f48432389cd63f768f2a032b78ca6ee4c925e9b11 v1.28.7: 60aec330562326fe1ac4a26fe16053c976467fdbc5811c37a5b4a5c13379cac8 @@ -428,6 +463,7 @@ kubeadm_checksums: v1.28.2: fdc28482a4316c84d61b0997c29c4d4c7b11459af9c654fdee3b4a3031f0fcb7 v1.28.1: 73e06f2b614ed5665951f7c059e225a7b0b31319c64a3f57e146fbe7a77fe54e v1.28.0: 146fe9194486e46accd5054fa93939f9608fdbeefefc4bc68e4c40fb4a84ccc9 + v1.27.14: 9eb15d0db3ade2b1fa3035ed1cb2cfb6f00cc090451d4457bcf08edbcca3616e v1.27.13: 2b5812317f2afaabb14c84a32b8b0dc43c447afa994d0a4c02a8ea4e6bea05db v1.27.12: 6be7ae703299b3c2788ca5e689973d659038a6edc8dde68d7fc966fa539cba0f v1.27.11: b7da90f29cae799d96e47aadb1f20b567fbded09d3d5ddcb88d3378098c6a1f3 diff --git a/roles/kubespray-defaults/defaults/main/main.yml b/roles/kubespray-defaults/defaults/main/main.yml index 69dd01ea207..5a784778382 100644 --- a/roles/kubespray-defaults/defaults/main/main.yml +++ b/roles/kubespray-defaults/defaults/main/main.yml @@ -18,7 +18,7 @@ kubelet_fail_swap_on: true kubelet_swap_behavior: LimitedSwap ## Change this to use another Kubernetes version, e.g. a current beta release -kube_version: v1.29.4 +kube_version: v1.29.5 ## The minimum version working kube_version_min_required: v1.27.0 From f488ecb6cc6dbefd49c1175c2442c01658ca5e3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 05:39:34 -0700 Subject: [PATCH 14/32] Bump cryptography from 41.0.4 to 42.0.7 (#11187) Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.4 to 42.0.7. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/41.0.4...42.0.7) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 723d0cf0d09..c03dcf8dd38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ ansible==9.5.1 -cryptography==41.0.4 +cryptography==42.0.7 jinja2==3.1.4 jmespath==1.0.1 MarkupSafe==2.1.5 From f47ad8299178c015d2f66183af965fa70d1a7c7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 05:43:19 -0700 Subject: [PATCH 15/32] Bump ara[server] from 1.7.0 to 1.7.1 (#11178) Bumps [ara[server]](https://github.com/ansible-community/ara) from 1.7.0 to 1.7.1. - [Commits](https://github.com/ansible-community/ara/compare/1.7.0...1.7.1) --- updated-dependencies: - dependency-name: ara[server] dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 2205eec0140..f1d6ff1093c 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,7 +1,7 @@ -r ../requirements.txt ansible-lint==24.2.3 apache-libcloud==3.8.0 -ara[server]==1.7.0 +ara[server]==1.7.1 dopy==0.3.7 molecule==24.2.1 molecule-plugins[vagrant]==23.5.3 From 2c2b2ed96e662ac4b68836f5b9b73b77a190ad7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 00:32:12 -0700 Subject: [PATCH 16/32] Bump pbr from 5.11.1 to 6.0.0 (#11188) Bumps [pbr](https://docs.openstack.org/pbr/latest/) from 5.11.1 to 6.0.0. --- updated-dependencies: - dependency-name: pbr dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c03dcf8dd38..028f272f38e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ jinja2==3.1.4 jmespath==1.0.1 MarkupSafe==2.1.5 netaddr==1.2.1 -pbr==5.11.1 +pbr==6.0.0 ruamel.yaml==0.18.6 ruamel.yaml.clib==0.2.8 jsonschema==4.22.0 From d7756d85ef59355aefcbea1306557dd5eab45aa6 Mon Sep 17 00:00:00 2001 From: QCU Date: Thu, 16 May 2024 15:41:26 +0800 Subject: [PATCH 17/32] fix: Change the position of the containerd_extra_args parameter to make the parameter more universal. (#11013) that you can only place thing in the root table in a toml document before the first table heading. --- roles/container-engine/containerd/templates/config.toml.j2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2 index 088a680abc4..8a1ee8aa53c 100644 --- a/roles/container-engine/containerd/templates/config.toml.j2 +++ b/roles/container-engine/containerd/templates/config.toml.j2 @@ -3,6 +3,10 @@ root = "{{ containerd_storage_dir }}" state = "{{ containerd_state_dir }}" oom_score = {{ containerd_oom_score }} +{% if containerd_extra_args is defined %} +{{ containerd_extra_args }} +{% endif %} + [grpc] max_recv_message_size = {{ containerd_grpc_max_recv_message_size }} max_send_message_size = {{ containerd_grpc_max_send_message_size }} @@ -104,6 +108,3 @@ oom_score = {{ containerd_oom_score }} service_name = "{{ containerd_tracing_service_name }}" {% endif %} -{% if containerd_extra_args is defined %} -{{ containerd_extra_args }} -{% endif %} From 427f8687184bc4f7969987c149951dd994819ffb Mon Sep 17 00:00:00 2001 From: tico88612 <17496418+tico88612@users.noreply.github.com> Date: Thu, 16 May 2024 21:05:26 +0800 Subject: [PATCH 18/32] Bump docker version 26.1 (#11198) Signed-off-by: tico88612 <17496418+tico88612@users.noreply.github.com> --- .../container-engine/docker/defaults/main.yml | 2 +- roles/container-engine/docker/vars/amazon.yml | 2 ++ roles/container-engine/docker/vars/debian.yml | 17 ++++++++++++----- roles/container-engine/docker/vars/fedora.yml | 19 ++++++++++++------- .../container-engine/docker/vars/redhat-7.yml | 17 +++++++++++------ roles/container-engine/docker/vars/redhat.yml | 17 +++++++++++------ roles/container-engine/docker/vars/ubuntu.yml | 15 ++++++++++----- 7 files changed, 59 insertions(+), 30 deletions(-) diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml index f7562086a24..46151761384 100644 --- a/roles/container-engine/docker/defaults/main.yml +++ b/roles/container-engine/docker/defaults/main.yml @@ -1,5 +1,5 @@ --- -docker_version: '24.0' +docker_version: '26.1' docker_cli_version: "{{ docker_version }}" docker_package_info: diff --git a/roles/container-engine/docker/vars/amazon.yml b/roles/container-engine/docker/vars/amazon.yml index 4871f4afa37..ee4789f01f3 100644 --- a/roles/container-engine/docker/vars/amazon.yml +++ b/roles/container-engine/docker/vars/amazon.yml @@ -6,6 +6,8 @@ docker_versioned_pkg: '18.09': docker-18.09.9ce-2.amzn2 '19.03': docker-19.03.13ce-1.amzn2 '20.10': docker-20.10.7-5.amzn2 + '24.0': docker-24.0.5-1.amzn2 + '25.0': docker-25.0.3-1.amzn2 docker_version: "latest" diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml index 02289fa4540..39d82f47dcf 100644 --- a/roles/container-engine/docker/vars/debian.yml +++ b/roles/container-engine/docker/vars/debian.yml @@ -22,9 +22,10 @@ containerd_versioned_pkg: '1.6.15': "{{ containerd_package }}=1.6.15-1" '1.6.16': "{{ containerd_package }}=1.6.16-1" '1.6.18': "{{ containerd_package }}=1.6.18-1" - '1.6.28': "{{ containerd_package }}=1.6.28-1" - 'stable': "{{ containerd_package }}=1.6.28-1" - 'edge': "{{ containerd_package }}=1.6.28-1" + '1.6.28': "{{ containerd_package }}=1.6.28-2" + '1.6.31': "{{ containerd_package }}=1.6.31-1" + 'stable': "{{ containerd_package }}=1.6.31-1" + 'edge': "{{ containerd_package }}=1.6.31-1" # https://download.docker.com/linux/debian/ docker_versioned_pkg: @@ -34,6 +35,9 @@ docker_versioned_pkg: '20.10': docker-ce=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }} '23.0': docker-ce=5:23.0.6-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} '24.0': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '25.0': docker-ce=5:25.0.5-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '26.0': docker-ce=5:26.0.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '26.1': docker-ce=5:26.1.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} 'stable': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} 'edge': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} @@ -44,8 +48,11 @@ docker_cli_versioned_pkg: '20.10': docker-ce-cli=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }} '23.0': docker-ce-cli=5:23.0.6-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} '24.0': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} - 'stable': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} - 'edge': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '25.0': docker-ce-cli=5:25.0.5-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '26.0': docker-ce-cli=5:26.0.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '26.1': docker-ce-cli=5:26.1.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + 'stable': docker-ce-cli=5:26.1.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + 'edge': docker-ce-cli=5:26.1.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} docker_package_info: pkgs: diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml index 39dfbafe52b..9fe6c5c2405 100644 --- a/roles/container-engine/docker/vars/fedora.yml +++ b/roles/container-engine/docker/vars/fedora.yml @@ -22,9 +22,10 @@ containerd_versioned_pkg: '1.6.15': "{{ containerd_package }}-1.6.15-3.1.fc{{ ansible_distribution_major_version }}" '1.6.16': "{{ containerd_package }}-1.6.16-3.1.fc{{ ansible_distribution_major_version }}" '1.6.18': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}" - '1.6.28': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}" - 'stable': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}" - 'edge': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}" + '1.6.28': "{{ containerd_package }}-1.6.28-3.2.fc{{ ansible_distribution_major_version }}" + '1.6.31': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" + 'stable': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" + 'edge': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" # https://docs.docker.com/install/linux/docker-ce/fedora/ # https://download.docker.com/linux/fedora//x86_64/stable/Packages/ @@ -34,8 +35,10 @@ docker_versioned_pkg: '20.10': docker-ce-20.10.20-3.fc{{ ansible_distribution_major_version }} '23.0': docker-ce-3:23.0.6-1.fc{{ ansible_distribution_major_version }} '24.0': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }} - 'stable': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }} - 'edge': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }} + '26.0': docker-ce-3:26.0.2-1.fc{{ ansible_distribution_major_version }} + '26.1': docker-ce-3:26.1.2-1.fc{{ ansible_distribution_major_version }} + 'stable': docker-ce-3:26.1.2-1.fc{{ ansible_distribution_major_version }} + 'edge': docker-ce-3:26.1.2-1.fc{{ ansible_distribution_major_version }} docker_cli_versioned_pkg: 'latest': docker-ce-cli @@ -43,8 +46,10 @@ docker_cli_versioned_pkg: '20.10': docker-ce-cli-20.10.20-3.fc{{ ansible_distribution_major_version }} '23.0': docker-ce-cli-1:23.0.6-1.fc{{ ansible_distribution_major_version }} '24.0': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }} - 'stable': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }} - 'edge': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }} + '26.0': docker-ce-cli-1:26.0.2-1.fc{{ ansible_distribution_major_version }} + '26.1': docker-ce-cli-1:26.0.2-1.fc{{ ansible_distribution_major_version }} + 'stable': docker-ce-cli-1:26.0.2-1.fc{{ ansible_distribution_major_version }} + 'edge': docker-ce-cli-1:26.0.2-1.fc{{ ansible_distribution_major_version }} docker_package_info: enablerepo: "docker-ce" diff --git a/roles/container-engine/docker/vars/redhat-7.yml b/roles/container-engine/docker/vars/redhat-7.yml index c10e881d97e..0af67035142 100644 --- a/roles/container-engine/docker/vars/redhat-7.yml +++ b/roles/container-engine/docker/vars/redhat-7.yml @@ -23,8 +23,9 @@ containerd_versioned_pkg: '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el7" '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el7" '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el7" - 'stable': "{{ containerd_package }}-1.6.28-3.1.el7" - 'edge': "{{ containerd_package }}-1.6.18-3.1.el7" + '1.6.31': "{{ containerd_package }}-1.6.31-3.1.el7" + 'stable': "{{ containerd_package }}-1.6.31-3.1.el7" + 'edge': "{{ containerd_package }}-1.6.31-3.1.el7" # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://download.docker.com/linux/centos/>/x86_64/stable/Packages/ @@ -36,8 +37,10 @@ docker_versioned_pkg: '20.10': docker-ce-20.10.20-3.el7 '23.0': docker-ce-23.0.6-1.el7 '24.0': docker-ce-24.0.9-1.el7 - 'stable': docker-ce-24.0.9-1.el7 - 'edge': docker-ce-24.0.9-1.el7 + '26.0': docker-ce-26.0.2-1.el7 + '26.1': docker-ce-26.1.2-1.el7 + 'stable': docker-ce-26.1.2-1.el7 + 'edge': docker-ce-26.1.2-1.el7 docker_cli_versioned_pkg: 'latest': docker-ce-cli @@ -46,8 +49,10 @@ docker_cli_versioned_pkg: '20.10': docker-ce-cli-20.10.20-3.el7 '23.0': docker-ce-cli-23.0.6-1.el7 '24.0': docker-ce-cli-24.0.9-1.el7 - 'stable': docker-ce-cli-24.0.9-1.el7 - 'edge': docker-ce-cli-24.0.9-1.el7 + '26.0': docker-ce-cli-26.0.2-1.el7 + '26.1': docker-ce-cli-26.1.2-1.el7 + 'stable': docker-ce-cli-26.1.2-1.el7 + 'edge': docker-ce-cli-26.1.2-1.el7 docker_package_info: enablerepo: "docker-ce" diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml index 453f7f9fadf..ad1105a6668 100644 --- a/roles/container-engine/docker/vars/redhat.yml +++ b/roles/container-engine/docker/vars/redhat.yml @@ -23,8 +23,9 @@ containerd_versioned_pkg: '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}" '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}" '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" - 'stable': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" - 'edge': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" + '1.6.31': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" + 'stable': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" + 'edge': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://download.docker.com/linux/centos/>/x86_64/stable/Packages/ @@ -36,8 +37,10 @@ docker_versioned_pkg: '20.10': docker-ce-3:20.10.20-3.el{{ ansible_distribution_major_version }} '23.0': docker-ce-3:23.0.6-1.el{{ ansible_distribution_major_version }} '24.0': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }} - 'stable': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }} - 'edge': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }} + '26.0': docker-ce-3:26.0.2-1.el{{ ansible_distribution_major_version }} + '26.1': docker-ce-3:26.1.2-1.el{{ ansible_distribution_major_version }} + 'stable': docker-ce-3:26.1.2-1.el{{ ansible_distribution_major_version }} + 'edge': docker-ce-3:26.1.2-1.el{{ ansible_distribution_major_version }} docker_cli_versioned_pkg: 'latest': docker-ce-cli @@ -46,8 +49,10 @@ docker_cli_versioned_pkg: '20.10': docker-ce-cli-1:20.10.20-3.el{{ ansible_distribution_major_version }} '23.0': docker-ce-cli-1:23.0.6-1.el{{ ansible_distribution_major_version }} '24.0': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }} - 'stable': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }} - 'edge': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }} + '26.0': docker-ce-cli-1:26.0.2-1.el{{ ansible_distribution_major_version }} + '26.1': docker-ce-cli-1:26.1.2-1.el{{ ansible_distribution_major_version }} + 'stable': docker-ce-cli-1:26.1.2-1.el{{ ansible_distribution_major_version }} + 'edge': docker-ce-cli-1:26.1.2-1.el{{ ansible_distribution_major_version }} docker_package_info: enablerepo: "docker-ce" diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml index b4c1d289ccd..097039033a0 100644 --- a/roles/container-engine/docker/vars/ubuntu.yml +++ b/roles/container-engine/docker/vars/ubuntu.yml @@ -22,9 +22,10 @@ containerd_versioned_pkg: '1.6.15': "{{ containerd_package }}=1.6.15-1" '1.6.16': "{{ containerd_package }}=1.6.16-1" '1.6.18': "{{ containerd_package }}=1.6.18-1" - '1.6.28': "{{ containerd_package }}=1.6.28-1" - 'stable': "{{ containerd_package }}=1.6.28-1" - 'edge': "{{ containerd_package }}=1.6.28-1" + '1.6.28': "{{ containerd_package }}=1.6.28-2" + '1.6.31': "{{ containerd_package }}=1.6.31-1" + 'stable': "{{ containerd_package }}=1.6.31-1" + 'edge': "{{ containerd_package }}=1.6.31-1" # https://download.docker.com/linux/ubuntu/ docker_versioned_pkg: @@ -34,8 +35,10 @@ docker_versioned_pkg: '20.10': docker-ce=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }} '23.0': docker-ce=5:23.0.6-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} '24.0': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} - 'stable': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} - 'edge': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + '26.0': docker-ce=5:26.0.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + '26.1': docker-ce=5:26.1.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + 'stable': docker-ce=5:26.1.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + 'edge': docker-ce=5:26.1.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} docker_cli_versioned_pkg: 'latest': docker-ce-cli @@ -44,6 +47,8 @@ docker_cli_versioned_pkg: '20.10': docker-ce-cli=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }} '23.0': docker-ce-cli=5:23.0.6-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} '24.0': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + '26.0': docker-ce-cli=5:26.0.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + '26.1': docker-ce-cli=5:26.1.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} 'stable': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} 'edge': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} From 354ffe7bd6bf7e411f1257de3d93370453f6bd5b Mon Sep 17 00:00:00 2001 From: ERIK Date: Fri, 17 May 2024 16:58:23 +0800 Subject: [PATCH 19/32] bump docker version of kylin and uos (#11203) Signed-off-by: bo.jiang --- roles/container-engine/docker/vars/kylin.yml | 85 +++++++++++--------- 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/roles/container-engine/docker/vars/kylin.yml b/roles/container-engine/docker/vars/kylin.yml index 2b8cdf7e66a..7531a9d711d 100644 --- a/roles/container-engine/docker/vars/kylin.yml +++ b/roles/container-engine/docker/vars/kylin.yml @@ -1,54 +1,61 @@ --- + +docker_version: 26.1 +docker_cli_version: "{{ docker_version }}" +docker_rh_repo_base_url: 'https://download.docker.com/linux/centos/8/$basearch/stable' + # containerd versions are only relevant for docker containerd_versioned_pkg: 'latest': "{{ containerd_package }}" - '1.3.7': "{{ containerd_package }}-1.3.7-3.1.el{{ ansible_distribution_major_version }}" - '1.3.9': "{{ containerd_package }}-1.3.9-3.1.el{{ ansible_distribution_major_version }}" - '1.4.3': "{{ containerd_package }}-1.4.3-3.2.el{{ ansible_distribution_major_version }}" - '1.4.4': "{{ containerd_package }}-1.4.4-3.1.el{{ ansible_distribution_major_version }}" - '1.4.6': "{{ containerd_package }}-1.4.6-3.1.el{{ ansible_distribution_major_version }}" - '1.4.9': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}" - '1.4.12': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}" - '1.6.4': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}" - '1.6.6': "{{ containerd_package }}-1.6.6-3.1.el{{ ansible_distribution_major_version }}" - '1.6.7': "{{ containerd_package }}-1.6.7-3.1.el{{ ansible_distribution_major_version }}" - '1.6.8': "{{ containerd_package }}-1.6.8-3.1.el{{ ansible_distribution_major_version }}" - '1.6.9': "{{ containerd_package }}-1.6.9-3.1.el{{ ansible_distribution_major_version }}" - '1.6.10': "{{ containerd_package }}-1.6.10-3.1.el{{ ansible_distribution_major_version }}" - '1.6.11': "{{ containerd_package }}-1.6.11-3.1.el{{ ansible_distribution_major_version }}" - '1.6.12': "{{ containerd_package }}-1.6.12-3.1.el{{ ansible_distribution_major_version }}" - '1.6.13': "{{ containerd_package }}-1.6.13-3.1.el{{ ansible_distribution_major_version }}" - '1.6.14': "{{ containerd_package }}-1.6.14-3.1.el{{ ansible_distribution_major_version }}" - '1.6.15': "{{ containerd_package }}-1.6.15-3.1.el{{ ansible_distribution_major_version }}" - '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}" - '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}" - '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" - 'stable': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" - 'edge': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" - -docker_version: 19.03 -docker_cli_version: 19.03 + '1.3.7': "{{ containerd_package }}-1.3.7-3.1.el8" + '1.3.9': "{{ containerd_package }}-1.3.9-3.1.el8" + '1.4.3': "{{ containerd_package }}-1.4.3-3.2.el8" + '1.4.4': "{{ containerd_package }}-1.4.4-3.1.el8" + '1.4.6': "{{ containerd_package }}-1.4.6-3.1.el8" + '1.4.9': "{{ containerd_package }}-1.4.9-3.1.el8" + '1.4.12': "{{ containerd_package }}-1.4.12-3.1.el8" + '1.6.4': "{{ containerd_package }}-1.6.4-3.1.el8" + '1.6.6': "{{ containerd_package }}-1.6.6-3.1.el8" + '1.6.7': "{{ containerd_package }}-1.6.7-3.1.el8" + '1.6.8': "{{ containerd_package }}-1.6.8-3.1.el8" + '1.6.9': "{{ containerd_package }}-1.6.9-3.1.el8" + '1.6.10': "{{ containerd_package }}-1.6.10-3.1.el8" + '1.6.11': "{{ containerd_package }}-1.6.11-3.1.el8" + '1.6.12': "{{ containerd_package }}-1.6.12-3.1.el8" + '1.6.13': "{{ containerd_package }}-1.6.13-3.1.el8" + '1.6.14': "{{ containerd_package }}-1.6.14-3.1.el8" + '1.6.15': "{{ containerd_package }}-1.6.15-3.1.el8" + '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el8" + '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el8" + '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el8" + '1.6.31': "{{ containerd_package }}-1.6.31-3.1.el8" + 'stable': "{{ containerd_package }}-1.6.31-3.1.el8" + 'edge': "{{ containerd_package }}-1.6.31-3.1.el8" # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package -# https://download.docker.com/linux/centos/>/x86_64/stable/Packages/ +# https://download.docker.com/linux/centos/8/x86_64/stable/Packages/ # or do 'yum --showduplicates list docker-engine' docker_versioned_pkg: 'latest': docker-ce - '18.09': docker-ce-3:18.09.9-3.el{{ ansible_distribution_major_version }} - '19.03': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }} - '23.0': docker-ce-3:23.0.6-1.el{{ ansible_distribution_major_version }} - '24.0': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }} - 'stable': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }} - 'edge': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }} + '18.09': docker-ce-3:18.09.9-3.el8 + '19.03': docker-ce-3:19.03.15-3.el8 + '23.0': docker-ce-3:23.0.6-1.el8 + '24.0': docker-ce-3:24.0.9-1.el8 + '26.0': docker-ce-26.0.2-1.el8 + '26.1': docker-ce-26.1.2-1.el8 + 'stable': docker-ce-26.1.2-1.el8 + 'edge': docker-ce-26.1.2-1.el8 docker_cli_versioned_pkg: 'latest': docker-ce-cli - '18.09': docker-ce-cli-1:18.09.9-3.el{{ ansible_distribution_major_version }} - '19.03': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }} - '23.0': docker-ce-cli-1:23.0.6-1.el{{ ansible_distribution_major_version }} - '24.0': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }} - 'stable': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }} - 'edge': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }} + '18.09': docker-ce-cli-1:18.09.9-3.el8 + '19.03': docker-ce-cli-1:19.03.15-3.el8 + '23.0': docker-ce-cli-1:23.0.6-1.el8 + '24.0': docker-ce-cli-1:24.0.9-1.el8 + '26.0': docker-ce-cli-26.0.2-1.el8 + '26.1': docker-ce-cli-26.1.2-1.el8 + 'stable': docker-ce-cli-26.1.2-1.el8 + 'edge': docker-ce-cli-26.1.2-1.el8 docker_package_info: enablerepo: "docker-ce" From d5f6838fba0fafef2b00babaf484772192dd6e7f Mon Sep 17 00:00:00 2001 From: Lihai Tu <92532497+tu1h@users.noreply.github.com> Date: Fri, 17 May 2024 17:05:35 +0800 Subject: [PATCH 20/32] Bump scheduler plugins version (#11205) Signed-off-by: tu1h --- docs/kubernetes-apps/scheduler_plugins.md | 2 +- roles/kubernetes-apps/meta/main.yml | 2 +- roles/kubespray-defaults/defaults/main/download.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/kubernetes-apps/scheduler_plugins.md b/docs/kubernetes-apps/scheduler_plugins.md index 85e37910ad5..c0b2f3b60b3 100644 --- a/docs/kubernetes-apps/scheduler_plugins.md +++ b/docs/kubernetes-apps/scheduler_plugins.md @@ -24,8 +24,8 @@ There are requirements for the version of Kubernetes, please see [Compatibility | Scheduler Plugins | Compiled With K8s Version | | ----------------- | ------------------------- | +| v0.28.9 | v1.28.9 | | v0.27.8 | v1.27.8 | -| v0.26.8 | v1.26.7 | ## Turning it on diff --git a/roles/kubernetes-apps/meta/main.yml b/roles/kubernetes-apps/meta/main.yml index b97dc5f775d..b02684d30c0 100644 --- a/roles/kubernetes-apps/meta/main.yml +++ b/roles/kubernetes-apps/meta/main.yml @@ -128,7 +128,7 @@ dependencies: - role: kubernetes-apps/scheduler_plugins when: - scheduler_plugins_enabled - - kube_major_version is version('v1.28', '<') + - kube_major_version is version('v1.29', '<') - inventory_hostname == groups['kube_control_plane'][0] tags: - scheduler_plugins diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index a6f46a98aac..f1c2c29e29a 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -156,10 +156,10 @@ crio_supported_versions: v1.27: v1.27.4 crio_version: "{{ crio_supported_versions[kube_major_version] }}" -# Scheduler plugins doesn't build for K8s 1.28 yet +# Scheduler plugins doesn't build for K8s 1.29 yet scheduler_plugins_supported_versions: v1.29: 0 - v1.28: 0 + v1.28: v0.28.9 v1.27: v0.27.8 scheduler_plugins_version: "{{ scheduler_plugins_supported_versions[kube_major_version] }}" From dac4705ebe6009123a225fc9f29397d4f0bf9940 Mon Sep 17 00:00:00 2001 From: ERIK Date: Fri, 17 May 2024 19:24:38 +0800 Subject: [PATCH 21/32] bump docker version for openeuler linux (#11206) Signed-off-by: bo.jiang --- roles/bootstrap-os/tasks/openEuler.yml | 1 + roles/container-engine/docker/tasks/main.yml | 7 ------- roles/container-engine/docker/vars/openeuler.yml | 1 + 3 files changed, 2 insertions(+), 7 deletions(-) create mode 120000 roles/bootstrap-os/tasks/openEuler.yml create mode 120000 roles/container-engine/docker/vars/openeuler.yml diff --git a/roles/bootstrap-os/tasks/openEuler.yml b/roles/bootstrap-os/tasks/openEuler.yml new file mode 120000 index 00000000000..fa2c37f2a96 --- /dev/null +++ b/roles/bootstrap-os/tasks/openEuler.yml @@ -0,0 +1 @@ +centos.yml \ No newline at end of file diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml index 376ee0504ba..1ccee8c4c1b 100644 --- a/roles/container-engine/docker/tasks/main.yml +++ b/roles/container-engine/docker/tasks/main.yml @@ -11,13 +11,6 @@ set_fact: is_ostree: "{{ ostree.stat.exists }}" -- name: Set docker_version for openEuler - set_fact: - docker_version: '19.03' - when: ansible_distribution == "openEuler" - tags: - - facts - - name: Gather os specific variables include_vars: "{{ item }}" with_first_found: diff --git a/roles/container-engine/docker/vars/openeuler.yml b/roles/container-engine/docker/vars/openeuler.yml new file mode 120000 index 00000000000..1010ef7efd9 --- /dev/null +++ b/roles/container-engine/docker/vars/openeuler.yml @@ -0,0 +1 @@ +kylin.yml \ No newline at end of file From 0b464b5239c69f1e4c2d197b525d90be04920ec0 Mon Sep 17 00:00:00 2001 From: peterw <12556909+pedro-peter@users.noreply.github.com> Date: Fri, 17 May 2024 12:39:24 +0100 Subject: [PATCH 22/32] crio container runtime crio_registries path fix (#11030) --- roles/container-engine/cri-o/tasks/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/container-engine/cri-o/tasks/main.yaml b/roles/container-engine/cri-o/tasks/main.yaml index 61105f401fc..2d73e74e232 100644 --- a/roles/container-engine/cri-o/tasks/main.yaml +++ b/roles/container-engine/cri-o/tasks/main.yaml @@ -169,7 +169,7 @@ - name: Cri-o | write registries configs template: src: registry.conf.j2 - dest: "/etc/containers/registries.conf.d/10-{{ item.prefix | default(item.location) | regex_replace(':', '_') }}.conf" + dest: "/etc/containers/registries.conf.d/10-{{ item.prefix | default(item.location) | regex_replace(':|/', '_') }}.conf" mode: 0644 loop: "{{ crio_registries }}" notify: Restart crio From 4dbfd42f1dfdcc8c10d6765bdd66b1a9f7acdde5 Mon Sep 17 00:00:00 2001 From: Payback159 Date: Wed, 15 May 2024 19:32:51 +0200 Subject: [PATCH 23/32] modify doc structure and update existing doc-links as preparation for new doc generation script --- README.md | 102 +++++++++--------- contrib/azurerm/README.md | 2 +- contrib/terraform/equinix/README.md | 2 +- contrib/terraform/openstack/README.md | 2 +- docs/{ => CNI}/calico.md | 2 +- docs/{ => CNI}/cilium.md | 2 +- docs/{ => CNI}/cni.md | 0 docs/{ => CNI}/flannel.md | 0 docs/{ => CNI}/kube-ovn.md | 0 docs/{ => CNI}/kube-router.md | 0 docs/{ => CNI}/macvlan.md | 0 docs/{ => CNI}/multus.md | 0 docs/{ => CNI}/weave.md | 0 docs/{ => CRI}/containerd.md | 0 docs/{ => CRI}/cri-o.md | 0 docs/{ => CRI}/docker.md | 0 docs/{ => CRI}/gvisor.md | 0 docs/{ => CRI}/kata-containers.md | 0 docs/{ => CSI}/aws-ebs-csi.md | 0 docs/{ => CSI}/azure-csi.md | 0 docs/{ => CSI}/cinder-csi.md | 0 docs/{ => CSI}/gcp-pd-csi.md | 0 docs/{ => CSI}/vsphere-csi.md | 0 docs/{ => advanced}/arch.md | 0 docs/{ => advanced}/cert_manager.md | 0 docs/{ => advanced}/dns-stack.md | 0 docs/{ => advanced}/downloads.md | 0 docs/{ => advanced}/gcp-lb.md | 0 docs/{ => advanced}/kubernetes-reliability.md | 0 docs/{ => advanced}/mitogen.md | 0 docs/{ => advanced}/netcheck.md | 0 docs/{ => advanced}/ntp.md | 0 docs/{ => advanced}/proxy.md | 0 .../{kubernetes-apps => advanced}/registry.md | 0 docs/{ => ansible}/ansible.md | 4 +- docs/{ => ansible}/ansible_collection.md | 0 docs/{ => ansible}/vars.md | 4 +- docs/{ => cloud_providers}/aws.md | 0 docs/{ => cloud_providers}/azure.md | 0 docs/{ => cloud_providers}/cloud.md | 0 docs/{ => cloud_providers}/equinix-metal.md | 2 +- docs/{ => cloud_providers}/openstack.md | 0 docs/{ => cloud_providers}/vsphere.md | 2 +- docs/{ => developers}/ci-setup.md | 0 docs/{ => developers}/ci.md | 0 docs/{ => developers}/test_cases.md | 2 +- docs/{ => developers}/vagrant.md | 2 +- .../cephfs_provisioner.md | 0 .../local_volume_provisioner.md | 0 .../rbd_provisioner.md | 0 .../scheduler_plugins.md | 0 docs/{ => getting_started}/comparisons.md | 0 docs/{ => getting_started}/getting-started.md | 6 +- .../setting-up-your-first-cluster.md | 0 .../alb_ingress_controller.md | 0 .../ingress_nginx.md | 0 docs/{ => ingress}/kube-vip.md | 0 docs/{ => ingress}/metallb.md | 0 docs/{ => operating_systems}/amazonlinux.md | 0 docs/{ => operating_systems}/bootstrap-os.md | 0 docs/{ => operating_systems}/centos.md | 0 docs/{ => operating_systems}/fcos.md | 0 docs/{ => operating_systems}/flatcar.md | 0 docs/{ => operating_systems}/kylinlinux.md | 0 docs/{ => operating_systems}/openeuler.md | 0 docs/{ => operating_systems}/opensuse.md | 0 docs/{ => operating_systems}/rhel.md | 0 docs/{ => operating_systems}/uoslinux.md | 0 docs/{ => operations}/cgroups.md | 0 .../encrypting-secret-data-at-rest.md | 0 docs/{ => operations}/etcd.md | 0 docs/{ => operations}/ha-mode.md | 0 docs/{ => operations}/hardening.md | 0 docs/{ => operations}/integration.md | 0 docs/{ => operations}/large-deployments.md | 6 +- docs/{ => operations}/mirror.md | 0 docs/{ => operations}/nodes.md | 0 docs/{ => operations}/offline-environment.md | 0 docs/{ => operations}/port-requirements.md | 0 .../{ => operations}/recover-control-plane.md | 0 docs/{ => operations}/upgrades.md | 0 docs/{ => roadmap}/roadmap.md | 0 82 files changed, 70 insertions(+), 70 deletions(-) rename docs/{ => CNI}/calico.md (99%) rename docs/{ => CNI}/cilium.md (99%) rename docs/{ => CNI}/cni.md (100%) rename docs/{ => CNI}/flannel.md (100%) rename docs/{ => CNI}/kube-ovn.md (100%) rename docs/{ => CNI}/kube-router.md (100%) rename docs/{ => CNI}/macvlan.md (100%) rename docs/{ => CNI}/multus.md (100%) rename docs/{ => CNI}/weave.md (100%) rename docs/{ => CRI}/containerd.md (100%) rename docs/{ => CRI}/cri-o.md (100%) rename docs/{ => CRI}/docker.md (100%) rename docs/{ => CRI}/gvisor.md (100%) rename docs/{ => CRI}/kata-containers.md (100%) rename docs/{ => CSI}/aws-ebs-csi.md (100%) rename docs/{ => CSI}/azure-csi.md (100%) rename docs/{ => CSI}/cinder-csi.md (100%) rename docs/{ => CSI}/gcp-pd-csi.md (100%) rename docs/{ => CSI}/vsphere-csi.md (100%) rename docs/{ => advanced}/arch.md (100%) rename docs/{ => advanced}/cert_manager.md (100%) rename docs/{ => advanced}/dns-stack.md (100%) rename docs/{ => advanced}/downloads.md (100%) rename docs/{ => advanced}/gcp-lb.md (100%) rename docs/{ => advanced}/kubernetes-reliability.md (100%) rename docs/{ => advanced}/mitogen.md (100%) rename docs/{ => advanced}/netcheck.md (100%) rename docs/{ => advanced}/ntp.md (100%) rename docs/{ => advanced}/proxy.md (100%) rename docs/{kubernetes-apps => advanced}/registry.md (100%) rename docs/{ => ansible}/ansible.md (99%) rename docs/{ => ansible}/ansible_collection.md (100%) rename docs/{ => ansible}/vars.md (99%) rename docs/{ => cloud_providers}/aws.md (100%) rename docs/{ => cloud_providers}/azure.md (100%) rename docs/{ => cloud_providers}/cloud.md (100%) rename docs/{ => cloud_providers}/equinix-metal.md (98%) rename docs/{ => cloud_providers}/openstack.md (100%) rename docs/{ => cloud_providers}/vsphere.md (99%) rename docs/{ => developers}/ci-setup.md (100%) rename docs/{ => developers}/ci.md (100%) rename docs/{ => developers}/test_cases.md (94%) rename docs/{ => developers}/vagrant.md (99%) rename docs/{kubernetes-apps => external_storage_provisioners}/cephfs_provisioner.md (100%) rename docs/{kubernetes-apps => external_storage_provisioners}/local_volume_provisioner.md (100%) rename docs/{kubernetes-apps => external_storage_provisioners}/rbd_provisioner.md (100%) rename docs/{kubernetes-apps => external_storage_provisioners}/scheduler_plugins.md (100%) rename docs/{ => getting_started}/comparisons.md (100%) rename docs/{ => getting_started}/getting-started.md (96%) rename docs/{ => getting_started}/setting-up-your-first-cluster.md (100%) rename docs/{ingress_controller => ingress}/alb_ingress_controller.md (100%) rename docs/{ingress_controller => ingress}/ingress_nginx.md (100%) rename docs/{ => ingress}/kube-vip.md (100%) rename docs/{ => ingress}/metallb.md (100%) rename docs/{ => operating_systems}/amazonlinux.md (100%) rename docs/{ => operating_systems}/bootstrap-os.md (100%) rename docs/{ => operating_systems}/centos.md (100%) rename docs/{ => operating_systems}/fcos.md (100%) rename docs/{ => operating_systems}/flatcar.md (100%) rename docs/{ => operating_systems}/kylinlinux.md (100%) rename docs/{ => operating_systems}/openeuler.md (100%) rename docs/{ => operating_systems}/opensuse.md (100%) rename docs/{ => operating_systems}/rhel.md (100%) rename docs/{ => operating_systems}/uoslinux.md (100%) rename docs/{ => operations}/cgroups.md (100%) rename docs/{ => operations}/encrypting-secret-data-at-rest.md (100%) rename docs/{ => operations}/etcd.md (100%) rename docs/{ => operations}/ha-mode.md (100%) rename docs/{ => operations}/hardening.md (100%) rename docs/{ => operations}/integration.md (100%) rename docs/{ => operations}/large-deployments.md (90%) rename docs/{ => operations}/mirror.md (100%) rename docs/{ => operations}/nodes.md (100%) rename docs/{ => operations}/offline-environment.md (100%) rename docs/{ => operations}/port-requirements.md (100%) rename docs/{ => operations}/recover-control-plane.md (100%) rename docs/{ => operations}/upgrades.md (100%) rename docs/{ => roadmap}/roadmap.md (100%) diff --git a/README.md b/README.md index a502e4c26ba..faeba5bf83b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ If you have questions, check the documentation at [kubespray.io](https://kubespray.io) and join us on the [kubernetes slack](https://kubernetes.slack.com), channel **\#kubespray**. You can get your invite [here](http://slack.k8s.io/) -- Can be deployed on **[AWS](docs/aws.md), GCE, [Azure](docs/azure.md), [OpenStack](docs/openstack.md), [vSphere](docs/vsphere.md), [Equinix Metal](docs/equinix-metal.md) (bare metal), Oracle Cloud Infrastructure (Experimental), or Baremetal** +- Can be deployed on **[AWS](docs/cloud_providers/aws.md), GCE, [Azure](docs/cloud_providers/azure.md), [OpenStack](docs/cloud_providers/openstack.md), [vSphere](docs/cloud_providers/vsphere.md), [Equinix Metal](docs/cloud_providers/equinix-metal.md) (bare metal), Oracle Cloud Infrastructure (Experimental), or Baremetal** - **Highly available** cluster - **Composable** (Choice of the network plugin for instance) - Supports most popular **Linux distributions** @@ -19,7 +19,7 @@ Below are several ways to use Kubespray to deploy a Kubernetes cluster. #### Usage -Install Ansible according to [Ansible installation guide](/docs/ansible.md#installing-ansible) +Install Ansible according to [Ansible installation guide](/docs/ansible/ansible.md#installing-ansible) then run the following steps: ```ShellSession @@ -86,7 +86,7 @@ ansible-playbook -i /inventory/inventory.ini --private-key /root/.ssh/id_rsa clu #### Collection -See [here](docs/ansible_collection.md) if you wish to use this repository as an Ansible collection +See [here](docs/ansible/ansible_collection.md) if you wish to use this repository as an Ansible collection ### Vagrant @@ -99,7 +99,7 @@ python -V && pip -V If this returns the version of the software, you're good to go. If not, download and install Python from here -Install Ansible according to [Ansible installation guide](/docs/ansible.md#installing-ansible) +Install Ansible according to [Ansible installation guide](/docs/ansible/ansible.md#installing-ansible) then run the following step: ```ShellSession @@ -109,51 +109,51 @@ vagrant up ## Documents - [Requirements](#requirements) -- [Kubespray vs ...](docs/comparisons.md) -- [Getting started](docs/getting-started.md) -- [Setting up your first cluster](docs/setting-up-your-first-cluster.md) -- [Ansible inventory and tags](docs/ansible.md) -- [Integration with existing ansible repo](docs/integration.md) -- [Deployment data variables](docs/vars.md) -- [DNS stack](docs/dns-stack.md) -- [HA mode](docs/ha-mode.md) +- [Kubespray vs ...](docs/getting_started/comparisons.md) +- [Getting started](docs/getting_started/getting-started.md) +- [Setting up your first cluster](docs/getting_started/setting-up-your-first-cluster.md) +- [Ansible inventory and tags](docs/ansible/ansible.md) +- [Integration with existing ansible repo](docs/operations/integration.md) +- [Deployment data variables](docs/ansible/vars.md) +- [DNS stack](docs/advanced/dns-stack.md) +- [HA mode](docs/operations/ha-mode.md) - [Network plugins](#network-plugins) -- [Vagrant install](docs/vagrant.md) -- [Flatcar Container Linux bootstrap](docs/flatcar.md) -- [Fedora CoreOS bootstrap](docs/fcos.md) -- [openSUSE setup](docs/opensuse.md) -- [Downloaded artifacts](docs/downloads.md) -- [Cloud providers](docs/cloud.md) -- [OpenStack](docs/openstack.md) -- [AWS](docs/aws.md) -- [Azure](docs/azure.md) -- [vSphere](docs/vsphere.md) -- [Equinix Metal](docs/equinix-metal.md) -- [Large deployments](docs/large-deployments.md) -- [Adding/replacing a node](docs/nodes.md) -- [Upgrades basics](docs/upgrades.md) -- [Air-Gap installation](docs/offline-environment.md) -- [NTP](docs/ntp.md) -- [Hardening](docs/hardening.md) -- [Mirror](docs/mirror.md) -- [Roadmap](docs/roadmap.md) +- [Vagrant install](docs/developers/vagrant.md) +- [Flatcar Container Linux bootstrap](docs/operating_systems/flatcar.md) +- [Fedora CoreOS bootstrap](docs/operating_systems/fcos.md) +- [openSUSE setup](docs/operating_systems/opensuse.md) +- [Downloaded artifacts](docs/advanced/downloads.md) +- [Cloud providers](docs/cloud_providers/cloud.md) +- [OpenStack](docs/cloud_providers/openstack.md) +- [AWS](docs/cloud_providers/aws.md) +- [Azure](docs/cloud_providers/azure.md) +- [vSphere](docs/cloud_providers/vsphere.md) +- [Equinix Metal](docs/cloud_providers/equinix-metal.md) +- [Large deployments](docs/operations/large-deployments.md) +- [Adding/replacing a node](docs/operations/nodes.md) +- [Upgrades basics](docs/operations/upgrades.md) +- [Air-Gap installation](docs/operations/offline-environment.md) +- [NTP](docs/advanced/ntp.md) +- [Hardening](docs/operations/hardening.md) +- [Mirror](docs/operations/mirror.md) +- [Roadmap](docs/roadmap/roadmap.md) ## Supported Linux Distributions - **Flatcar Container Linux by Kinvolk** - **Debian** Bookworm, Bullseye, Buster - **Ubuntu** 20.04, 22.04 -- **CentOS/RHEL** 7, [8, 9](docs/centos.md#centos-8) +- **CentOS/RHEL** 7, [8, 9](docs/operating_systems/centos.md#centos-8) - **Fedora** 37, 38 -- **Fedora CoreOS** (see [fcos Note](docs/fcos.md)) +- **Fedora CoreOS** (see [fcos Note](docs/operating_systems/fcos.md)) - **openSUSE** Leap 15.x/Tumbleweed -- **Oracle Linux** 7, [8, 9](docs/centos.md#centos-8) -- **Alma Linux** [8, 9](docs/centos.md#centos-8) -- **Rocky Linux** [8, 9](docs/centos.md#centos-8) -- **Kylin Linux Advanced Server V10** (experimental: see [kylin linux notes](docs/kylinlinux.md)) -- **Amazon Linux 2** (experimental: see [amazon linux notes](docs/amazonlinux.md)) -- **UOS Linux** (experimental: see [uos linux notes](docs/uoslinux.md)) -- **openEuler** (experimental: see [openEuler notes](docs/openeuler.md)) +- **Oracle Linux** 7, [8, 9](docs/operating_systems/centos.md#centos-8) +- **Alma Linux** [8, 9](docs/operating_systems/centos.md#centos-8) +- **Rocky Linux** [8, 9](docs/operating_systems/centos.md#centos-8) +- **Kylin Linux Advanced Server V10** (experimental: see [kylin linux notes](docs/operating_systems/kylinlinux.md)) +- **Amazon Linux 2** (experimental: see [amazon linux notes](docs/operating_systems/amazonlinux.md)) +- **UOS Linux** (experimental: see [uos linux notes](docs/operating_systems/uoslinux.md)) +- **openEuler** (experimental: see [openEuler notes](docs/operating_systems/openeuler.md)) Note: Upstart/SysV init based OS types are not supported. @@ -164,7 +164,7 @@ Note: Upstart/SysV init based OS types are not supported. - [etcd](https://github.com/etcd-io/etcd) v3.5.12 - [docker](https://www.docker.com/) v24.0 (see [Note](#container-runtime-notes)) - [containerd](https://containerd.io/) v1.7.16 - - [cri-o](http://cri-o.io/) v1.29.1 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS) + - [cri-o](http://cri-o.io/) v1.29.1 (experimental: see [CRI-O Note](docs/CRI/cri-o.md). Only on fedora, ubuntu and centos based OS) - Network Plugin - [cni-plugins](https://github.com/containernetworking/plugins) v1.2.0 - [calico](https://github.com/projectcalico/calico) v3.27.3 @@ -204,7 +204,7 @@ Note: Upstart/SysV init based OS types are not supported. - **Minimum required version of Kubernetes is v1.27** - **Ansible v2.14+, Jinja 2.11+ and python-netaddr is installed on the machine that will run Ansible commands** -- The target servers must have **access to the Internet** in order to pull docker images. Otherwise, additional configuration is required (See [Offline Environment](docs/offline-environment.md)) +- The target servers must have **access to the Internet** in order to pull docker images. Otherwise, additional configuration is required (See [Offline Environment](docs/operations/offline-environment.md)) - The target servers are configured to allow **IPv4 forwarding**. - If using IPv6 for pods and services, the target servers are configured to allow **IPv6 forwarding**. - The **firewalls are not managed**, you'll need to implement your own rules the way you used to. @@ -225,7 +225,7 @@ These limits are safeguarded by Kubespray. Actual requirements for your workload You can choose among ten network plugins. (default: `calico`, except Vagrant uses `flannel`) -- [flannel](docs/flannel.md): gre/vxlan (layer 2) networking. +- [flannel]CNI/flannel.md): gre/vxlan (layer 2) networking. - [Calico](https://docs.tigera.io/calico/latest/about/) is a networking and network policy provider. Calico supports a flexible set of networking options designed to give you the most efficient networking across a range of situations, including non-overlay @@ -234,32 +234,32 @@ You can choose among ten network plugins. (default: `calico`, except Vagrant use - [cilium](http://docs.cilium.io/en/latest/): layer 3/4 networking (as well as layer 7 to protect and secure application protocols), supports dynamic insertion of BPF bytecode into the Linux kernel to implement security services, networking and visibility logic. -- [weave](docs/weave.md): Weave is a lightweight container overlay network that doesn't require an external K/V database cluster. +- [weave](docs/CNI/weave.md): Weave is a lightweight container overlay network that doesn't require an external K/V database cluster. (Please refer to `weave` [troubleshooting documentation](https://www.weave.works/docs/net/latest/troubleshooting/)). -- [kube-ovn](docs/kube-ovn.md): Kube-OVN integrates the OVN-based Network Virtualization with Kubernetes. It offers an advanced Container Network Fabric for Enterprises. +- [kube-ovn](docs/CNI/kube-ovn.md): Kube-OVN integrates the OVN-based Network Virtualization with Kubernetes. It offers an advanced Container Network Fabric for Enterprises. -- [kube-router](docs/kube-router.md): Kube-router is a L3 CNI for Kubernetes networking aiming to provide operational +- [kube-router](docs/CNI/kube-router.md): Kube-router is a L3 CNI for Kubernetes networking aiming to provide operational simplicity and high performance: it uses IPVS to provide Kube Services Proxy (if setup to replace kube-proxy), iptables for network policies, and BGP for ods L3 networking (with optionally BGP peering with out-of-cluster BGP peers). It can also optionally advertise routes to Kubernetes cluster Pods CIDRs, ClusterIPs, ExternalIPs and LoadBalancerIPs. -- [macvlan](docs/macvlan.md): Macvlan is a Linux network driver. Pods have their own unique Mac and Ip address, connected directly the physical (layer 2) network. +- [macvlan](docs/CNI/macvlan.md): Macvlan is a Linux network driver. Pods have their own unique Mac and Ip address, connected directly the physical (layer 2) network. -- [multus](docs/multus.md): Multus is a meta CNI plugin that provides multiple network interface support to pods. For each interface Multus delegates CNI calls to secondary CNI plugins such as Calico, macvlan, etc. +- [multus](docs/CNI/multus.md): Multus is a meta CNI plugin that provides multiple network interface support to pods. For each interface Multus delegates CNI calls to secondary CNI plugins such as Calico, macvlan, etc. - [custom_cni](roles/network-plugin/custom_cni/) : You can specify some manifests that will be applied to the clusters to bring you own CNI and use non-supported ones by Kubespray. See `tests/files/custom_cni/README.md` and `tests/files/custom_cni/values.yaml`for an example with a CNI provided by a Helm Chart. The network plugin to use is defined by the variable `kube_network_plugin`. There is also an option to leverage built-in cloud provider networking instead. -See also [Network checker](docs/netcheck.md). +See also [Network checker](docs/advanced/netcheck.md). ## Ingress Plugins - [nginx](https://kubernetes.github.io/ingress-nginx): the NGINX Ingress Controller. -- [metallb](docs/metallb.md): the MetalLB bare-metal service LoadBalancer provider. +- [metallb](docs/ingress/metallb.md): the MetalLB bare-metal service LoadBalancer provider. ## Community docs and resources @@ -280,4 +280,4 @@ See also [Network checker](docs/netcheck.md). CI/end-to-end tests sponsored by: [CNCF](https://cncf.io), [Equinix Metal](https://metal.equinix.com/), [OVHcloud](https://www.ovhcloud.com/), [ELASTX](https://elastx.se/). -See the [test matrix](docs/test_cases.md) for details. +See the [test matrix](docs/developers/test_cases.md) for details. diff --git a/contrib/azurerm/README.md b/contrib/azurerm/README.md index f24a5ec2321..8869ec09114 100644 --- a/contrib/azurerm/README.md +++ b/contrib/azurerm/README.md @@ -49,7 +49,7 @@ If you need to delete all resources from a resource group, simply call: ## Installing Ansible and the dependencies -Install Ansible according to [Ansible installation guide](/docs/ansible.md#installing-ansible) +Install Ansible according to [Ansible installation guide](/docs/ansible/ansible.md#installing-ansible) ## Generating an inventory for kubespray diff --git a/contrib/terraform/equinix/README.md b/contrib/terraform/equinix/README.md index d1eb71f3f92..f81e066a068 100644 --- a/contrib/terraform/equinix/README.md +++ b/contrib/terraform/equinix/README.md @@ -35,7 +35,7 @@ now six total etcd replicas. ## Requirements - [Install Terraform](https://www.terraform.io/intro/getting-started/install.html) -- [Install Ansible dependencies](/docs/ansible.md#installing-ansible) +- [Install Ansible dependencies](/docs/ansible/ansible.md#installing-ansible) - Account with Equinix Metal - An SSH key pair diff --git a/contrib/terraform/openstack/README.md b/contrib/terraform/openstack/README.md index 923aa314074..5e88849f570 100644 --- a/contrib/terraform/openstack/README.md +++ b/contrib/terraform/openstack/README.md @@ -619,7 +619,7 @@ Edit `inventory/$CLUSTER/group_vars/k8s_cluster/k8s_cluster.yml`: - Set variable **kube_network_plugin** to your desired networking plugin. - **flannel** works out-of-the-box - - **calico** requires [configuring OpenStack Neutron ports](/docs/openstack.md) to allow service and pod subnets + - **calico** requires [configuring OpenStack Neutron ports](/docs/cloud_providers/openstack.md) to allow service and pod subnets ```yml # Choose network plugin (calico, weave or flannel) diff --git a/docs/calico.md b/docs/CNI/calico.md similarity index 99% rename from docs/calico.md rename to docs/CNI/calico.md index fb9ab06f8ad..8708f0bcc81 100644 --- a/docs/calico.md +++ b/docs/CNI/calico.md @@ -382,7 +382,7 @@ To clean up any ipvs leftovers: Calico node, typha and kube-controllers need to be able to talk to the kubernetes API. Please reference the [Enabling eBPF Calico Docs](https://docs.projectcalico.org/maintenance/ebpf/enabling-bpf) for guidelines on how to do this. -Kubespray sets up the `kubernetes-services-endpoint` configmap based on the contents of the `loadbalancer_apiserver` inventory variable documented in [HA Mode](/docs/ha-mode.md). +Kubespray sets up the `kubernetes-services-endpoint` configmap based on the contents of the `loadbalancer_apiserver` inventory variable documented in [HA Mode](/docs/operations/ha-mode.md). If no external loadbalancer is used, Calico eBPF can also use the localhost loadbalancer option. We are able to do so only if you use the same port for the localhost apiserver loadbalancer and the kube-apiserver. In this case Calico Automatic Host Endpoints need to be enabled to allow services like `coredns` and `metrics-server` to communicate with the kubernetes host endpoint. See [this blog post](https://www.projectcalico.org/securing-kubernetes-nodes-with-calico-automatic-host-endpoints/) on enabling automatic host endpoints. diff --git a/docs/cilium.md b/docs/CNI/cilium.md similarity index 99% rename from docs/cilium.md rename to docs/CNI/cilium.md index afc808c643e..a773dbc902f 100644 --- a/docs/cilium.md +++ b/docs/CNI/cilium.md @@ -99,7 +99,7 @@ cilium_operator_extra_volume_mounts: ## Choose Cilium version ```yml -cilium_version: v1.15.4 +cilium_version: v1.12.1 ``` ## Add variable to config diff --git a/docs/cni.md b/docs/CNI/cni.md similarity index 100% rename from docs/cni.md rename to docs/CNI/cni.md diff --git a/docs/flannel.md b/docs/CNI/flannel.md similarity index 100% rename from docs/flannel.md rename to docs/CNI/flannel.md diff --git a/docs/kube-ovn.md b/docs/CNI/kube-ovn.md similarity index 100% rename from docs/kube-ovn.md rename to docs/CNI/kube-ovn.md diff --git a/docs/kube-router.md b/docs/CNI/kube-router.md similarity index 100% rename from docs/kube-router.md rename to docs/CNI/kube-router.md diff --git a/docs/macvlan.md b/docs/CNI/macvlan.md similarity index 100% rename from docs/macvlan.md rename to docs/CNI/macvlan.md diff --git a/docs/multus.md b/docs/CNI/multus.md similarity index 100% rename from docs/multus.md rename to docs/CNI/multus.md diff --git a/docs/weave.md b/docs/CNI/weave.md similarity index 100% rename from docs/weave.md rename to docs/CNI/weave.md diff --git a/docs/containerd.md b/docs/CRI/containerd.md similarity index 100% rename from docs/containerd.md rename to docs/CRI/containerd.md diff --git a/docs/cri-o.md b/docs/CRI/cri-o.md similarity index 100% rename from docs/cri-o.md rename to docs/CRI/cri-o.md diff --git a/docs/docker.md b/docs/CRI/docker.md similarity index 100% rename from docs/docker.md rename to docs/CRI/docker.md diff --git a/docs/gvisor.md b/docs/CRI/gvisor.md similarity index 100% rename from docs/gvisor.md rename to docs/CRI/gvisor.md diff --git a/docs/kata-containers.md b/docs/CRI/kata-containers.md similarity index 100% rename from docs/kata-containers.md rename to docs/CRI/kata-containers.md diff --git a/docs/aws-ebs-csi.md b/docs/CSI/aws-ebs-csi.md similarity index 100% rename from docs/aws-ebs-csi.md rename to docs/CSI/aws-ebs-csi.md diff --git a/docs/azure-csi.md b/docs/CSI/azure-csi.md similarity index 100% rename from docs/azure-csi.md rename to docs/CSI/azure-csi.md diff --git a/docs/cinder-csi.md b/docs/CSI/cinder-csi.md similarity index 100% rename from docs/cinder-csi.md rename to docs/CSI/cinder-csi.md diff --git a/docs/gcp-pd-csi.md b/docs/CSI/gcp-pd-csi.md similarity index 100% rename from docs/gcp-pd-csi.md rename to docs/CSI/gcp-pd-csi.md diff --git a/docs/vsphere-csi.md b/docs/CSI/vsphere-csi.md similarity index 100% rename from docs/vsphere-csi.md rename to docs/CSI/vsphere-csi.md diff --git a/docs/arch.md b/docs/advanced/arch.md similarity index 100% rename from docs/arch.md rename to docs/advanced/arch.md diff --git a/docs/cert_manager.md b/docs/advanced/cert_manager.md similarity index 100% rename from docs/cert_manager.md rename to docs/advanced/cert_manager.md diff --git a/docs/dns-stack.md b/docs/advanced/dns-stack.md similarity index 100% rename from docs/dns-stack.md rename to docs/advanced/dns-stack.md diff --git a/docs/downloads.md b/docs/advanced/downloads.md similarity index 100% rename from docs/downloads.md rename to docs/advanced/downloads.md diff --git a/docs/gcp-lb.md b/docs/advanced/gcp-lb.md similarity index 100% rename from docs/gcp-lb.md rename to docs/advanced/gcp-lb.md diff --git a/docs/kubernetes-reliability.md b/docs/advanced/kubernetes-reliability.md similarity index 100% rename from docs/kubernetes-reliability.md rename to docs/advanced/kubernetes-reliability.md diff --git a/docs/mitogen.md b/docs/advanced/mitogen.md similarity index 100% rename from docs/mitogen.md rename to docs/advanced/mitogen.md diff --git a/docs/netcheck.md b/docs/advanced/netcheck.md similarity index 100% rename from docs/netcheck.md rename to docs/advanced/netcheck.md diff --git a/docs/ntp.md b/docs/advanced/ntp.md similarity index 100% rename from docs/ntp.md rename to docs/advanced/ntp.md diff --git a/docs/proxy.md b/docs/advanced/proxy.md similarity index 100% rename from docs/proxy.md rename to docs/advanced/proxy.md diff --git a/docs/kubernetes-apps/registry.md b/docs/advanced/registry.md similarity index 100% rename from docs/kubernetes-apps/registry.md rename to docs/advanced/registry.md diff --git a/docs/ansible.md b/docs/ansible/ansible.md similarity index 99% rename from docs/ansible.md rename to docs/ansible/ansible.md index 3fbf57ea501..43769e0d92e 100644 --- a/docs/ansible.md +++ b/docs/ansible/ansible.md @@ -59,7 +59,7 @@ not _kube_node_. There are also two special groups: -* **calico_rr** : explained for [advanced Calico networking cases](/docs/calico.md) +* **calico_rr** : explained for [advanced Calico networking cases](/docs/CNI/calico.md) * **bastion** : configure a bastion host if your nodes are not directly reachable Below is a complete inventory example: @@ -285,7 +285,7 @@ For more information about Ansible and bastion hosts, read ## Mitogen -Mitogen support is deprecated, please see [mitogen related docs](/docs/mitogen.md) for usage and reasons for deprecation. +Mitogen support is deprecated, please see [mitogen related docs](/docs/advanced/mitogen.md) for usage and reasons for deprecation. ## Beyond ansible 2.9 diff --git a/docs/ansible_collection.md b/docs/ansible/ansible_collection.md similarity index 100% rename from docs/ansible_collection.md rename to docs/ansible/ansible_collection.md diff --git a/docs/vars.md b/docs/ansible/vars.md similarity index 99% rename from docs/vars.md rename to docs/ansible/vars.md index 0e83b18311a..c2cdaa099d9 100644 --- a/docs/vars.md +++ b/docs/ansible/vars.md @@ -46,11 +46,11 @@ Some variables of note include: * *loadbalancer_apiserver* - If defined, all hosts will connect to this address instead of localhost for kube_control_planes and kube_control_plane[0] for kube_nodes. See more details in the - [HA guide](/docs/ha-mode.md). + [HA guide](/docs/operations/ha-mode.md). * *loadbalancer_apiserver_localhost* - makes all hosts to connect to the apiserver internally load balanced endpoint. Mutual exclusive to the `loadbalancer_apiserver`. See more details in the - [HA guide](/docs/ha-mode.md). + [HA guide](/docs/operations/ha-mode.md). ## Cluster variables diff --git a/docs/aws.md b/docs/cloud_providers/aws.md similarity index 100% rename from docs/aws.md rename to docs/cloud_providers/aws.md diff --git a/docs/azure.md b/docs/cloud_providers/azure.md similarity index 100% rename from docs/azure.md rename to docs/cloud_providers/azure.md diff --git a/docs/cloud.md b/docs/cloud_providers/cloud.md similarity index 100% rename from docs/cloud.md rename to docs/cloud_providers/cloud.md diff --git a/docs/equinix-metal.md b/docs/cloud_providers/equinix-metal.md similarity index 98% rename from docs/equinix-metal.md rename to docs/cloud_providers/equinix-metal.md index ccdabaed29e..3616dc9ef4d 100644 --- a/docs/equinix-metal.md +++ b/docs/cloud_providers/equinix-metal.md @@ -54,7 +54,7 @@ cd kubespray ## Install Ansible -Install Ansible according to [Ansible installation guide](/docs/ansible.md#installing-ansible) +Install Ansible according to [Ansible installation guide](/docs/ansible/ansible.md#installing-ansible) ## Cluster Definition diff --git a/docs/openstack.md b/docs/cloud_providers/openstack.md similarity index 100% rename from docs/openstack.md rename to docs/cloud_providers/openstack.md diff --git a/docs/vsphere.md b/docs/cloud_providers/vsphere.md similarity index 99% rename from docs/vsphere.md rename to docs/cloud_providers/vsphere.md index a75a25d9a7c..72a2c1dbad0 100644 --- a/docs/vsphere.md +++ b/docs/cloud_providers/vsphere.md @@ -54,7 +54,7 @@ external_vsphere_kubernetes_cluster_id: "kubernetes-cluster-id" vsphere_csi_enabled: true ``` -For a more fine-grained CSI setup, refer to the [vsphere-csi](/docs/vsphere-csi.md) documentation. +For a more fine-grained CSI setup, refer to the [vsphere-csi](/docs/CSI/vsphere-csi.md) documentation. ### Deployment diff --git a/docs/ci-setup.md b/docs/developers/ci-setup.md similarity index 100% rename from docs/ci-setup.md rename to docs/developers/ci-setup.md diff --git a/docs/ci.md b/docs/developers/ci.md similarity index 100% rename from docs/ci.md rename to docs/developers/ci.md diff --git a/docs/test_cases.md b/docs/developers/test_cases.md similarity index 94% rename from docs/test_cases.md rename to docs/developers/test_cases.md index b26d3aa50f4..1937e7ebe29 100644 --- a/docs/test_cases.md +++ b/docs/developers/test_cases.md @@ -25,7 +25,7 @@ Note, the canal network plugin deploys flannel as well plus calico policy contro ## Test cases -The [CI Matrix](/docs/ci.md) displays OS, Network Plugin and Container Manager tested. +The [CI Matrix](/docs/developers/ci.md) displays OS, Network Plugin and Container Manager tested. All tests are breakdown into 3 "stages" ("Stage" means a build step of the build pipeline) as follows: diff --git a/docs/vagrant.md b/docs/developers/vagrant.md similarity index 99% rename from docs/vagrant.md rename to docs/developers/vagrant.md index 9e12351af1c..824b3953bde 100644 --- a/docs/vagrant.md +++ b/docs/developers/vagrant.md @@ -52,7 +52,7 @@ speed, the variable 'download_run_once' is set. This will make kubespray download all files and containers just once and then redistributes them to the other nodes and as a bonus, also cache all downloads locally and re-use them on the next provisioning run. For more information on download settings -see [download documentation](/docs/downloads.md). +see [download documentation](/docs/advanced/downloads.md). ## Example use of Vagrant diff --git a/docs/kubernetes-apps/cephfs_provisioner.md b/docs/external_storage_provisioners/cephfs_provisioner.md similarity index 100% rename from docs/kubernetes-apps/cephfs_provisioner.md rename to docs/external_storage_provisioners/cephfs_provisioner.md diff --git a/docs/kubernetes-apps/local_volume_provisioner.md b/docs/external_storage_provisioners/local_volume_provisioner.md similarity index 100% rename from docs/kubernetes-apps/local_volume_provisioner.md rename to docs/external_storage_provisioners/local_volume_provisioner.md diff --git a/docs/kubernetes-apps/rbd_provisioner.md b/docs/external_storage_provisioners/rbd_provisioner.md similarity index 100% rename from docs/kubernetes-apps/rbd_provisioner.md rename to docs/external_storage_provisioners/rbd_provisioner.md diff --git a/docs/kubernetes-apps/scheduler_plugins.md b/docs/external_storage_provisioners/scheduler_plugins.md similarity index 100% rename from docs/kubernetes-apps/scheduler_plugins.md rename to docs/external_storage_provisioners/scheduler_plugins.md diff --git a/docs/comparisons.md b/docs/getting_started/comparisons.md similarity index 100% rename from docs/comparisons.md rename to docs/getting_started/comparisons.md diff --git a/docs/getting-started.md b/docs/getting_started/getting-started.md similarity index 96% rename from docs/getting-started.md rename to docs/getting_started/getting-started.md index 32660d1d39c..1cfb26f1c39 100644 --- a/docs/getting-started.md +++ b/docs/getting_started/getting-started.md @@ -36,7 +36,7 @@ ansible-playbook -i inventory/mycluster/hosts.yml cluster.yml -b -v \ --private-key=~/.ssh/private_key ``` -See more details in the [ansible guide](/docs/ansible.md). +See more details in the [ansible guide](/docs/ansible/ansible.md). ### Adding nodes @@ -81,7 +81,7 @@ kube-apiserver via port 8080. A kubeconfig file is not necessary in this case, because kubectl will use to connect. The kubeconfig files generated will point to localhost (on kube_control_planes) and kube_node hosts will connect either to a localhost nginx proxy or to a loadbalancer if configured. -More details on this process are in the [HA guide](/docs/ha-mode.md). +More details on this process are in the [HA guide](/docs/operations/ha-mode.md). Kubespray permits connecting to the cluster remotely on any IP of any kube_control_plane host on port 6443 by default. However, this requires @@ -140,5 +140,5 @@ If desired, copy admin.conf to ~/.kube/config. ## Setting up your first cluster -[Setting up your first cluster](/docs/setting-up-your-first-cluster.md) is an +[Setting up your first cluster](/docs/getting_started/setting-up-your-first-cluster.md) is an applied step-by-step guide for setting up your first cluster with Kubespray. diff --git a/docs/setting-up-your-first-cluster.md b/docs/getting_started/setting-up-your-first-cluster.md similarity index 100% rename from docs/setting-up-your-first-cluster.md rename to docs/getting_started/setting-up-your-first-cluster.md diff --git a/docs/ingress_controller/alb_ingress_controller.md b/docs/ingress/alb_ingress_controller.md similarity index 100% rename from docs/ingress_controller/alb_ingress_controller.md rename to docs/ingress/alb_ingress_controller.md diff --git a/docs/ingress_controller/ingress_nginx.md b/docs/ingress/ingress_nginx.md similarity index 100% rename from docs/ingress_controller/ingress_nginx.md rename to docs/ingress/ingress_nginx.md diff --git a/docs/kube-vip.md b/docs/ingress/kube-vip.md similarity index 100% rename from docs/kube-vip.md rename to docs/ingress/kube-vip.md diff --git a/docs/metallb.md b/docs/ingress/metallb.md similarity index 100% rename from docs/metallb.md rename to docs/ingress/metallb.md diff --git a/docs/amazonlinux.md b/docs/operating_systems/amazonlinux.md similarity index 100% rename from docs/amazonlinux.md rename to docs/operating_systems/amazonlinux.md diff --git a/docs/bootstrap-os.md b/docs/operating_systems/bootstrap-os.md similarity index 100% rename from docs/bootstrap-os.md rename to docs/operating_systems/bootstrap-os.md diff --git a/docs/centos.md b/docs/operating_systems/centos.md similarity index 100% rename from docs/centos.md rename to docs/operating_systems/centos.md diff --git a/docs/fcos.md b/docs/operating_systems/fcos.md similarity index 100% rename from docs/fcos.md rename to docs/operating_systems/fcos.md diff --git a/docs/flatcar.md b/docs/operating_systems/flatcar.md similarity index 100% rename from docs/flatcar.md rename to docs/operating_systems/flatcar.md diff --git a/docs/kylinlinux.md b/docs/operating_systems/kylinlinux.md similarity index 100% rename from docs/kylinlinux.md rename to docs/operating_systems/kylinlinux.md diff --git a/docs/openeuler.md b/docs/operating_systems/openeuler.md similarity index 100% rename from docs/openeuler.md rename to docs/operating_systems/openeuler.md diff --git a/docs/opensuse.md b/docs/operating_systems/opensuse.md similarity index 100% rename from docs/opensuse.md rename to docs/operating_systems/opensuse.md diff --git a/docs/rhel.md b/docs/operating_systems/rhel.md similarity index 100% rename from docs/rhel.md rename to docs/operating_systems/rhel.md diff --git a/docs/uoslinux.md b/docs/operating_systems/uoslinux.md similarity index 100% rename from docs/uoslinux.md rename to docs/operating_systems/uoslinux.md diff --git a/docs/cgroups.md b/docs/operations/cgroups.md similarity index 100% rename from docs/cgroups.md rename to docs/operations/cgroups.md diff --git a/docs/encrypting-secret-data-at-rest.md b/docs/operations/encrypting-secret-data-at-rest.md similarity index 100% rename from docs/encrypting-secret-data-at-rest.md rename to docs/operations/encrypting-secret-data-at-rest.md diff --git a/docs/etcd.md b/docs/operations/etcd.md similarity index 100% rename from docs/etcd.md rename to docs/operations/etcd.md diff --git a/docs/ha-mode.md b/docs/operations/ha-mode.md similarity index 100% rename from docs/ha-mode.md rename to docs/operations/ha-mode.md diff --git a/docs/hardening.md b/docs/operations/hardening.md similarity index 100% rename from docs/hardening.md rename to docs/operations/hardening.md diff --git a/docs/integration.md b/docs/operations/integration.md similarity index 100% rename from docs/integration.md rename to docs/operations/integration.md diff --git a/docs/large-deployments.md b/docs/operations/large-deployments.md similarity index 90% rename from docs/large-deployments.md rename to docs/operations/large-deployments.md index 4666d073eb6..3182c27b8d6 100644 --- a/docs/large-deployments.md +++ b/docs/operations/large-deployments.md @@ -9,7 +9,7 @@ For a large scaled deployments, consider the following configuration changes: * Override containers' `foo_image_repo` vars to point to intranet registry. * Override the ``download_run_once: true`` and/or ``download_localhost: true``. - See [Downloading binaries and containers](/docs/downloads.md) for details. + See [Downloading binaries and containers](/docs/advanced/downloads.md) for details. * Adjust the `retry_stagger` global var as appropriate. It should provide sane load on a delegate (the first K8s control plane node) then retrying failed @@ -32,7 +32,7 @@ For a large scaled deployments, consider the following configuration changes: ``kube_controller_node_monitor_period``, ``kube_apiserver_pod_eviction_not_ready_timeout_seconds`` & ``kube_apiserver_pod_eviction_unreachable_timeout_seconds`` for better Kubernetes reliability. - Check out [Kubernetes Reliability](/docs/kubernetes-reliability.md) + Check out [Kubernetes Reliability](/docs/advanced/kubernetes-reliability.md) * Tune network prefix sizes. Those are ``kube_network_node_prefix``, ``kube_service_addresses`` and ``kube_pods_subnet``. @@ -41,7 +41,7 @@ For a large scaled deployments, consider the following configuration changes: from host/network interruption much quicker with calico_rr. * Check out the - [Inventory](/docs/getting-started.md#building-your-own-inventory) + [Inventory](/docs/getting_started/getting-started.md#building-your-own-inventory) section of the Getting started guide for tips on creating a large scale Ansible inventory. diff --git a/docs/mirror.md b/docs/operations/mirror.md similarity index 100% rename from docs/mirror.md rename to docs/operations/mirror.md diff --git a/docs/nodes.md b/docs/operations/nodes.md similarity index 100% rename from docs/nodes.md rename to docs/operations/nodes.md diff --git a/docs/offline-environment.md b/docs/operations/offline-environment.md similarity index 100% rename from docs/offline-environment.md rename to docs/operations/offline-environment.md diff --git a/docs/port-requirements.md b/docs/operations/port-requirements.md similarity index 100% rename from docs/port-requirements.md rename to docs/operations/port-requirements.md diff --git a/docs/recover-control-plane.md b/docs/operations/recover-control-plane.md similarity index 100% rename from docs/recover-control-plane.md rename to docs/operations/recover-control-plane.md diff --git a/docs/upgrades.md b/docs/operations/upgrades.md similarity index 100% rename from docs/upgrades.md rename to docs/operations/upgrades.md diff --git a/docs/roadmap.md b/docs/roadmap/roadmap.md similarity index 100% rename from docs/roadmap.md rename to docs/roadmap/roadmap.md From 5d01dfa1790b531ad51c0edac729e6de89d01c8b Mon Sep 17 00:00:00 2001 From: Payback159 Date: Thu, 16 May 2024 17:49:24 +0200 Subject: [PATCH 24/32] add auto generate documentation sidebar script, introduce script as pre-commit-hook, adapt existing scripts to work with documentation structure --- .pre-commit-config.yaml | 11 ++++++++--- scripts/gen_docs_sidebar.sh | 31 +++++++++++++++++++++++++++++++ tests/scripts/md-table/test.sh | 4 ++-- 3 files changed, 41 insertions(+), 5 deletions(-) create mode 100755 scripts/gen_docs_sidebar.sh diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c2380522a33..337b484f199 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,5 @@ --- repos: - - repo: https://github.com/pre-commit/pre-commit-hooks rev: v3.4.0 hooks: @@ -25,14 +24,14 @@ repos: rev: v0.11.0 hooks: - id: markdownlint - args: [ -r, "~MD013,~MD029" ] + args: [-r, "~MD013,~MD029"] exclude: "^.git" - repo: https://github.com/jumanjihouse/pre-commit-hooks rev: 3.0.0 hooks: - id: shellcheck - args: [ --severity, "error" ] + args: [--severity, "error"] exclude: "^.git" files: "\\.sh$" @@ -64,6 +63,12 @@ repos: language: script pass_filenames: false + - id: generate-docs-sidebar + name: generate-docs-sidebar + entry: scripts/gen_docs_sidebar.sh + language: script + pass_filenames: false + - id: ci-matrix name: ci-matrix entry: tests/scripts/md-table/test.sh diff --git a/scripts/gen_docs_sidebar.sh b/scripts/gen_docs_sidebar.sh new file mode 100755 index 00000000000..c7e0d29bf3b --- /dev/null +++ b/scripts/gen_docs_sidebar.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +# Generate documentation +# This script generates a list of all the markdown files in the docs folder +# and prints them in a markdown list format. +# The script will print the name of the folder and the files inside it. +# The script will also convert the folder and file names to a more human-readable format. +# The script will ignore any files that are not markdown files. +# Usage: bash scripts/gen_docs_sidebar.sh > docs/_sidebar.md + +echo "* [Readme](/)" + +for folder in $(find docs/*/ | sort -f); do + # Check if it is a directory + if [ -d "$folder" ]; then + subdir=$(basename "$folder") + subdir=${subdir//_/ } # Replace "_" with empty string + subdir=$(echo "$subdir" | awk '{for(i=1;i<=NF;i++)sub(/./,toupper(substr($i,1,1)),$i)}1') # Convert first letter of each word to uppercase + if [ -n "$(find "$folder" -name '*.md' -type f)" ]; then + echo "* $subdir" + fi + for file in $(find docs/"$(basename "$folder")"/*.md | sort -f); do + if [ -f "$file" ]; then + FILE=$(basename "$file" .md) + FILE=${FILE//_/ } # Replace "_" with empty string + FILE=$(echo "$FILE" | awk '{for(i=1;i<=NF;i++)sub(/./,toupper(substr($i,1,1)),$i)}1') # Convert first letter of each word to uppercase + echo " * [$FILE](/$file)" + fi + done + fi +done diff --git a/tests/scripts/md-table/test.sh b/tests/scripts/md-table/test.sh index 46daa638469..cf9df90856d 100755 --- a/tests/scripts/md-table/test.sh +++ b/tests/scripts/md-table/test.sh @@ -7,5 +7,5 @@ pip install -r ./tests/scripts/md-table/requirements.txt echo "Generate current file..." ./tests/scripts/md-table/main.py > tmp.md -echo "Compare docs/ci.md with actual tests in tests/files/*.yml ..." -cmp docs/ci.md tmp.md +echo "Compare docs/developers/ci.md with actual tests in tests/files/*.yml ..." +cmp docs/developers/ci.md tmp.md From 4123cf13ef57010b29492b9e05778e0d30f5f950 Mon Sep 17 00:00:00 2001 From: Payback159 Date: Thu, 16 May 2024 17:53:10 +0200 Subject: [PATCH 25/32] add gen_docs_sidebar.sh result, mark docs/_sidebar.md as a generated file --- .gitattributes | 1 + docs/_sidebar.md | 152 ++++++++++++++++++++++++++++------------------- 2 files changed, 91 insertions(+), 62 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..8e95b181971 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +docs/_sidebar.md linguist-generated=true diff --git a/docs/_sidebar.md b/docs/_sidebar.md index 8901e69840e..e0a5bab8766 100644 --- a/docs/_sidebar.md +++ b/docs/_sidebar.md @@ -1,66 +1,94 @@ * [Readme](/) -* [Comparisons](/docs/comparisons.md) -* [Getting started](/docs/getting-started.md) -* [Ansible](docs/ansible.md) -* [Variables](/docs/vars.md) -* Operations - * [Integration](docs/integration.md) - * [Upgrades](/docs/upgrades.md) - * [HA Mode](docs/ha-mode.md) - * [Adding/replacing a node](docs/nodes.md) - * [Large deployments](docs/large-deployments.md) - * [Air-Gap Installation](docs/offline-environment.md) +* Advanced + * [Arch](/docs/advanced/arch.md) + * [Cert Manager](/docs/advanced/cert_manager.md) + * [Dns-stack](/docs/advanced/dns-stack.md) + * [Downloads](/docs/advanced/downloads.md) + * [Gcp-lb](/docs/advanced/gcp-lb.md) + * [Kubernetes-reliability](/docs/advanced/kubernetes-reliability.md) + * [Mitogen](/docs/advanced/mitogen.md) + * [Netcheck](/docs/advanced/netcheck.md) + * [Ntp](/docs/advanced/ntp.md) + * [Proxy](/docs/advanced/proxy.md) + * [Registry](/docs/advanced/registry.md) +* Ansible + * [Ansible](/docs/ansible/ansible.md) + * [Ansible Collection](/docs/ansible/ansible_collection.md) + * [Vars](/docs/ansible/vars.md) +* Cloud Providers + * [Aws](/docs/cloud_providers/aws.md) + * [Azure](/docs/cloud_providers/azure.md) + * [Cloud](/docs/cloud_providers/cloud.md) + * [Equinix-metal](/docs/cloud_providers/equinix-metal.md) + * [Openstack](/docs/cloud_providers/openstack.md) + * [Vsphere](/docs/cloud_providers/vsphere.md) * CNI - * [Calico](docs/calico.md) - * [Flannel](docs/flannel.md) - * [Cilium](docs/cilium.md) - * [Kube Router](docs/kube-router.md) - * [Kube OVN](docs/kube-ovn.md) - * [Weave](docs/weave.md) - * [Multus](docs/multus.md) -* Ingress - * [kube-vip](docs/kube-vip.md) - * [ALB Ingress](docs/ingress_controller/alb_ingress_controller.md) - * [MetalLB](docs/metallb.md) - * [Nginx Ingress](docs/ingress_controller/ingress_nginx.md) -* [Cloud providers](docs/cloud.md) - * [AWS](docs/aws.md) - * [Azure](docs/azure.md) - * [OpenStack](/docs/openstack.md) - * [Equinix Metal](/docs/equinix-metal.md) - * [vSphere](/docs/vsphere.md) -* [Operating Systems](docs/bootstrap-os.md) - * [Flatcar Container Linux](docs/flatcar.md) - * [Fedora CoreOS](docs/fcos.md) - * [OpenSUSE](docs/opensuse.md) - * [RedHat Enterprise Linux](docs/rhel.md) - * [CentOS/OracleLinux/AlmaLinux/Rocky Linux](docs/centos.md) - * [Kylin Linux Advanced Server V10](docs/kylinlinux.md) - * [Amazon Linux 2](docs/amazonlinux.md) - * [UOS Linux](docs/uoslinux.md) - * [openEuler notes](docs/openeuler.md) + * [Calico](/docs/CNI/calico.md) + * [Cilium](/docs/CNI/cilium.md) + * [Cni](/docs/CNI/cni.md) + * [Flannel](/docs/CNI/flannel.md) + * [Kube-ovn](/docs/CNI/kube-ovn.md) + * [Kube-router](/docs/CNI/kube-router.md) + * [Macvlan](/docs/CNI/macvlan.md) + * [Multus](/docs/CNI/multus.md) + * [Weave](/docs/CNI/weave.md) * CRI - * [Containerd](docs/containerd.md) - * [Docker](docs/docker.md) - * [CRI-O](docs/cri-o.md) - * [Kata Containers](docs/kata-containers.md) - * [gVisor](docs/gvisor.md) -* Advanced - * [Proxy](/docs/proxy.md) - * [Downloads](docs/downloads.md) - * [Netcheck](docs/netcheck.md) - * [Cert Manager](docs/cert_manager.md) - * [DNS Stack](docs/dns-stack.md) - * [Kubernetes reliability](docs/kubernetes-reliability.md) - * [Local Registry](docs/kubernetes-apps/registry.md) - * [NTP](docs/ntp.md) -* External Storage Provisioners - * [RBD Provisioner](docs/kubernetes-apps/rbd_provisioner.md) - * [CEPHFS Provisioner](docs/kubernetes-apps/cephfs_provisioner.md) - * [Local Volume Provisioner](docs/kubernetes-apps/local_volume_provisioner.md) + * [Containerd](/docs/CRI/containerd.md) + * [Cri-o](/docs/CRI/cri-o.md) + * [Docker](/docs/CRI/docker.md) + * [Gvisor](/docs/CRI/gvisor.md) + * [Kata-containers](/docs/CRI/kata-containers.md) +* CSI + * [Aws-ebs-csi](/docs/CSI/aws-ebs-csi.md) + * [Azure-csi](/docs/CSI/azure-csi.md) + * [Cinder-csi](/docs/CSI/cinder-csi.md) + * [Gcp-pd-csi](/docs/CSI/gcp-pd-csi.md) + * [Vsphere-csi](/docs/CSI/vsphere-csi.md) * Developers - * [Test cases](docs/test_cases.md) - * [Vagrant](docs/vagrant.md) - * [CI Matrix](docs/ci.md) - * [CI Setup](docs/ci-setup.md) -* [Roadmap](docs/roadmap.md) + * [Ci-setup](/docs/developers/ci-setup.md) + * [Ci](/docs/developers/ci.md) + * [Test Cases](/docs/developers/test_cases.md) + * [Vagrant](/docs/developers/vagrant.md) +* External Storage Provisioners + * [Cephfs Provisioner](/docs/external_storage_provisioners/cephfs_provisioner.md) + * [Local Volume Provisioner](/docs/external_storage_provisioners/local_volume_provisioner.md) + * [Rbd Provisioner](/docs/external_storage_provisioners/rbd_provisioner.md) + * [Scheduler Plugins](/docs/external_storage_provisioners/scheduler_plugins.md) +* Getting Started + * [Comparisons](/docs/getting_started/comparisons.md) + * [Getting-started](/docs/getting_started/getting-started.md) + * [Setting-up-your-first-cluster](/docs/getting_started/setting-up-your-first-cluster.md) +* Ingress + * [Alb Ingress Controller](/docs/ingress/alb_ingress_controller.md) + * [Ingress Nginx](/docs/ingress/ingress_nginx.md) + * [Kube-vip](/docs/ingress/kube-vip.md) + * [Metallb](/docs/ingress/metallb.md) +* Operating Systems + * [Amazonlinux](/docs/operating_systems/amazonlinux.md) + * [Bootstrap-os](/docs/operating_systems/bootstrap-os.md) + * [Centos](/docs/operating_systems/centos.md) + * [Fcos](/docs/operating_systems/fcos.md) + * [Flatcar](/docs/operating_systems/flatcar.md) + * [Kylinlinux](/docs/operating_systems/kylinlinux.md) + * [Openeuler](/docs/operating_systems/openeuler.md) + * [Opensuse](/docs/operating_systems/opensuse.md) + * [Rhel](/docs/operating_systems/rhel.md) + * [Uoslinux](/docs/operating_systems/uoslinux.md) +* Operations + * [Cgroups](/docs/operations/cgroups.md) + * [Encrypting-secret-data-at-rest](/docs/operations/encrypting-secret-data-at-rest.md) + * [Etcd](/docs/operations/etcd.md) + * [Ha-mode](/docs/operations/ha-mode.md) + * [Hardening](/docs/operations/hardening.md) + * [Integration](/docs/operations/integration.md) + * [Large-deployments](/docs/operations/large-deployments.md) + * [Mirror](/docs/operations/mirror.md) + * [Nodes](/docs/operations/nodes.md) + * [Offline-environment](/docs/operations/offline-environment.md) + * [Port-requirements](/docs/operations/port-requirements.md) + * [Recover-control-plane](/docs/operations/recover-control-plane.md) + * [Upgrades](/docs/operations/upgrades.md) +* Roadmap + * [Roadmap](/docs/roadmap/roadmap.md) +* Upgrades + * [Migrate Docker2containerd](/docs/upgrades/migrate_docker2containerd.md) From f85111f6d4a4f210c41970373218f7e0627fa8f5 Mon Sep 17 00:00:00 2001 From: tico88612 <17496418+tico88612@users.noreply.github.com> Date: Sat, 18 May 2024 15:35:20 +0800 Subject: [PATCH 26/32] CI: add ubuntu 24.04 support (#11132) Signed-off-by: tico88612 <17496418+tico88612@users.noreply.github.com> --- .gitlab-ci/packet.yml | 12 +++++++++- Vagrantfile | 1 + docs/developers/ci.md | 3 +++ roles/kubernetes/node/vars/ubuntu-24.yml | 2 ++ .../roles/packet-ci/defaults/main.yml | 1 + .../packet_ubuntu24-all-in-one-docker.yml | 18 ++++++++++++++ .../packet_ubuntu24-calico-all-in-one.yml | 24 +++++++++++++++++++ ...packet_ubuntu24-calico-etcd-datastore.yml} | 4 ++-- 8 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 roles/kubernetes/node/vars/ubuntu-24.yml create mode 100644 tests/files/packet_ubuntu24-all-in-one-docker.yml create mode 100644 tests/files/packet_ubuntu24-calico-all-in-one.yml rename tests/files/{packet_ubuntu22-calico-etcd-datastore.yml => packet_ubuntu24-calico-etcd-datastore.yml} (88%) diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml index 3023f721274..0fb303d72a0 100644 --- a/.gitlab-ci/packet.yml +++ b/.gitlab-ci/packet.yml @@ -61,7 +61,17 @@ packet_ubuntu22-calico-all-in-one: extends: .packet_pr when: on_success -packet_ubuntu22-calico-etcd-datastore: +packet_ubuntu24-all-in-one-docker: + stage: deploy-part2 + extends: .packet_pr + when: on_success + +packet_ubuntu24-calico-all-in-one: + stage: deploy-part2 + extends: .packet_pr + when: on_success + +packet_ubuntu24-calico-etcd-datastore: stage: deploy-part2 extends: .packet_pr when: on_success diff --git a/Vagrantfile b/Vagrantfile index df48261f7b9..277c2572293 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -21,6 +21,7 @@ SUPPORTED_OS = { "flatcar-edge" => {box: "flatcar-edge", user: "core", box_url: FLATCAR_URL_TEMPLATE % ["edge"]}, "ubuntu2004" => {box: "generic/ubuntu2004", user: "vagrant"}, "ubuntu2204" => {box: "generic/ubuntu2204", user: "vagrant"}, + "ubuntu2404" => {box: "bento/ubuntu-24.04", user: "vagrant"}, "centos" => {box: "centos/7", user: "vagrant"}, "centos-bento" => {box: "bento/centos-7.6", user: "vagrant"}, "centos8" => {box: "centos/8", user: "vagrant"}, diff --git a/docs/developers/ci.md b/docs/developers/ci.md index 0fed5e1062e..d801f35962a 100644 --- a/docs/developers/ci.md +++ b/docs/developers/ci.md @@ -19,6 +19,7 @@ rockylinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu20 | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ## crio @@ -37,6 +38,7 @@ rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu22 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ## docker @@ -55,3 +57,4 @@ rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | diff --git a/roles/kubernetes/node/vars/ubuntu-24.yml b/roles/kubernetes/node/vars/ubuntu-24.yml new file mode 100644 index 00000000000..59bc55dda1a --- /dev/null +++ b/roles/kubernetes/node/vars/ubuntu-24.yml @@ -0,0 +1,2 @@ +--- +kube_resolv_conf: "/run/systemd/resolve/resolv.conf" diff --git a/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml b/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml index c3e801a9753..59ef0f8feab 100644 --- a/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml +++ b/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml @@ -41,4 +41,5 @@ cloud_init: amazon-linux-2: "I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IHJoZWwKdXNlcnM6CiAtIG5hbWU6IGt1YmVzcHJheQogICBncm91cHM6IHdoZWVsCiAgIHN1ZG86ICdBTEw9KEFMTCkgTk9QQVNTV0Q6QUxMJwogICBzaGVsbDogL2Jpbi9iYXNoCiAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICBob21lOiAvaG9tZS9rdWJlc3ByYXkKICAgc3NoX2F1dGhvcml6ZWRfa2V5czoKICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1Cgo=" ubuntu-2004: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" ubuntu-2204: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" + ubuntu-2404: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" oracle-7: "I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IHJoZWwKdXNlcnM6CiAtIG5hbWU6IGt1YmVzcHJheQogICBncm91cHM6IHdoZWVsCiAgIHN1ZG86ICdBTEw9KEFMTCkgTk9QQVNTV0Q6QUxMJwogICBzaGVsbDogL2Jpbi9iYXNoCiAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICBob21lOiAvaG9tZS9rdWJlc3ByYXkKICAgc3NoX2F1dGhvcml6ZWRfa2V5czoKICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1Cgo=" diff --git a/tests/files/packet_ubuntu24-all-in-one-docker.yml b/tests/files/packet_ubuntu24-all-in-one-docker.yml new file mode 100644 index 00000000000..b8318d49a15 --- /dev/null +++ b/tests/files/packet_ubuntu24-all-in-one-docker.yml @@ -0,0 +1,18 @@ +--- +# Instance settings +cloud_image: ubuntu-2404 +mode: all-in-one +vm_memory: 1600Mi + +# Kubespray settings +auto_renew_certificates: true + +# Currently ipvs not available on KVM: https://packages.ubuntu.com/search?suite=noble&arch=amd64&mode=exactfilename&searchon=contents&keywords=ip_vs_sh.ko +kube_proxy_mode: iptables +enable_nodelocaldns: False + +# Use docker +container_manager: docker +etcd_deployment_type: docker +resolvconf_mode: docker_dns +docker_repo_key_keyring: /etc/apt/trusted.gpg.d/docker.gpg diff --git a/tests/files/packet_ubuntu24-calico-all-in-one.yml b/tests/files/packet_ubuntu24-calico-all-in-one.yml new file mode 100644 index 00000000000..286034b2788 --- /dev/null +++ b/tests/files/packet_ubuntu24-calico-all-in-one.yml @@ -0,0 +1,24 @@ +--- +# Instance settings +cloud_image: ubuntu-2404 +mode: all-in-one +vm_memory: 1600Mi + +# Kubespray settings +auto_renew_certificates: true + +# Currently ipvs not available on KVM: https://packages.ubuntu.com/search?suite=noble&arch=amd64&mode=exactfilename&searchon=contents&keywords=ip_vs_sh.ko +kube_proxy_mode: iptables +enable_nodelocaldns: False + +containerd_registries_mirrors: + - prefix: docker.io + mirrors: + - host: https://mirror.gcr.io + capabilities: ["pull", "resolve"] + skip_verify: false + - prefix: 172.19.16.11:5000 + mirrors: + - host: http://172.19.16.11:5000 + capabilities: ["pull", "resolve", "push"] + skip_verify: true diff --git a/tests/files/packet_ubuntu22-calico-etcd-datastore.yml b/tests/files/packet_ubuntu24-calico-etcd-datastore.yml similarity index 88% rename from tests/files/packet_ubuntu22-calico-etcd-datastore.yml rename to tests/files/packet_ubuntu24-calico-etcd-datastore.yml index e2d3cb72ae2..ec7747de25c 100644 --- a/tests/files/packet_ubuntu22-calico-etcd-datastore.yml +++ b/tests/files/packet_ubuntu24-calico-etcd-datastore.yml @@ -1,13 +1,13 @@ --- # Instance settings -cloud_image: ubuntu-2204 +cloud_image: ubuntu-2404 mode: node-etcd-client vm_memory: 1600Mi # Kubespray settings auto_renew_certificates: true -# Currently ipvs not available on KVM: https://packages.ubuntu.com/search?suite=focal&arch=amd64&mode=exactfilename&searchon=contents&keywords=ip_vs_sh.ko +# Currently ipvs not available on KVM: https://packages.ubuntu.com/search?suite=noble&arch=amd64&mode=exactfilename&searchon=contents&keywords=ip_vs_sh.ko kube_proxy_mode: iptables enable_nodelocaldns: False From fae41172ed74d59b12dce87fad3c584b15676ea3 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Sun, 19 May 2024 11:52:22 +0200 Subject: [PATCH 27/32] gen_docs_sidebar: redirect output to sidebar.md as part of the script The script should be self-sufficient (with no need to manually specify a redirection). This makes it easier to run it as part of pre-commit and CI. --- scripts/gen_docs_sidebar.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/gen_docs_sidebar.sh b/scripts/gen_docs_sidebar.sh index c7e0d29bf3b..2b354b54ff4 100755 --- a/scripts/gen_docs_sidebar.sh +++ b/scripts/gen_docs_sidebar.sh @@ -8,6 +8,7 @@ # The script will ignore any files that are not markdown files. # Usage: bash scripts/gen_docs_sidebar.sh > docs/_sidebar.md +{ echo "* [Readme](/)" for folder in $(find docs/*/ | sort -f); do @@ -29,3 +30,4 @@ for folder in $(find docs/*/ | sort -f); do done fi done +} > docs/_sidebar.md From 76dae63c695c948ee0352aadf86841d7d84e9bef Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Sun, 19 May 2024 11:42:18 +0200 Subject: [PATCH 28/32] Check that PRs have correctly ran the sidebar gen --- .gitlab-ci/lint.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci/lint.yml b/.gitlab-ci/lint.yml index 5e4b81abb0b..2f96fec5fa2 100644 --- a/.gitlab-ci/lint.yml +++ b/.gitlab-ci/lint.yml @@ -89,6 +89,14 @@ markdownlint: script: - markdownlint $(find . -name '*.md' | grep -vF './.git') --ignore docs/_sidebar.md --ignore contrib/dind/README.md +generate-sidebar: + extends: .job + stage: unit-tests + tags: [light] + script: + - scripts/gen_docs_sidebar.sh + - git diff --exit-code + check-readme-versions: stage: unit-tests tags: [light] From 96bb0a3e1233a44fdf1b8ee4c2ad8de1346c35bd Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Sun, 19 May 2024 12:04:07 +0200 Subject: [PATCH 29/32] sidebar_gen: force C locale If we don't, find output can change depending on system locale, which will produce inconsistent results. --- scripts/gen_docs_sidebar.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/gen_docs_sidebar.sh b/scripts/gen_docs_sidebar.sh index 2b354b54ff4..35379dbea3f 100755 --- a/scripts/gen_docs_sidebar.sh +++ b/scripts/gen_docs_sidebar.sh @@ -8,6 +8,7 @@ # The script will ignore any files that are not markdown files. # Usage: bash scripts/gen_docs_sidebar.sh > docs/_sidebar.md +export LANG=C { echo "* [Readme](/)" From 53ad8d91266490387501b09eb7475467bc0c77f5 Mon Sep 17 00:00:00 2001 From: tico88612 <17496418+tico88612@users.noreply.github.com> Date: Sun, 19 May 2024 19:43:21 +0800 Subject: [PATCH 30/32] Docs: fix README.md flannel link (#11208) Signed-off-by: tico88612 <17496418+tico88612@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index faeba5bf83b..dc58781c707 100644 --- a/README.md +++ b/README.md @@ -225,7 +225,7 @@ These limits are safeguarded by Kubespray. Actual requirements for your workload You can choose among ten network plugins. (default: `calico`, except Vagrant uses `flannel`) -- [flannel]CNI/flannel.md): gre/vxlan (layer 2) networking. +- [flannel](docs/CNI/flannel.md): gre/vxlan (layer 2) networking. - [Calico](https://docs.tigera.io/calico/latest/about/) is a networking and network policy provider. Calico supports a flexible set of networking options designed to give you the most efficient networking across a range of situations, including non-overlay From e54e7c0e1dc6823f8919a013d367a20f7f10225d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 03:23:19 +0000 Subject: [PATCH 31/32] Bump ansible-lint from 24.2.3 to 24.5.0 Bumps [ansible-lint](https://github.com/ansible/ansible-lint) from 24.2.3 to 24.5.0. - [Release notes](https://github.com/ansible/ansible-lint/releases) - [Commits](https://github.com/ansible/ansible-lint/compare/v24.2.3...v24.5.0) --- updated-dependencies: - dependency-name: ansible-lint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index f1d6ff1093c..a9e1e7e3f21 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,5 +1,5 @@ -r ../requirements.txt -ansible-lint==24.2.3 +ansible-lint==24.5.0 apache-libcloud==3.8.0 ara[server]==1.7.1 dopy==0.3.7 From 4b9349a052ba181b110dd4d751c8ccc153e22207 Mon Sep 17 00:00:00 2001 From: Mohamed Omar Zaian Date: Tue, 21 May 2024 15:08:44 +0200 Subject: [PATCH 32/32] Update 'KUBESPRAY_VERSION and kube_version_min_required', cleanup old hashes for v2.25.0 (#11221) --- .gitlab-ci.yml | 2 +- README.md | 8 +- galaxy.yml | 2 +- .../defaults/main/checksums.yml | 208 ------------------ .../defaults/main/download.yml | 6 - .../kubespray-defaults/defaults/main/main.yml | 2 +- 6 files changed, 7 insertions(+), 221 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61cde2c9e41..13c314dfa7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ stages: - deploy-special variables: - KUBESPRAY_VERSION: v2.24.1 + KUBESPRAY_VERSION: v2.25.0 FAILFASTCI_NAMESPACE: 'kargo-ci' GITLAB_REPOSITORY: 'kargo-ci/kubernetes-sigs-kubespray' ANSIBLE_FORCE_COLOR: "true" diff --git a/README.md b/README.md index 17e86724c7d..d52a6e7e24d 100644 --- a/README.md +++ b/README.md @@ -75,11 +75,11 @@ You will then need to use [bind mounts](https://docs.docker.com/storage/bind-mou to access the inventory and SSH key in the container, like this: ```ShellSession -git checkout v2.24.1 -docker pull quay.io/kubespray/kubespray:v2.24.1 +git checkout v2.25.0 +docker pull quay.io/kubespray/kubespray:v2.25.0 docker run --rm -it --mount type=bind,source="$(pwd)"/inventory/sample,dst=/inventory \ --mount type=bind,source="${HOME}"/.ssh/id_rsa,dst=/root/.ssh/id_rsa \ - quay.io/kubespray/kubespray:v2.24.1 bash + quay.io/kubespray/kubespray:v2.25.0 bash # Inside the container you may now run the kubespray playbooks: ansible-playbook -i /inventory/inventory.ini --private-key /root/.ssh/id_rsa cluster.yml ``` @@ -202,7 +202,7 @@ Note: Upstart/SysV init based OS types are not supported. ## Requirements -- **Minimum required version of Kubernetes is v1.27** +- **Minimum required version of Kubernetes is v1.28** - **Ansible v2.14+, Jinja 2.11+ and python-netaddr is installed on the machine that will run Ansible commands** - The target servers must have **access to the Internet** in order to pull docker images. Otherwise, additional configuration is required (See [Offline Environment](docs/operations/offline-environment.md)) - The target servers are configured to allow **IPv4 forwarding**. diff --git a/galaxy.yml b/galaxy.yml index da5a89a44fb..d676403202f 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -2,7 +2,7 @@ namespace: kubernetes_sigs description: Deploy a production ready Kubernetes cluster name: kubespray -version: 2.25.0 +version: 2.26.0 readme: README.md authors: - The Kubespray maintainers (https://kubernetes.slack.com/channels/kubespray) diff --git a/roles/kubespray-defaults/defaults/main/checksums.yml b/roles/kubespray-defaults/defaults/main/checksums.yml index ee511ae6bd2..c1e41dfa95b 100644 --- a/roles/kubespray-defaults/defaults/main/checksums.yml +++ b/roles/kubespray-defaults/defaults/main/checksums.yml @@ -3,23 +3,15 @@ crictl_checksums: arm: v1.29.0: 0 v1.28.0: 1ea267f3872f4b7f311963ab43ce6653ceeaf8727206c889b56587c95497e9dd - v1.27.1: ec24fb7e4d45b7f3f3df254b22333839f9bdbde585187a51c93d695abefbf147 - v1.27.0: 0b6983195cc62bfc98de1f3fc2ee297a7274fb79ccabf413b8a20765f12d522a arm64: v1.29.0: 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925 v1.28.0: 06e9224e42bc5e23085751e93cccdac89f7930ba6f7a45b8f8fc70ef663c37c4 - v1.27.1: 322bf64d12f9e5cd9540987d47446bf9b0545ceb1900ef93376418083ad88241 - v1.27.0: 9317560069ded8e7bf8b9488fdb110d9e62f0fbc0e33ed09fe972768b47752bd amd64: v1.29.0: d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb v1.28.0: 8dc78774f7cbeaf787994d386eec663f0a3cf24de1ea4893598096cb39ef2508 - v1.27.1: b70e8d7bde8ec6ab77c737b6c69be8cb518ce446365734c6db95f15c74a93ce8 - v1.27.0: d335d6e16c309fbc3ff1a29a7e49bb253b5c9b4b030990bf7c6b48687f985cee ppc64le: v1.29.0: 2803a1865045077f29f798b9c569e1db7d44b5c329a546a0fd183e906925b99f v1.28.0: b70fb7bee5982aa1318ba25088319f1d0d1415567f1f76cd69011b8a14da4daf - v1.27.1: c408bb5e797bf02215acf9604c43007bd09cf69353cefa8f20f2c16ab1728a85 - v1.27.0: 3e4301c2d4b561d861970004002fe15d49af907963de06c70d326f2af1f145e0 crio_archive_checksums: arm: v1.29.2: 0 @@ -30,11 +22,6 @@ crio_archive_checksums: v1.28.2: 0 v1.28.1: 0 v1.28.0: 0 - v1.27.4: 0 - v1.27.3: 0 - v1.27.2: 0 - v1.27.1: 0 - v1.27.0: 0 arm64: v1.29.2: e2ddaeb9d46b6a39057e67f77f5840e79d2226839014d77eb6ef243b88761f7a v1.29.1: f7d7ca187b44ec490f4511e32f5a6bdf2d5ff14fb3dd1b452e330d7369e69c29 @@ -44,11 +31,6 @@ crio_archive_checksums: v1.28.2: 178bd67abae247d077168d9ff29c7abeae9b8427a6f9c33793b0ddb98ced2859 v1.28.1: 98a96c6b6bdf20c60e1a7948847c28b57d9e6e47e396b2e405811ea2c24ab9dc v1.28.0: c8ea800244d9e4ce74af85126afadea2939cd6f7ddd152d0f09fafbf294ef1cc - v1.27.4: 70ad1b52880c9eb026937f24aba278c89e044a3c9dbc78bcafb06b932bb2a7d7 - v1.27.3: 08b76309227a230a1ca06fd4f404ad8de18e6d8144b7c2c938879aadf22d3af4 - v1.27.2: d436b6621ac9b1b228c9c99a012f43090eac427a50298704e8b3923d72105eb7 - v1.27.1: ddf601e28dc22d878cdd34549402a236afaa47e0a08f39b09e65bab7034b1b97 - v1.27.0: c6615360311bff7fdfe1933e8d5030a2e9926b7196c4e7a07fcb10e51a676272 amd64: v1.29.2: 55e71ef1bceb1cd9490ec85fdbfc889d3f3a9dd2ef3b8954dcbcf33cb6609167 v1.29.1: 127ca9f57c2a3ad44dde2e64e0ec94169886245dffb74c12e68eedc80756c260 @@ -58,11 +40,6 @@ crio_archive_checksums: v1.28.2: f3b82e7330bca2a8b833502c59f21ad26b9bdef7a5d98358293cea1ae62a796b v1.28.1: 63cee2e67e283e29d790caa52531bcca7bc59473fb73bde75f4fd8daa169d4bf v1.28.0: fa87497c12815766d18f332b38a4d823fa6ad6bb3d159e383a5557e6c912eb3b - v1.27.4: d09a4a2187f63abec13220459e08922e98b7d8740fbcd81cd20bf17a1dd44016 - v1.27.3: ed4c125c2cb852afbce913b6dfe50755dc4d8cca92f9cea4f057260f19197e3b - v1.27.2: e3afc3382ea9f41f3e1a9f45ae735c1b6e7b79f48d5853c12d070354088e1244 - v1.27.1: 23c0b26f9df65671f20c042466c0e6c543e16ba769bbf63aa26abef170f393ba - v1.27.0: 8f99db9aeea00299cb3f28ee61646472014cac91930e4c7551c9153f8f720093 ppc64le: v1.29.2: 6577d1476124bcd6bcfd25419bb0d1dc01585dc6e8246a986a7769ad2af407fa v1.29.1: e26613e038d48271ad83877e5db5ad6f2116181d202495de849d378ab4a76062 @@ -72,11 +49,6 @@ crio_archive_checksums: v1.28.2: 319e413d513bcb649244333881830d2eaccfb2bb77553baf9be3fa6118a70209 v1.28.1: 7d22ba73a04e6b64088f82b37c03f1c5891e7c0847eeabeaeb83597a87b85292 v1.28.0: ffcb7cb90c0a616bf642ea02361d18007a227393f7348c4dfdcbc370d6fff98e - v1.27.4: 0 - v1.27.3: 0 - v1.27.2: 0 - v1.27.1: 0 - v1.27.0: 0 # Checksum # Kubernetes versions above Kubespray's current target version are untested and should be used with caution. kubelet_checksums: @@ -98,21 +70,6 @@ kubelet_checksums: v1.28.2: 0 v1.28.1: 0 v1.28.0: 0 - v1.27.14: 0 - v1.27.13: 0 - v1.27.12: 0 - v1.27.11: 0 - v1.27.10: 0 - v1.27.9: 0 - v1.27.8: 0 - v1.27.7: 0 - v1.27.6: 0 - v1.27.5: 0 - v1.27.4: 0 - v1.27.3: 0 - v1.27.2: 0 - v1.27.1: 0 - v1.27.0: 0 arm64: v1.29.5: 0d4328a3c67e4f0dbf270fa49343f3eab9316adde1a1bd2a857fa56876a9aff1 v1.29.4: dc4bb6ea6cd35b024d63cc20d1c1800a9c695bd6f70411c57358d7c407513b00 @@ -131,21 +88,6 @@ kubelet_checksums: v1.28.2: 32269e9ec38c561d028b65c3048ea6a100e1292cbe9e505565222455c8096577 v1.28.1: 9b7fa64b2785da4a38768377961e227f8da629c56a5df43ca1b665dd07b56f3c v1.28.0: 05dd12e35783cab4960e885ec0e7d0e461989b94297e7bea9018ccbd15c4dce9 - v1.27.14: 31c97a723021ccc90a47a15ad1de1ffdf58ba109aea922eb359ad2fcb8e8ce4b - v1.27.13: d7bfb14d0b0fc2c41074baf02617cf98589fd029fb3539ea017825e36371f19c - v1.27.12: 0d7d2d25c8b909d6cec7c1c2a5bfe51428ec33eaa5e8b209c718b77983e9dcba - v1.27.11: e81987a864fb47afe14f65fa4e93760bc19c424335e0f0540c6c725b727ce22a - v1.27.10: 0edadc44ef36be8d8106cad9972360c0477540e2d8c0bbeb38fd97fd1d7801d5 - v1.27.9: 8a14bc3739f5ca3b23d08301c2e769ee58c8d1cecb7243b46b1c098ae77effd7 - v1.27.8: 71849182ceb018dc084f499ad28b7b1afb7f23e35ccaf8421941dd5dafef0d4c - v1.27.7: ed5bfa48ee64d5e6cf23ed9fc03ea0593021839429fdc1ea7cc2ebf3f11b6491 - v1.27.6: be579ef4e8fa3e1de9d40a77e4d35d99e535a293f66bf3038cbea9cf803d11e5 - v1.27.5: 4e78fafdeb5d61ab6ebcd6e75e968c47001c321bec169bb9bd9f001132de5321 - v1.27.4: c75ad8e7c7ef05c0c021b21a9fe86e92f64db1e4c1bc84e1baf45d8dbb8ba8d1 - v1.27.3: 2838fd55340d59f777d7bd7e5989fc72b7a0ca198cf4f3f723cd9956859ce942 - v1.27.2: 810cd9a611e9f084e57c9ee466e33c324b2228d4249ff38c2588a0cc3224f10d - v1.27.1: dbb09d297d924575654db38ed2fc627e35913c2d4000c34613ac6de4995457d0 - v1.27.0: 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157 amd64: v1.29.5: 261dc3f3c384d138835fe91a02071c642af94abb0cca56ebc04719240440944c v1.29.4: 58571f0ed62543a9bbac541e52c15d8385083113a463e23aec1341d0b5043939 @@ -164,21 +106,6 @@ kubelet_checksums: v1.28.2: 17edb866636f14eceaad58c56eab12af7ab3be3c78400aff9680635d927f1185 v1.28.1: 2bc22332f44f8fcd3fce57879fd873f977949ebd261571fbae31fbb2713a5dd3 v1.28.0: bfb6b977100963f2879a33e5fbaa59a5276ba829a957a6819c936e9c1465f981 - v1.27.14: f28defa43f80f82ce909940c1b57b71cba1fcf0de6fc4723e798ef5c72376c28 - v1.27.13: ed68df2a77f3057ab47f57eacb6e9310e91731e4f43c58a3c3b5c857d78d0080 - v1.27.12: aae861a21913c274228ccdad1609b370e5198c9f4b39b8924b20a7ffe7f148e0 - v1.27.11: 2ce92a5d8985b93bd8ffc4f5519cd79bf2f844590aa38228a3d809c5bf5986e0 - v1.27.10: 25a34bf98bb8a296ea07f1ebbcb496b1e6b6c6da3247695288a7c99fc8c1be2c - v1.27.9: ede60eea3acbac3f35dbb23d7b148f45cf169ebbb20af102d3ce141fc0bac60c - v1.27.8: 2e0557b38c5b9a1263eed25a0b84d741453ed9c0c7bd916f80eadaf7edfb7784 - v1.27.7: 236bc8bc22c52e914d3364c23e273628c63e193365b6a43b8cb013716c1cd2f5 - v1.27.6: daa42f9b6f5e2176bbce0d24d89a05613000630bcddec1fafd2a8d42a523ce9d - v1.27.5: 66df07ab4f9d72028c97ec7e5eea23adc0ab62a209ba2285431456d7d75a5bb3 - v1.27.4: 385f65878dc8b48df0f2bd369535ff273390518b5ac2cc1a1684d65619324704 - v1.27.3: c0e18da6a55830cf4910ecd7261597c66ea3f8f58cf44d4adb6bdcb6e2e6f0bf - v1.27.2: a0d12afcab3b2836de4a427558d067bebdff040e9b306b0512c93d9d2a066579 - v1.27.1: cb2845fff0ce41c400489393da73925d28fbee54cfeb7834cd4d11e622cbd3a7 - v1.27.0: 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29 ppc64le: v1.29.5: b0caa52184a3e89a7f529c776ebabd7d34aecad560614f787fe08cff777a43cb v1.29.4: 1ecc89b6f17df357835e3e56f553ec27f2aea69a5865dfb39cff77e6e70e6adb @@ -197,21 +124,6 @@ kubelet_checksums: v1.28.2: 79f568ac700d29f88d669c6b6a09adb3b726bdd13c10aa0839cbc70b414372e5 v1.28.1: 547fc76f0c1d78352fad841ebeacd387fe48750b2648565dfd49197621622fbb v1.28.0: 22de59965f2d220afa24bf04f4c6d6b65a4bb1cd80756c13381973b1ac3b4578 - v1.27.14: dadfffb524b3c7e825c2742fb7723846eef4dfdf47c90e3bec90c0ca325b4b30 - v1.27.13: c3e589e5ec1aabc1e9a0b2700a13ae9541dc8a678fbedad68b0fc82dee4fd866 - v1.27.12: 9d6da53ca98e58b947ef0073feff96f03000c32efcee8af93716728b501d7290 - v1.27.11: ce4dc48a61399038eff680b952386ed9be471c5af1e43dc461e0fb5339de9356 - v1.27.10: c5014bed224347245fadec3d763846ec33ccd7a580d0c4ee19a45a948392f20c - v1.27.9: f270051c9b0f36da10a5d27011783be042edd396e8c729709c2396f29b72b6d2 - v1.27.8: 2354fdb19b5018cabe43fde1979965686afd3c95b75531e678a0064c4a30b4e9 - v1.27.7: 9154a7b5d5793fb8a05cba0d309ddfd975409d0e0686be19cf2feca172f06162 - v1.27.6: 1001da3586a3f868c371aefde991af94ca780ec1599c8a969390ba105aaf9dcb - v1.27.5: 3c643564bf07753c1388096aef9125811800fd28aa6a5faf3bfb1cef0e1637eb - v1.27.4: 16c69a941f2b67fef35d84062626622d205f9e2375a8daf3410fb1a42fc6e9e7 - v1.27.3: a8ea8f9e857d1140b569fff88d8d750dccaea0aa33d624befbb67f725b5340a0 - v1.27.2: 3af92edd687f7932e7fce877944dfe5efa437bf5f171fc8331725c631a1a86ef - v1.27.1: 7a800b9539beaba0b5d6357070a40fb3c4d216c2ad6693b15f9b1307b1c99e1f - v1.27.0: 17c061a9f7919697ac71c151c19337f65b86f59f59441687ac92e977d851c75b kubectl_checksums: arm: v1.29.5: f3c83a9674098c5a4f27defed001934719f487897dd61db1992057e5ed103b3e @@ -231,21 +143,6 @@ kubectl_checksums: v1.28.2: 6576aa70413ff00c593a07b549b8b9d9e5ef73c42bb39ab4af475e0fdb540613 v1.28.1: eaa05dab1bffb8593d8e5caa612530ee5c914ee2be73429b7ce36c3becad893f v1.28.0: 372c4e7bbe98c7067c4b7820c4a440c931ad77f7cb83d3237b439ca3c14d3d37 - v1.27.14: 75caa5e6845887a273a3bebc0f67994b8aaeaab65f5ecd4c2a7d1f9f5c14e3ee - v1.27.13: 8008a94f57e1aaa88097f4ac9ceae33d86e78bf0bf306a8c1942ab9adf7c5ea0 - v1.27.12: eed221f15d1a00ca723afe690ca35ee5c74faa64fa7af432479686f4f26d3510 - v1.27.11: 11586f333abaf2776e0d2f9e02c71ae5eeff3ad8e629815aa8bb7d7e9a406301 - v1.27.10: 4d81649935ec127f9aa21954697f82e0796f61e8e6406fd058b3a8b80e858c8e - v1.27.9: 89b76aa415018377f2c5fc33fc4d45f4997cc63677336f1768ee8a11593515ce - v1.27.8: 2f2936f950beb3f08ee0e45fbf80d020163829b95aa11c99ec726ee1a922329c - v1.27.7: 2a387ade64cd4cf90f002ae8c0e6f60250d26d1ee2cce6051f559430a44352ea - v1.27.6: 3a34a38908a9d0f85dc531cc1c49061ceeaa2ab742382d891d9fc7bf8dc53b8c - v1.27.5: c5e8a02102a93c84413ce8a029f194049429d27ad559061de267d84020a4594b - v1.27.4: 4269133eca9abd29c0a31e15ede2837713635893f1763eccba4b27e66a45abfb - v1.27.3: 1d51a48a0497e47f4f4036687cd337c53d297ea5322e8395432879570379d82e - v1.27.2: 7792f5630543c0af84f444521ee6113da5ae00f2b50872d57324aa725a5341c5 - v1.27.1: fe704e355bf2c5f69964cd12772687535a11a5e9ec0baf4f27e0a8fb156bc615 - v1.27.0: 288470e3eb89a2f55273d753ce6674dfb00e732f2971428acb964810aa726188 arm64: v1.29.5: 9ee9168def12ac6a6c0c6430e0f73175e756ed262db6040f8aa2121ad2c1f62e v1.29.4: 61537408eedcad064d7334384aed508a8aa1ea786311b87b505456a2e0535d36 @@ -264,21 +161,6 @@ kubectl_checksums: v1.28.2: ea6d89b677a8d9df331a82139bb90d9968131530b94eab26cee561531eff4c53 v1.28.1: 46954a604b784a8b0dc16754cfc3fa26aabca9fd4ffd109cd028bfba99d492f6 v1.28.0: f5484bd9cac66b183c653abed30226b561f537d15346c605cc81d98095f1717c - v1.27.14: 29f3a1f520d929df38873c68dec73519c1e5e521140e01cf9d7701f7b5ffe4f3 - v1.27.13: bfc6cb71041ebc0f048402988eccc107cfff2b866c864231c9ada05ab328e5bf - v1.27.12: bfc6cb71041ebc0f048402988eccc107cfff2b866c864231c9ada05ab328e5bf - v1.27.11: d30e1aa873e78eb376ddee3c785aa78c44eddc56ce2ef901dac1ce0c2c4f50b0 - v1.27.10: 2e1996379d5a8b132e0606fcd3df3c8689e11882630b75cca3b7135126847871 - v1.27.9: bda475539fdeda9d8a85a84b967af361af264d0826c121b23b0b62ee9b00cd2d - v1.27.8: 97ed6739e2803e63fd2d9de78be22d5ba6205bb63179a16ec773063526525a8e - v1.27.7: 61fc334f2c0290270e43fb8a1d4ff07e8cec5642d5a123eb7ab66a134b04ae83 - v1.27.6: 7322a6f600de6d0d06cf333bdc24cd2a340bba12920b0c2385c97884c808c810 - v1.27.5: 0158955c59c775165937918f910380ed7b52fca4a26fb41a369734e83aa44874 - v1.27.4: 5178cbb51dcfff286c20bc847d64dd35cd5993b81a2e3609581377a520a6425d - v1.27.3: 7bb7fec4e28e0b50b603d64e47629e812408751bd1e0ce059b2fee83b0e3ff6f - v1.27.2: 1b0966692e398efe71fe59f913eaec44ffd4468cc1acd00bf91c29fa8ff8f578 - v1.27.1: fd3cb8f16e6ed8aee9955b76e3027ac423b6d1cc7356867310d128082e2db916 - v1.27.0: f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc amd64: v1.29.5: 603c8681fc0d8609c851f9cc58bcf55eeb97e2934896e858d0232aa8d1138366 v1.29.4: 10e343861c3cb0010161e703307ba907add2aeeeaffc6444779ad915f9889c88 @@ -297,21 +179,6 @@ kubectl_checksums: v1.28.2: c922440b043e5de1afa3c1382f8c663a25f055978cbc6e8423493ec157579ec5 v1.28.1: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 v1.28.0: 4717660fd1466ec72d59000bb1d9f5cdc91fac31d491043ca62b34398e0799ce - v1.27.14: 1d2431c68bb6dfa9de3cd40fd66d97a9ac73593c489f9467249eea43e9c16a1e - v1.27.13: e991f163197cbd85bbff22f656a74d48b69db5addfa43cc04cca0cf5328f57f1 - v1.27.12: d639eda39be2dce42fbec21e038942ab5734541715e3ea5fb29c9ad76686bd7f - v1.27.11: 7ae327978a1edb43700070c86f5fd77215792c6b58a7ea70192647e0da848e29 - v1.27.10: bfb219643c28d9842fceae51590776f06987835d93fc3cb9b0149c9111c741ac - v1.27.9: d0caae91072297b2915dd65f6ef3055d27646dce821ec67d18da35ba9a8dc85b - v1.27.8: 027b3161e99fa0a7fa529e8f17f73ee2c0807c81c721ca7cf307f6b41c17bc57 - v1.27.7: e5fe510ba6f421958358d3d43b3f0b04c2957d4bc3bb24cf541719af61a06d79 - v1.27.6: 2b7adb71c8630904da1b94e262c8c3c477e9609b3c0ed8ae1213a1e156ae38dd - v1.27.5: 9a091fb65e4cf4e8be3ce9a21c79210177dd7ce31a2998ec638c92f37f058bcd - v1.27.4: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f - v1.27.3: fba6c062e754a120bc8105cde1344de200452fe014a8759e06e4eec7ed258a09 - v1.27.2: 4f38ee903f35b300d3b005a9c6bfb9a46a57f92e89ae602ef9c129b91dc6c5a5 - v1.27.1: 7fe3a762d926fb068bae32c399880e946e8caf3d903078bea9b169dcd5c17f6d - v1.27.0: 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87 ppc64le: v1.29.5: 1d2635f6bd0218c53037c113171479e15e51b60823f7f1b93afb48ae1d9e5b09 v1.29.4: 10a1a7e4423483a386ab1ab9237cda1e9d24423c2cf23b7fa514f533aa23ce87 @@ -330,21 +197,6 @@ kubectl_checksums: v1.28.2: 87cca30846fec99a4fbea122b21e938717b309631bd2220de52049fce30d2e81 v1.28.1: 81b45c27abbdf2be6c5203dfccfd76ded1ac273f9f7672e6dcdf3440aa191324 v1.28.0: 7a9dcb4c75b33b9dac497c1a756b1f12c7c63f86fc0f321452360fbe1a79ce0f - v1.27.14: 04e07e0f74f9890ce4e391476ca9404e30a09f541726c6ad9ab43e93fe672cf8 - v1.27.13: 39341fa0aa075af4bf0dc0bc0ce4ee628b0301a8ecd18a6277abf4e4cb6c4e5d - v1.27.12: d08c112cba1a2244fa04f6ead792aad37170f828ec2301301256df25fc6ebe59 - v1.27.11: af736cbdb7ae42e696fa3543e483726c1728c95039b9520797511965caca56b6 - v1.27.10: 445928336932248cb104d99919e659696afa60f8dd8513821f92775e893d0dcb - v1.27.9: 2464d947370b8902e1245b0a75a4ecf55fe2aeee5bc87f2add7da00b73535a59 - v1.27.8: e25a09dea99192ff43ee13af61bfadd7c79eb538dc8e85376b6c590b4d471204 - v1.27.7: a60da56f856bc5b224f0be71b03443d5a0fb69424f31cd86f069cc79c13b2870 - v1.27.6: f3ed7752a20dbae271eeff9e9d109381e3ed6772853b5c84dc8a7476bbad847c - v1.27.5: 7ab5fe6eb51bd267b3156ef6e18f9e264e6c7c26ec0dafc2f55edcf3164bac99 - v1.27.4: dee25e38897b16ed9009ddcfd96b6635ab3097a051573c6c444209dc27e8ada5 - v1.27.3: b2da3d262e61ffc3e70511977a933b344b18efa5c238bfa388438bc321bc5e11 - v1.27.2: efee037a276f72c77cc230194d7dadf943a5778be46b7985edeb414d27894266 - v1.27.1: 440bcfd9611319f3d9e5d4fa4cdee2421cdf80c01fad223934d9a9b640673d75 - v1.27.0: daa9f1d4fe3f217de2546bca4ac14601f34b34a25c1f571f1e44eb313aee1385 kubeadm_checksums: arm: v1.29.5: 0 @@ -364,21 +216,6 @@ kubeadm_checksums: v1.28.2: 0 v1.28.1: 0 v1.28.0: 0 - v1.27.14: 0 - v1.27.13: 0 - v1.27.12: 0 - v1.27.11: 0 - v1.27.10: 0 - v1.27.9: 0 - v1.27.8: 0 - v1.27.7: 0 - v1.27.6: 0 - v1.27.5: 0 - v1.27.4: 0 - v1.27.3: 0 - v1.27.2: 0 - v1.27.1: 0 - v1.27.0: 0 arm64: v1.29.5: d4db8c514f2764edc039462c218dbcd316577f76f21b209b76e9a4b1f08e3100 v1.29.4: 438287a91e08cbefecab79be8ac893a935c3dbf6e87bea895fb99f2bc38cf06e @@ -397,21 +234,6 @@ kubeadm_checksums: v1.28.2: 010789a94cf512d918ec4a3ef8ec734dea0061d89a8293059ef9101ca1bf6bff v1.28.1: 7d2f68917470a5d66bd2a7d62897f59cb4afaeffb2f26c028afa119acd8c3fc8 v1.28.0: b9b473d2d9136559b19eb465006af77df45c09862cd7ce6673a33aae517ff5ab - v1.27.14: cb840eb83404047cdafec0b15054023c90a47491b56d2dceba1050040f37cc7e - v1.27.13: f334ba0612fada50e98a7ea56b686b35c22f0e3243ec2210f2a6a87e841a139f - v1.27.12: e74d47c14b5a251cff961dcce92cd632abcfd0fba4a07e78f0a5a5b2796e4b84 - v1.27.11: b8452d6c3f1331beb3d5fa42466a9bc96638a76c40980dba9822300f230c0858 - v1.27.10: ed0447155a7e967ae23480b06b31b2c0aaa871e7c59dfd82ae25b03a1eccf6e6 - v1.27.9: d3d022842b0b8e4661222e8873249f5acafdbef52fd1bfb98152a582352b3c40 - v1.27.8: 0d0f5b2781d663d314e785d14361aa5a09cfaf6e1694aa3cc731f4f06342ec13 - v1.27.7: 46d7c43532233906919a53ee0e03ab04ab9e08514392d17a86f058e0364cda4b - v1.27.6: faec35315203913b835e9b789d89001a05e072943c960bcf4de1e331d08e10c8 - v1.27.5: 3023ef1d2eff885af860e13c8b9fcdb857d259728f16bf992d59c2be522cec82 - v1.27.4: b4ede8a18ef3d1cfa61e6fbca8fcab02f8eee3d0770d2329490fa7be90a4cae4 - v1.27.3: 495e2193ed779d25584b4b532796c2270df0f7139ef15fb89dc7980603615ef4 - v1.27.2: 8f01f363f7c7f92de2f2276124a895503cdc5a60ff549440170880f296b087eb - v1.27.1: 024a59cd6fc76784b597c0c1cf300526e856e8c9fefa5fa7948158929b739551 - v1.27.0: acd805c6783b678ee0068b9dd8165bbfd879c345fd9c25d6a978dbc965f48544 amd64: v1.29.5: e424dcdbe661314b6ca1fcc94726eb554bc3f4392b060b9626f9df8d7d44d42c v1.29.4: ea20ab064f716ab7f69a36d72df340257b31c9721ea86e1cf9d70b35999ddeea @@ -430,21 +252,6 @@ kubeadm_checksums: v1.28.2: 6a4808230661c69431143db2e200ea2d021c7f1b1085e6353583075471310d00 v1.28.1: 6134dbc92dcb83c3bae1a8030f7bb391419b5d13ea94badd3a79b7ece75b2736 v1.28.0: 12ea68bfef0377ccedc1a7c98a05ea76907decbcf1e1ec858a60a7b9b73211bb - v1.27.14: 1ce264643e521494e111b1c9ee59694a54d1f2464bbac3a7a531324ffeae0182 - v1.27.13: b88c30b7067f095b7fa02c5560cc50d6e69a5a9fecc606ef477dc7efc86453b9 - v1.27.12: 06ee36cc80cfdfc01c937d750783d3ca6169a3da76382c7af3dd172d9f6bfa4e - v1.27.11: 31bf446a712fb08190838c35d1f4c93b0f975708c59634a5dc3d8915a241c83e - v1.27.10: 23985e958443ac1aabdbeeedc675358abc0638eb580707829fd42b0996a0aae5 - v1.27.9: 78dddac376fa2f04116022cb44ed39ccb9cb0104e05c5b21b220d5151e5c0f86 - v1.27.8: f8864769b8b2d7a14f53eb983f23317ff14d68ab76aba71e9de17ce84c38d4eb - v1.27.7: bc589219a003b3b94c114e4bcf20549a02657a0c6e5c73f588b37817148892d2 - v1.27.6: 2bcdd68957ec25d0689bb56f32b4ec86e38463d2691d5ea21cd109c7afa3aa7c - v1.27.5: 35df8efa6e1bc864ed3c48a665caed634a5c46cfd7f41cda5ad66defdfddb2aa - v1.27.4: 7be21d6fb3707fbbe8f0db0403db6234c8af773b941f931bf8248759ee988bcd - v1.27.3: 2cd663f25c2490bd614a6c0ad9089a47ef315caf0dbdf78efd787d5653b1c6e3 - v1.27.2: 95c4bfb7929900506a42de4d92280f06efe6b47e0a32cbc1f5a1ed737592977a - v1.27.1: c7d32d698e99b90f877025104cb4a9f3f8c707e99e6817940f260135b6d1ad0a - v1.27.0: 78d0e04705a7bdb76a514d60f60c073b16334b15f57ee87f064354ca8a233e80 ppc64le: v1.29.5: 05c92f52d75268f0aaff5056e0d6b3e03002b2d17432360750100ada9b2c381b v1.29.4: ec47a2dbe1969b9513b0313b5b07b72a870e5da54864d9c8391ec5e857404659 @@ -463,21 +270,6 @@ kubeadm_checksums: v1.28.2: fdc28482a4316c84d61b0997c29c4d4c7b11459af9c654fdee3b4a3031f0fcb7 v1.28.1: 73e06f2b614ed5665951f7c059e225a7b0b31319c64a3f57e146fbe7a77fe54e v1.28.0: 146fe9194486e46accd5054fa93939f9608fdbeefefc4bc68e4c40fb4a84ccc9 - v1.27.14: 9eb15d0db3ade2b1fa3035ed1cb2cfb6f00cc090451d4457bcf08edbcca3616e - v1.27.13: 2b5812317f2afaabb14c84a32b8b0dc43c447afa994d0a4c02a8ea4e6bea05db - v1.27.12: 6be7ae703299b3c2788ca5e689973d659038a6edc8dde68d7fc966fa539cba0f - v1.27.11: b7da90f29cae799d96e47aadb1f20b567fbded09d3d5ddcb88d3378098c6a1f3 - v1.27.10: c928ad330bae724b1ef9775e07285408727513a024e3d86e3d72e05768859db8 - v1.27.9: 92da9084fa9f8b8b55436b61ec3c697ef951b0b0416a3b3a7f0dd0e5e4d8cd88 - v1.27.8: d65b972cd661cb28972f0df731f9e5b65d959920275bad5ef44ff94d3bb8331d - v1.27.7: 6a95a8fb5560a6698d895b2a809485ace0cf5b8c6fb89c843ab20cf89d8b11ad - v1.27.6: f2b53fdcd0a71390e84d16facbcd7a581f1309cb8bd0501f9508ebefe5a3498c - v1.27.5: 3df86ca5de57a6c6b4043be3c050ed9ed39a50720364b399e12e9e52e87e377b - v1.27.4: 1635ba4269daf422be112ae8c3954332e69c2b1e50ecd285343f1f2d65955de8 - v1.27.3: 3f174f096a5aaa62fe0298e9a16b3af9031cb1d2a29fc3823f80f9a2144d5fd4 - v1.27.2: 412bccd310f4976201d359f0637745944944c0fb2ace315e5e07b180445530c7 - v1.27.1: d4c46dcc3d210b6eae0b8c34b3ece9f24b1bb2697175615c451db717a99430fb - v1.27.0: cf2860aef800496fee0d9fd8722bd7d17c6609e32d87ca380127151f2ce02bb0 etcd_binary_checksums: arm: v3.5.12: 0 diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index d75e090b2d2..df72f8e8ba4 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -135,32 +135,27 @@ kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0 pod_infra_supported_versions: v1.29: "3.9" v1.28: "3.9" - v1.27: "3.9" pod_infra_version: "{{ pod_infra_supported_versions[kube_major_version] }}" etcd_supported_versions: v1.29: "v3.5.12" v1.28: "v3.5.12" - v1.27: "v3.5.12" etcd_version: "{{ etcd_supported_versions[kube_major_version] }}" crictl_supported_versions: v1.29: "v1.29.0" v1.28: "v1.28.0" - v1.27: "v1.27.1" crictl_version: "{{ crictl_supported_versions[kube_major_version] }}" crio_supported_versions: v1.29: v1.29.1 v1.28: v1.28.4 - v1.27: v1.27.4 crio_version: "{{ crio_supported_versions[kube_major_version] }}" # Scheduler plugins doesn't build for K8s 1.29 yet scheduler_plugins_supported_versions: v1.29: 0 v1.28: v0.28.9 - v1.27: v0.27.8 scheduler_plugins_version: "{{ scheduler_plugins_supported_versions[kube_major_version] }}" yq_version: "v4.42.1" @@ -364,7 +359,6 @@ csi_livenessprobe_image_tag: "v2.5.0" snapshot_controller_supported_versions: v1.29: "v7.0.2" v1.28: "v7.0.2" - v1.27: "v7.0.2" snapshot_controller_image_repo: "{{ kube_image_repo }}/sig-storage/snapshot-controller" snapshot_controller_image_tag: "{{ snapshot_controller_supported_versions[kube_major_version] }}" diff --git a/roles/kubespray-defaults/defaults/main/main.yml b/roles/kubespray-defaults/defaults/main/main.yml index 5a784778382..0b23bd91db1 100644 --- a/roles/kubespray-defaults/defaults/main/main.yml +++ b/roles/kubespray-defaults/defaults/main/main.yml @@ -21,7 +21,7 @@ kubelet_swap_behavior: LimitedSwap kube_version: v1.29.5 ## The minimum version working -kube_version_min_required: v1.27.0 +kube_version_min_required: v1.28.0 ## Kube Proxy mode One of ['iptables', 'ipvs'] kube_proxy_mode: ipvs