From 97bba44fe68c26fe338078136ead3a7410fc7677 Mon Sep 17 00:00:00 2001 From: wenwenxiong Date: Tue, 21 Oct 2025 09:49:23 +0800 Subject: [PATCH] fix kubekey ip_vs modules covered in kube_proxy-ipvs.conf (#2809) Co-authored-by: xiongww Signed-off-by: redscholar --- builtin/capkk/roles/init/init-os/templates/init-os.sh | 4 ++-- builtin/core/roles/native/init/templates/init-os.sh | 4 ++-- pkg/modules/image.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/capkk/roles/init/init-os/templates/init-os.sh b/builtin/capkk/roles/init/init-os/templates/init-os.sh index 52b79b72..f560e83b 100644 --- a/builtin/capkk/roles/init/init-os/templates/init-os.sh +++ b/builtin/capkk/roles/init/init-os/templates/init-os.sh @@ -198,10 +198,10 @@ EOF modprobe nf_conntrack_ipv4 1>/dev/null 2>/dev/null if [ $? -eq 0 ]; then - echo 'nf_conntrack_ipv4' > /etc/modules-load.d/kube_proxy-ipvs.conf + echo 'nf_conntrack_ipv4' >> /etc/modules-load.d/kube_proxy-ipvs.conf else modprobe nf_conntrack - echo 'nf_conntrack' > /etc/modules-load.d/kube_proxy-ipvs.conf + echo 'nf_conntrack' >> /etc/modules-load.d/kube_proxy-ipvs.conf fi sysctl -p diff --git a/builtin/core/roles/native/init/templates/init-os.sh b/builtin/core/roles/native/init/templates/init-os.sh index bda1f31d..0515a60b 100644 --- a/builtin/core/roles/native/init/templates/init-os.sh +++ b/builtin/core/roles/native/init/templates/init-os.sh @@ -194,10 +194,10 @@ EOF modprobe nf_conntrack_ipv4 1>/dev/null 2>/dev/null if [ $? -eq 0 ]; then - echo 'nf_conntrack_ipv4' > /etc/modules-load.d/kube_proxy-ipvs.conf + echo 'nf_conntrack_ipv4' >> /etc/modules-load.d/kube_proxy-ipvs.conf else modprobe nf_conntrack - echo 'nf_conntrack' > /etc/modules-load.d/kube_proxy-ipvs.conf + echo 'nf_conntrack' >> /etc/modules-load.d/kube_proxy-ipvs.conf fi sysctl -p diff --git a/pkg/modules/image.go b/pkg/modules/image.go index 57e6db23..4173349b 100644 --- a/pkg/modules/image.go +++ b/pkg/modules/image.go @@ -474,7 +474,7 @@ func newLocalRepository(reference, localDir string) (*remote.Repository, error) var responseNotFound = &http.Response{Proto: "Local", StatusCode: http.StatusNotFound} var responseNotAllowed = &http.Response{Proto: "Local", StatusCode: http.StatusMethodNotAllowed} var responseServerError = &http.Response{Proto: "Local", StatusCode: http.StatusInternalServerError} -var responseCreated = &http.Response{Proto: "Local", StatusCode: http.StatusAccepted} +var responseCreated = &http.Response{Proto: "Local", StatusCode: http.StatusCreated} var responseOK = &http.Response{Proto: "Local", StatusCode: http.StatusOK} // const domain = "internal"