Revert "apiserver: fix incorrect path to admission plugins config files (#11779 )" (#11812 )

This reverts commit 742409e663. Co-authored-by: Max Gautier <mg@max.gautier.name>
apiserver: fix incorrect path to admission plugins config files (#11801 )
2026-02-01 09:38:12 -03:30 · 2024-12-18 17:40:11 +01:00 · 2024-12-16 10:16:52 +01:00 · 2024-12-11 16:32:03 +00:00 · 2024-11-18 09:34:53 +00:00 · 2024-11-17 18:04:52 +00:00
7 changed files with 14 additions and 8 deletions
--- 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.1
+docker pull quay.io/kubespray/kubespray:v2.25.1
 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.1 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
 ```
--- 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.1
+version: 2.25.2
 readme: README.md
 authors:
  - The Kubespray maintainers (https://kubernetes.slack.com/channels/kubespray)
--- a/roles/bootstrap-os/tasks/clear-linux-os.yml
+++ b/roles/bootstrap-os/tasks/clear-linux-os.yml
--- a/roles/bootstrap-os/tasks/redhat.yml
+++ b/roles/bootstrap-os/tasks/redhat.yml
--- a/roles/container-engine/containerd/templates/containerd.service.j2
+++ b/roles/container-engine/containerd/templates/containerd.service.j2
@@ -15,7 +15,7 @@
 [Unit]
 Description=containerd container runtime
 Documentation=https://containerd.io
-After=network.target local-fs.target
+After=network.target local-fs.target dbus.service

 [Service]
 ExecStartPre=-/sbin/modprobe overlay
--- a/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
@@ -73,7 +73,9 @@ data:
          max_concurrent 1000
 {% if dns_upstream_forward_extra_opts is defined %}
 {% for optname, optvalue in dns_upstream_forward_extra_opts.items() %}
-          {{ optname }} {{ optvalue }}
+          {{ (optname ~ ' ' ~ optvalue) | trim }}
+          {# do not add a trailing space when optvalue == ''
+             workaround for: https://github.com/kubernetes/kubernetes/issues/36222 #}
 {% endfor %}
 {% endif %}
        }
--- a/roles/kubernetes-apps/ansible/templates/nodelocaldns-config.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/nodelocaldns-config.yml.j2
@@ -82,7 +82,9 @@ data:
        bind {{ nodelocaldns_ip }}
        forward . {{ upstreamForwardTarget }}{% if dns_upstream_forward_extra_opts is defined %} {
 {% for optname, optvalue in dns_upstream_forward_extra_opts.items() %}
-          {{ optname }} {{ optvalue }}
+          {{ (optname ~ ' ' ~ optvalue) | trim }}
+          {# do not add a trailing space when optvalue == ''
+             workaround for: https://github.com/kubernetes/kubernetes/issues/36222 #}
 {% endfor %}
        }{% endif %}

@@ -164,7 +166,9 @@ data:
        bind {{ nodelocaldns_ip }}
        forward . {{ upstreamForwardTarget }}{% if dns_upstream_forward_extra_opts is defined %} {
 {% for optname, optvalue in dns_upstream_forward_extra_opts.items() %}
-          {{ optname }} {{ optvalue }}
+          {{ (optname ~ ' ' ~ optvalue) | trim }}
+          {# do not add a trailing space when optvalue == ''
+             workaround for: https://github.com/kubernetes/kubernetes/issues/36222 #}
 {% endfor %}
        }{% endif %}
Author	SHA1	Message	Date
k8s-infra-cherrypick-robot	781f02fdda	Revert "apiserver: fix incorrect path to admission plugins config files (#11779 )" (#11812 ) This reverts commit `742409e663`. Co-authored-by: Max Gautier <mg@max.gautier.name>	2024-12-18 17:40:11 +01:00
k8s-infra-cherrypick-robot	792407f934	apiserver: fix incorrect path to admission plugins config files (#11801 ) Co-authored-by: Max Gautier <mg@max.gautier.name>	2024-12-16 10:16:52 +01:00
k8s-infra-cherrypick-robot	6c5bff6362	containerd: add After=dbus.service (#11783 ) This is needed for shutdown ordering: while at startup, it's not a problem that containerd start before dbus (the dbus socket already exists) it needs to shutdown before dbus to do its cleanup (asking systemd via dbus to cleanup cgroups). Co-authored-by: Max Gautier <mg@max.gautier.name>	2024-12-11 16:32:03 +00:00
k8s-infra-cherrypick-robot	586ba66b7a	Fix the pretty-printing of (core\|nodelocal)dns (#11721 ) When using dns_upstream_forward_extra_opts: prefer_udp: "" # the option as no value so use empty string to just # put the key This is rendered in the dns configmap as ($ for end-of-line) ... prefer_udp $ ... Note the trailing space. This triggers https://github.com/kubernetes/kubernetes/issues/36222, which makes the configmap hardly readable when editing them manually or simply putting them in a yaml file for inspection. Trim the concatenation of option + value to get rid of any trailing space. Co-authored-by: Max Gautier <mg@max.gautier.name>	2024-11-18 09:34:53 +00:00
k8s-infra-cherrypick-robot	9fce511822	fix task naming in bootstrap-os (#11718 ) Signed-off-by: bo.jiang <bo.jiang@daocloud.io> Co-authored-by: bo.jiang <bo.jiang@daocloud.io>	2024-11-17 18:04:52 +00:00
Robert Volkmann	d258df042f	[2.25] Update KUBESPRAY_VERSION in galaxy.yml to v2.25.2 and Update Readme.md to v2.25.1 (#11629 )	2024-11-05 06:03:30 +00:00