b36c9a2fec
- 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.22.17: * Release commit for Kubernetes v1.22.17 * backport change all k8s.gcr.io to registry.k8s.io on release-1.22 * Fix endpoint reconciler failing to delete masterlease * use etcd 3.5.6-0 after promotion * changelog: CVE-2022-3294 and CVE-2022-3162 were fixed in v1.23.14 * hack/scripts: use registry.k8s.io * kubeadm: mutate ClusterConfiguration.imageRepository to "registry.k8s.io" * kubeadm: use registry.k8s.io instead of k8s.gcr.io * kubeadm: allow RSA and ECDSA format keys in preflight check * Limit redirect proxy handling to redirected responses * Reduce default gzip compression level from 4 to 1 in apiserver * client-go: make retry in Request thread safe * exec auth: support TLS config caching * client-go exec: make sure round tripper can be unwrapped * Automated cherry pick of #111009: Windows: ensure runAsNonRoot does case-insensitive comparison (#112213) * Fix problem in updating VolumeAttached in node status * Add etcd initialization in openapi tests * Tolerate sub-microsecond eventTime changes on update * fix a memory leak problem when calling DryRunPreemption * Fix kubelet panic when accessing metrics/resource endpoint * Fixing logic for kubelet permissions check on windows * kubeadm: fix the bug that configurable KubernetesVersion not respected during kubeadm join * Bump cAdvisor to v0.39.4 * Fix: filter out unsatisfied nodes when calling AddPod in PodTopologySpread * kubeadm: fix the bug that configurable KubernetesVersion not respected during kubeadm join OBS-URL: https://build.opensuse.org/request/show/1068348 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.22?expand=0&rev=16
27 lines
1.5 KiB
Diff
27 lines
1.5 KiB
Diff
Index: kubernetes-1.22.17/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go
|
|
===================================================================
|
|
--- kubernetes-1.22.17.orig/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go
|
|
+++ kubernetes-1.22.17/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go
|
|
@@ -41,7 +41,7 @@ const (
|
|
DefaultCertificatesDir = "/etc/kubernetes/pki"
|
|
// DefaultImageRepository defines default image registry
|
|
// (previously this defaulted to k8s.gcr.io)
|
|
- DefaultImageRepository = "registry.k8s.io"
|
|
+ DefaultImageRepository = "registry.opensuse.org/kubic"
|
|
// DefaultManifestsDir defines default manifests directory
|
|
DefaultManifestsDir = "/etc/kubernetes/manifests"
|
|
// DefaultClusterName defines the default cluster name
|
|
Index: kubernetes-1.22.17/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go
|
|
===================================================================
|
|
--- kubernetes-1.22.17.orig/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go
|
|
+++ kubernetes-1.22.17/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go
|
|
@@ -43,7 +43,7 @@ const (
|
|
DefaultCertificatesDir = "/etc/kubernetes/pki"
|
|
// DefaultImageRepository defines default image registry
|
|
// (previously this defaulted to k8s.gcr.io)
|
|
- DefaultImageRepository = "registry.k8s.io"
|
|
+ DefaultImageRepository = "registry.opensuse.org/kubic"
|
|
// DefaultManifestsDir defines default manifests directory
|
|
DefaultManifestsDir = "/etc/kubernetes/manifests"
|
|
// DefaultClusterName defines the default cluster name
|