36abd4557c
Taken from the previous version and modified the files for 1.26.1. The following patches were applied cleanly and are included in this commit: enable-support-for-kubernetes-to-ignore-isolcpus.patch kubeadm-create-platform-pods-with-zero-CPU-resources.patch kubelet-CFS-quota-throttling-for-non-integer-cpulimit.patch kubelet-cpumanager-disable-CFS-quota-throttling.patch kubelet-cpumanager-keep-normal-containers-off-reserv.patch kubelet-sort-isolcpus-allocation-when-SMT-enabled.patch Revert-use-subpath-for-coredns-only-for-default-repo.patch The following patches did not apply cleanly. These were ported to kubernetes 1.26.1 and included in this commit: kubelet-cpumanager-infra-pods-use-system-reserved-CP.patch kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch kubernetes-make-isolcpus-allocation-SMT-aware.patch Note: k8s 1.26.1 is not included in ISO yet Test Plan: PASS: Kubernetes package 1.26.1 builds properly. PASS: Run all Kubelet, kubeadm, kubectl make tests for affected code. Story: 2010368 Task: 47395 Signed-off-by: Sachin Gopala Krishna <saching.krishna@windriver.com> Change-Id: I9c8ef9bb036aba503fde0f35ebac08a573375cd3
121 lines
3.9 KiB
Diff
121 lines
3.9 KiB
Diff
From c20052041d1786a78f796996aceca09de76613b7 Mon Sep 17 00:00:00 2001
|
|
From: Ramesh Kumar Sivanandam <rameshkumar.sivanandam@windriver.com>
|
|
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 <james.gauld@windriver.com>
|
|
Signed-off-by: Gleb Aronsky <gleb.aronsky@windriver.com>
|
|
Signed-off-by: Ramesh Kumar Sivanandam <rameshkumar.sivanandam@windriver.com>
|
|
---
|
|
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
|
|
|