c532ee83a5
- update patch files to reflect upstream registry changes from k8s.gcr.io to registry.k8s.io * kubeadm-opensuse-registry.patch * revert-coredns-image-renaming.patch - Update to version 1.23.17: * Release commit for Kubernetes v1.23.17 * releng: Update images, dependencies and version to Go 1.19.6 * Update golang.org/x/net to v0.7.0 * Pin golang.org/x/net to v0.4.0 * add scale test for probes * use custom dialer for http probes * use custom dialer for tcp probes * add custom dialer optimized for probes * egress_selector: prevent goroutines leak on connect() step. * tls.Dial() validates hostname, no need to do that manually * Fix issue that Audit Server could not correctly encode DeleteOption * Do not include scheduler name in the preemption event message * Do not leak cross namespace pod metadata in preemption events * pkg/controller/job: re-honor exponential backoff * releng: Update images, dependencies and version to Go 1.19.5 * Bump Konnectivity to v0.0.35 * Improve vendor verification works for each staging repo * Update to go1.19 * Adjust for os/exec changes in 1.19 * Update golangci-lint to 1.46.2 and fix errors * Match go1.17 defaults for SHA-1 and GC * update golangci-lint to 1.45.0 * kubelet: make the image pull time more accurate in event * change k8s.gcr.io/pause to registry.k8s.io/pause * use etcd 3.5.6-0 after promotion OBS-URL: https://build.opensuse.org/request/show/1070425 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.23?expand=0&rev=15
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
From d30667d8b6e96a4e50c0eb6b4cf6d4a615041f74 Mon Sep 17 00:00:00 2001
|
|
From: Richard Brown <rbrown@suse.com>
|
|
Date: Thu, 16 Dec 2021 10:07:03 +0100
|
|
Subject: [PATCH] Patch openSUSE revert coredns image renaming
|
|
|
|
---
|
|
cmd/kubeadm/app/images/images.go | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
Index: kubernetes-1.23.17/cmd/kubeadm/app/images/images.go
|
|
===================================================================
|
|
--- kubernetes-1.23.17.orig/cmd/kubeadm/app/images/images.go
|
|
+++ kubernetes-1.23.17/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.Cluster
|
|
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
|
|
|