diff --git a/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch b/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch deleted file mode 100644 index 58ac8e1f9..000000000 --- a/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch +++ /dev/null @@ -1,119 +0,0 @@ -From d0120ac7653ab767a76c32e57803155c779667f8 Mon Sep 17 00:00:00 2001 -From: Ramesh Kumar Sivanandam -Date: Tue, 25 Oct 2022 19:44:44 -0400 -Subject: [PATCH] Revert "use subpath for coredns only for default repository" - -This reverts commit 38a41e1557649a7cc763bf737779db9aa03ec75e. - -Co-authored-by: Jim Gauld -Signed-off-by: Gleb Aronsky -Signed-off-by: Ramesh Kumar Sivanandam ---- - cmd/kubeadm/app/constants/constants.go | 2 +- - cmd/kubeadm/app/images/images.go | 5 --- - cmd/kubeadm/app/images/images_test.go | 49 -------------------------- - 3 files changed, 1 insertion(+), 55 deletions(-) - -diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go -index 049231d82c4..c57266048a9 100644 ---- a/cmd/kubeadm/app/constants/constants.go -+++ b/cmd/kubeadm/app/constants/constants.go -@@ -346,7 +346,7 @@ const ( - CoreDNSDeploymentName = "coredns" - - // CoreDNSImageName specifies the name of the image for CoreDNS add-on -- CoreDNSImageName = "coredns" -+ CoreDNSImageName = "coredns/coredns" - - // CoreDNSVersion is the version of CoreDNS to be deployed if it is used - CoreDNSVersion = "v1.9.3" -diff --git a/cmd/kubeadm/app/images/images.go b/cmd/kubeadm/app/images/images.go -index 4c2982d9f6d..bdb61caa373 100644 ---- a/cmd/kubeadm/app/images/images.go -+++ b/cmd/kubeadm/app/images/images.go -@@ -22,7 +22,6 @@ import ( - "k8s.io/klog/v2" - - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" -- kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - ) -@@ -48,10 +47,6 @@ func GetDNSImage(cfg *kubeadmapi.ClusterConfiguration) string { - if cfg.DNS.ImageRepository != "" { - dnsImageRepository = cfg.DNS.ImageRepository - } -- // Handle the renaming of the official image from "registry.k8s.io/coredns" to "registry.k8s.io/coredns/coredns -- if dnsImageRepository == kubeadmapiv1beta2.DefaultImageRepository { -- dnsImageRepository = fmt.Sprintf("%s/coredns", dnsImageRepository) -- } - // DNS uses an imageTag that corresponds to the DNS version matching the Kubernetes version - dnsImageTag := constants.CoreDNSVersion - -diff --git a/cmd/kubeadm/app/images/images_test.go b/cmd/kubeadm/app/images/images_test.go -index 60927ef9493..e24d4feca23 100644 ---- a/cmd/kubeadm/app/images/images_test.go -+++ b/cmd/kubeadm/app/images/images_test.go -@@ -22,7 +22,6 @@ import ( - "testing" - - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" -- kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - ) - -@@ -227,51 +226,3 @@ func TestGetAllImages(t *testing.T) { - } - } - --func TestGetDNSImage(t *testing.T) { -- var tests = []struct { -- expected string -- cfg *kubeadmapi.ClusterConfiguration -- }{ -- { -- expected: "foo.io/coredns:v1.9.3", -- cfg: &kubeadmapi.ClusterConfiguration{ -- ImageRepository: "foo.io", -- DNS: kubeadmapi.DNS{ -- Type: kubeadmapi.CoreDNS, -- }, -- }, -- }, -- { -- expected: kubeadmapiv1beta2.DefaultImageRepository + "/coredns/coredns:v1.9.3", -- cfg: &kubeadmapi.ClusterConfiguration{ -- ImageRepository: kubeadmapiv1beta2.DefaultImageRepository, -- DNS: kubeadmapi.DNS{ -- Type: kubeadmapi.CoreDNS, -- }, -- }, -- }, -- { -- expected: "foo.io/coredns/coredns:v1.9.3", -- cfg: &kubeadmapi.ClusterConfiguration{ -- ImageRepository: "foo.io", -- DNS: kubeadmapi.DNS{ -- Type: kubeadmapi.CoreDNS, -- ImageMeta: kubeadmapi.ImageMeta{ -- ImageRepository: "foo.io/coredns", -- }, -- }, -- }, -- }, -- } -- -- for _, test := range tests { -- actual := GetDNSImage(test.cfg) -- if actual != test.expected { -- t.Errorf( -- "failed to GetDNSImage:\n\texpected: %s\n\t actual: %s", -- test.expected, -- actual, -- ) -- } -- } --} --- -2.25.1 - diff --git a/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/series b/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/series index 601343ac8..3b3d9fd63 100644 --- a/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/series +++ b/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/series @@ -1,5 +1,4 @@ kubeadm-create-platform-pods-with-zero-CPU-resources.patch -Revert-use-subpath-for-coredns-only-for-default-repo.patch kubernetes-make-isolcpus-allocation-SMT-aware.patch kubelet-sort-isolcpus-allocation-when-SMT-enabled.patch kubelet-cpumanager-disable-CFS-quota-throttling.patch diff --git a/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch b/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch deleted file mode 100644 index e0dfcb8fd..000000000 --- a/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch +++ /dev/null @@ -1,120 +0,0 @@ -From c20052041d1786a78f796996aceca09de76613b7 Mon Sep 17 00:00:00 2001 -From: Ramesh Kumar Sivanandam -Date: Tue, 25 Oct 2022 19:44:44 -0400 -Subject: [PATCH 02/10] Revert "use subpath for coredns only for default - repository" - -This reverts commit 38a41e1557649a7cc763bf737779db9aa03ec75e. - -Co-authored-by: Jim Gauld -Signed-off-by: Gleb Aronsky -Signed-off-by: Ramesh Kumar Sivanandam ---- - cmd/kubeadm/app/constants/constants.go | 2 +- - cmd/kubeadm/app/images/images.go | 5 --- - cmd/kubeadm/app/images/images_test.go | 49 -------------------------- - 3 files changed, 1 insertion(+), 55 deletions(-) - -diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go -index 544b5e96828..31ae3502d00 100644 ---- a/cmd/kubeadm/app/constants/constants.go -+++ b/cmd/kubeadm/app/constants/constants.go -@@ -342,7 +342,7 @@ const ( - CoreDNSDeploymentName = "coredns" - - // CoreDNSImageName specifies the name of the image for CoreDNS add-on -- CoreDNSImageName = "coredns" -+ CoreDNSImageName = "coredns/coredns" - - // CoreDNSVersion is the version of CoreDNS to be deployed if it is used - CoreDNSVersion = "v1.9.3" -diff --git a/cmd/kubeadm/app/images/images.go b/cmd/kubeadm/app/images/images.go -index 81c787b77a3..5099b260530 100644 ---- a/cmd/kubeadm/app/images/images.go -+++ b/cmd/kubeadm/app/images/images.go -@@ -22,7 +22,6 @@ import ( - "k8s.io/klog/v2" - - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" -- kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - ) -@@ -48,10 +47,6 @@ func GetDNSImage(cfg *kubeadmapi.ClusterConfiguration) string { - if cfg.DNS.ImageRepository != "" { - dnsImageRepository = cfg.DNS.ImageRepository - } -- // Handle the renaming of the official image from "registry.k8s.io/coredns" to "registry.k8s.io/coredns/coredns -- if dnsImageRepository == kubeadmapiv1beta2.DefaultImageRepository { -- dnsImageRepository = fmt.Sprintf("%s/coredns", dnsImageRepository) -- } - // DNS uses an imageTag that corresponds to the DNS version matching the Kubernetes version - dnsImageTag := constants.CoreDNSVersion - -diff --git a/cmd/kubeadm/app/images/images_test.go b/cmd/kubeadm/app/images/images_test.go -index 60927ef9493..e24d4feca23 100644 ---- a/cmd/kubeadm/app/images/images_test.go -+++ b/cmd/kubeadm/app/images/images_test.go -@@ -22,7 +22,6 @@ import ( - "testing" - - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" -- kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - ) - -@@ -227,51 +226,3 @@ func TestGetAllImages(t *testing.T) { - } - } - --func TestGetDNSImage(t *testing.T) { -- var tests = []struct { -- expected string -- cfg *kubeadmapi.ClusterConfiguration -- }{ -- { -- expected: "foo.io/coredns:v1.9.3", -- cfg: &kubeadmapi.ClusterConfiguration{ -- ImageRepository: "foo.io", -- DNS: kubeadmapi.DNS{ -- Type: kubeadmapi.CoreDNS, -- }, -- }, -- }, -- { -- expected: kubeadmapiv1beta2.DefaultImageRepository + "/coredns/coredns:v1.9.3", -- cfg: &kubeadmapi.ClusterConfiguration{ -- ImageRepository: kubeadmapiv1beta2.DefaultImageRepository, -- DNS: kubeadmapi.DNS{ -- Type: kubeadmapi.CoreDNS, -- }, -- }, -- }, -- { -- expected: "foo.io/coredns/coredns:v1.9.3", -- cfg: &kubeadmapi.ClusterConfiguration{ -- ImageRepository: "foo.io", -- DNS: kubeadmapi.DNS{ -- Type: kubeadmapi.CoreDNS, -- ImageMeta: kubeadmapi.ImageMeta{ -- ImageRepository: "foo.io/coredns", -- }, -- }, -- }, -- }, -- } -- -- for _, test := range tests { -- actual := GetDNSImage(test.cfg) -- if actual != test.expected { -- t.Errorf( -- "failed to GetDNSImage:\n\texpected: %s\n\t actual: %s", -- test.expected, -- actual, -- ) -- } -- } --} --- -2.25.1 - diff --git a/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/series b/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/series index e3a685ade..a0cf7c144 100644 --- a/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/series +++ b/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/series @@ -1,5 +1,4 @@ kubeadm-create-platform-pods-with-zero-CPU-resources.patch -Revert-use-subpath-for-coredns-only-for-default-repo.patch kubernetes-make-isolcpus-allocation-SMT-aware.patch kubelet-sort-isolcpus-allocation-when-SMT-enabled.patch kubelet-cpumanager-disable-CFS-quota-throttling.patch diff --git a/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch b/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch deleted file mode 100644 index 0769ee05a..000000000 --- a/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 745ca38039944f70ccb98cf9e75e3f439377399e Mon Sep 17 00:00:00 2001 -From: Boovan Rajendran -Date: Wed, 30 Aug 2023 04:20:24 -0400 -Subject: [PATCH] Revert "use subpath for coredns only for default repository" - -This reverts commit 38a41e1557649a7cc763bf737779db9aa03ec75e. - -Co-authored-by: Jim Gauld -Signed-off-by: Gleb Aronsky -Signed-off-by: Ramesh Kumar Sivanandam -Signed-off-by: Boovan Rajendran ---- - cmd/kubeadm/app/constants/constants.go | 2 +- - cmd/kubeadm/app/images/images.go | 5 --- - cmd/kubeadm/app/images/images_test.go | 55 -------------------------- - 3 files changed, 1 insertion(+), 61 deletions(-) - -diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go -index 1146b67dd59..e89ae1d62df 100644 ---- a/cmd/kubeadm/app/constants/constants.go -+++ b/cmd/kubeadm/app/constants/constants.go -@@ -344,7 +344,7 @@ const ( - CoreDNSDeploymentName = "coredns" - - // CoreDNSImageName specifies the name of the image for CoreDNS add-on -- CoreDNSImageName = "coredns" -+ CoreDNSImageName = "coredns/coredns" - - // CoreDNSVersion is the version of CoreDNS to be deployed if it is used - CoreDNSVersion = "v1.10.1" -diff --git a/cmd/kubeadm/app/images/images.go b/cmd/kubeadm/app/images/images.go -index a9a9528b669..5099b260530 100644 ---- a/cmd/kubeadm/app/images/images.go -+++ b/cmd/kubeadm/app/images/images.go -@@ -22,7 +22,6 @@ import ( - "k8s.io/klog/v2" - - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" -- kubeadmapiv1beta3 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - ) -@@ -48,10 +47,6 @@ func GetDNSImage(cfg *kubeadmapi.ClusterConfiguration) string { - if cfg.DNS.ImageRepository != "" { - dnsImageRepository = cfg.DNS.ImageRepository - } -- // Handle the renaming of the official image from "registry.k8s.io/coredns" to "registry.k8s.io/coredns/coredns -- if dnsImageRepository == kubeadmapiv1beta3.DefaultImageRepository { -- dnsImageRepository = fmt.Sprintf("%s/coredns", dnsImageRepository) -- } - // DNS uses an imageTag that corresponds to the DNS version matching the Kubernetes version - dnsImageTag := constants.CoreDNSVersion - -diff --git a/cmd/kubeadm/app/images/images_test.go b/cmd/kubeadm/app/images/images_test.go -index 1aa08e30fa8..f19880cdc2e 100644 ---- a/cmd/kubeadm/app/images/images_test.go -+++ b/cmd/kubeadm/app/images/images_test.go -@@ -22,7 +22,6 @@ import ( - "testing" - - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" -- kubeadmapiv1beta3 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - ) - -@@ -235,57 +234,3 @@ func TestGetAllImages(t *testing.T) { - } - } - --func TestGetDNSImage(t *testing.T) { -- var tests = []struct { -- expected string -- cfg *kubeadmapi.ClusterConfiguration -- }{ -- { -- expected: "foo.io/coredns:v1.10.1", -- cfg: &kubeadmapi.ClusterConfiguration{ -- ImageRepository: "foo.io", -- DNS: kubeadmapi.DNS{}, -- }, -- }, -- { -- expected: kubeadmapiv1beta3.DefaultImageRepository + "/coredns/coredns:v1.10.1", -- cfg: &kubeadmapi.ClusterConfiguration{ -- ImageRepository: kubeadmapiv1beta3.DefaultImageRepository, -- DNS: kubeadmapi.DNS{}, -- }, -- }, -- { -- expected: "foo.io/coredns/coredns:v1.10.1", -- cfg: &kubeadmapi.ClusterConfiguration{ -- ImageRepository: "foo.io", -- DNS: kubeadmapi.DNS{ -- ImageMeta: kubeadmapi.ImageMeta{ -- ImageRepository: "foo.io/coredns", -- }, -- }, -- }, -- }, -- { -- expected: "foo.io/coredns/coredns:v1.11.0", -- cfg: &kubeadmapi.ClusterConfiguration{ -- ImageRepository: "foo.io/coredns", -- DNS: kubeadmapi.DNS{ -- ImageMeta: kubeadmapi.ImageMeta{ -- ImageTag: "v1.11.0", -- }, -- }, -- }, -- }, -- } -- -- for _, test := range tests { -- actual := GetDNSImage(test.cfg) -- if actual != test.expected { -- t.Errorf( -- "failed to GetDNSImage:\n\texpected: %s\n\t actual: %s", -- test.expected, -- actual, -- ) -- } -- } --} --- -2.25.1 - diff --git a/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/series b/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/series index e3a685ade..a0cf7c144 100644 --- a/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/series +++ b/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/series @@ -1,5 +1,4 @@ kubeadm-create-platform-pods-with-zero-CPU-resources.patch -Revert-use-subpath-for-coredns-only-for-default-repo.patch kubernetes-make-isolcpus-allocation-SMT-aware.patch kubelet-sort-isolcpus-allocation-when-SMT-enabled.patch kubelet-cpumanager-disable-CFS-quota-throttling.patch