2021-08-09 20:47:26 +00:00
|
|
|
From acb6a9c23756c0c6350ab29937b55de289f052ab Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Richard Brown <rbrownccb@opensuse.org>
|
|
|
|
|
Date: Tue, 20 Jul 2021 13:00:31 +0200
|
|
|
|
|
Subject: [PATCH] Patch openSUSE revert coredns image renaming
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
cmd/kubeadm/app/images/images.go | 5 -----
|
|
|
|
|
1 file changed, 5 deletions(-)
|
|
|
|
|
|
2023-03-01 12:06:35 +00:00
|
|
|
Index: kubernetes-1.22.17/cmd/kubeadm/app/images/images.go
|
|
|
|
|
===================================================================
|
|
|
|
|
--- kubernetes-1.22.17.orig/cmd/kubeadm/app/images/images.go
|
|
|
|
|
+++ kubernetes-1.22.17/cmd/kubeadm/app/images/images.go
|
2021-08-09 20:47:26 +00:00
|
|
|
@@ -20,7 +20,6 @@ import (
|
|
|
|
|
"fmt"
|
|
|
|
|
|
|
|
|
|
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"
|
|
|
|
|
|
2023-03-01 12:06:35 +00:00
|
|
|
@@ -48,10 +47,6 @@ func GetDNSImage(cfg *kubeadmapi.Cluster
|
2021-08-09 20:47:26 +00:00
|
|
|
if cfg.DNS.ImageRepository != "" {
|
|
|
|
|
dnsImageRepository = cfg.DNS.ImageRepository
|
|
|
|
|
}
|
2023-03-01 12:06:35 +00:00
|
|
|
- // Handle the renaming of the official image from "registry.k8s.io/coredns" to "registry.k8s.io/coredns/coredns
|
2021-08-09 20:47:26 +00:00
|
|
|
- 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
|
|
|
|
|
|
