From 0bb17901f9cf6105350055c99124b96e6e958f0569be9fa5ffef8959248ab413 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Fri, 10 Mar 2023 15:52:49 +0000 Subject: [PATCH] Accepting request 1070426 from home:psaggu:branches:devel:kubic - 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.24.11: * Release commit for Kubernetes v1.24.11 * 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 in 1.24 * kubelet/client: collapse transport wiring onto standard approach * apiserver: remove 34s from DELETECOLLECTION rest handler * update prev succeeded indexes for indexed jobs unconditionally * use custom dialer for http probes * use custom dialer for tcp probes * add custom dialer optimized for probes * bump honnef.co/go/tools to support go1.20 * 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 * Explicitly call rand.Seed() method * Improve vendor verification works for each staging repo * Bump Konnectivity to v0.0.35 * Add pod to dsw if termination is not completed during reconstruction #issues/113979 * integration: migrate taint tests * integration: migrate scoring tests * integration: migrate preemption tests * integration: migrate plugings tests * integration: migrate extender tests OBS-URL: https://build.opensuse.org/request/show/1070426 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.24?expand=0&rev=5 --- _service | 2 +- _servicedata | 2 +- kubeadm-opensuse-registry.patch | 28 +++---- kubernetes-1.24.11.tar.xz | 3 + kubernetes-1.24.3.tar.xz | 3 - kubernetes.obsinfo | 6 +- kubernetes1.24.changes | 126 ++++++++++++++++++++++++++++ kubernetes1.24.spec | 5 +- revert-coredns-image-renaming.patch | 15 ++-- 9 files changed, 157 insertions(+), 33 deletions(-) create mode 100644 kubernetes-1.24.11.tar.xz delete mode 100644 kubernetes-1.24.3.tar.xz diff --git a/_service b/_service index 9aeebd3..14248b9 100644 --- a/_service +++ b/_service @@ -5,7 +5,7 @@ .git @PARENT_TAG@ v(.*) - v1.24.3 + v1.24.11 enable diff --git a/_servicedata b/_servicedata index de23abf..5b4501c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/kubernetes/kubernetes.git - 5e4bfb6e8b56bcb9d027755470669d8818185599 \ No newline at end of file + 0f75679e3346160939924550fd3591462a4afec6 \ No newline at end of file diff --git a/kubeadm-opensuse-registry.patch b/kubeadm-opensuse-registry.patch index c3e23c3..f599d13 100644 --- a/kubeadm-opensuse-registry.patch +++ b/kubeadm-opensuse-registry.patch @@ -1,25 +1,25 @@ -diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go -index 2611da7be9c..9875fad32b9 100644 ---- a/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go -+++ b/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go -@@ -40,7 +40,7 @@ const ( - // DefaultCertificatesDir defines default certificate directory +Index: kubernetes-1.24.11/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go +=================================================================== +--- kubernetes-1.24.11.orig/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go ++++ kubernetes-1.24.11/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go +@@ -41,7 +41,7 @@ const ( DefaultCertificatesDir = "/etc/kubernetes/pki" // DefaultImageRepository defines default image registry -- DefaultImageRepository = "k8s.gcr.io" + // (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 -diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go -index feb72d7807e..c04d6a5973a 100644 ---- a/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go -+++ b/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go -@@ -42,7 +42,7 @@ const ( - // DefaultCertificatesDir defines default certificate directory +Index: kubernetes-1.24.11/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go +=================================================================== +--- kubernetes-1.24.11.orig/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go ++++ kubernetes-1.24.11/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go +@@ -43,7 +43,7 @@ const ( DefaultCertificatesDir = "/etc/kubernetes/pki" // DefaultImageRepository defines default image registry -- DefaultImageRepository = "k8s.gcr.io" + // (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" diff --git a/kubernetes-1.24.11.tar.xz b/kubernetes-1.24.11.tar.xz new file mode 100644 index 0000000..259a342 --- /dev/null +++ b/kubernetes-1.24.11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc476b48007f2d6f2119b10cc958467c19cedaa3eac82ea3c2baf001ceadd29d +size 22368944 diff --git a/kubernetes-1.24.3.tar.xz b/kubernetes-1.24.3.tar.xz deleted file mode 100644 index 90358e2..0000000 --- a/kubernetes-1.24.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d17fd465ed52d992548a27a0e29a20236ca482caba320e7f3dc4d0a1259ab6b1 -size 22294216 diff --git a/kubernetes.obsinfo b/kubernetes.obsinfo index c58c564..fa21133 100644 --- a/kubernetes.obsinfo +++ b/kubernetes.obsinfo @@ -1,4 +1,4 @@ name: kubernetes -version: 1.24.3 -mtime: 1657722116 -commit: aef86a93758dc3cb2c658dd9657ab4ad4afc21cb +version: 1.24.11 +mtime: 1677072627 +commit: 0f75679e3346160939924550fd3591462a4afec6 diff --git a/kubernetes1.24.changes b/kubernetes1.24.changes index eea6632..c3584bb 100644 --- a/kubernetes1.24.changes +++ b/kubernetes1.24.changes @@ -1,3 +1,129 @@ +------------------------------------------------------------------- +Thu Mar 2 13:14:29 UTC 2023 - Priyanka Saggu + +- 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 + +------------------------------------------------------------------- +Thu Mar 2 13:01:58 UTC 2023 - Priyanka Saggu + +- Update to version 1.24.11: + * Release commit for Kubernetes v1.24.11 + * 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 in 1.24 + * kubelet/client: collapse transport wiring onto standard approach + * apiserver: remove 34s from DELETECOLLECTION rest handler + * update prev succeeded indexes for indexed jobs unconditionally + * use custom dialer for http probes + * use custom dialer for tcp probes + * add custom dialer optimized for probes + * bump honnef.co/go/tools to support go1.20 + * 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 + * Explicitly call rand.Seed() method + * Improve vendor verification works for each staging repo + * Bump Konnectivity to v0.0.35 + * Add pod to dsw if termination is not completed during reconstruction #issues/113979 + * integration: migrate taint tests + * integration: migrate scoring tests + * integration: migrate preemption tests + * integration: migrate plugings tests + * integration: migrate extender tests + * integration: scheduler: migrate PDB from v1beta1 to v1 + * Fix issues in volumesnapshot test for ephemeral storage + * update golangci-lint for go 1.19 + * golang: Update to 1.19 + * Adjust for os/exec changes in 1.19 + * Update golangci-lint to 1.46.2 and fix errors + * Windows Kube-Proxy implementation for internal traffic policy. + * Fix a regression that scheduler always go through all Filter plugins + * Fix SPDY proxy authentication with special chars + * Creating Ingress IP loadbalancer alone when all the endpoints are terminating. KEP1669 + * change k8s.gcr.io/pause to registry.k8s.io/pause + * Update golang.org/x/net 1e63c2f + * image pull event include duration with waiting + * kubelet: make the image pull time more accurate in event + * update structured-merge-diff to 4.2.3 + * regression test for exponential recursion bug on CRDs + * Fix endpoint reconciler failing to delete masterlease + * kubeadm: remove v1.25 etcd "3.5.6-0" for v1.24 + * use etcd 3.5.6-0 after promotion + * changelog: CVE-2022-3294 and CVE-2022-3162 were fixed in v1.23.14 + * upgrade system-validators to v1.8.0 for a bugfix of cgroupv2 io check + * Introducing LoadbalancerPortMapping flags for VipExternalIP + * egress_selector: prevent goroutines leak on connect() step. + * Merge pull request #113133 from sxllwx:automated-cherry-pick-of-#113133-upstream-release-1.25 + * Fixed (CVE-2022-27664) Bump golang.org/x/net to v0.1.1-0.20221027164007-c63010009c80 + * Add CVE-2022-3162 to CHANGELOG-1.24.md + * tls.Dial() validates hostname, no need to do that manually + * e2e: use custom timeouts in GetSnapshotContentFromSnapshot() + * test/e2e/storage: replace hardcoded value with custom timeout in cleanup routine + * StatefulSet: Cleanup the complex defer function updating the status + * Be sure to update the status of StatefulSet even if the new replica creation fails + * added retries to winkernel proxy rules deletion + * added backend hashing to winkernel proxier + * kubelet: fix pod log line corruption when using timestamps and long lines + * kubeadm: mutate ClusterConfiguration.imageRepository to "registry.k8s.io" + * kubeadm: use registry.k8s.io instead of k8s.gcr.io + * add GetAllocatableCPUs test in cpumanager + * fix GetAllocatableCPUs in cpumanager + * e2e: restore volume lifecycle checks for csi-hostpath driver + * kubelet: fix volume reconstruction for CSI ephemeral volumes + * NodeLifecycleController: Remove race condition + * kube-proxy wait for cluster cidr skip delete events + * kube-proxy handle node PodCIDR changs + * kube-proxy: gate topology correctly + * service update event should be triggered when appProtocol in port is changed. + * filter out terminated containers in cadvisor_stats_provider + * Fix winkernel proxier setting the wrong HNS loadbalancer ID for ingress IP + * Bump konnectivity-client to v0.0.33 + * Fix list estimator for lists that are executed as gets + * kubeadm: allow RSA and ECDSA format keys in preflight check + * Limit redirect proxy handling to redirected responses + * Make sure auto-mounted subpath mount source is already mounted + * Call SetupDevice only if Volume is not globally Mounted + * Fixes kubelet log compression on Windows + * Add zone field to vsphere test cloudconfig + * Reduce default gzip compression level from 4 to 1 in apiserver + * exec auth: support TLS config caching + * Add an option for aggregator + * Update go-runner to v2.3.1-go1.18.6-bullseye.0 + * Update kube-cross image to v1.24.0-go1.18.6-bullseye.0 + * Fix problem in updating VolumeAttached in node status + * Call queueSet::boundNextDispatchLocked enough + * Always log APF InitialSeats and FinalSeats values + * Marshal MicroTime to json and proto at the same precision + * Windows: ensure runAsNonRoot does case-insensitive comparison on user name + * Tolerate sub-microsecond eventTime changes on update + * Improve kubectl display of invalid errors + * fix unmatch reason when updating pod status + * fix nestedPendingOperations mount and umount parallel bug + * client-go/rest: check if url is nil to prevent nil pointer dereference + * Revert "client-go: remove no longer used finalURLTemplate" + * Skip "instance not found" error for LB backend address pools + * Update cel-go to v0.10.2. + * fix a memory leak problem when calling DryRunPreemption + * Fix JobTrackingWithFinalizers when a pod succeeds after the job fails + * Use CheckAndMarkAsUncertainViaReconstruction for uncertain volumes + * Remove volume from found during reconstruction if mounted + * Add unit test for verifying if processReconstructedVolumes works as expected + * Fix code to process volumes which were skipped during reconstruction + * Keep track of each pod that uses a volume during reconstruction + * allow namespace admins to use leases to encourage migration off of configmaps + * Fix: filter out unsatisfied nodes when calling AddPod in PodTopologySpread + * Fix `kubeadm upgrade plan` issue with FQDN nodes names + * Add rate limiting when calling STS assume role API + * Fix kubelet panic when accessing metrics/resource endpoint + * Fixing issue in generatePodSandboxWindowsConfig for hostProcess containers by where pod sandbox won't have HostProcess bit set if pod does not have a security context but containers specify HostProcess. + * Add retry logic for Unix Domain sockets on Windows + * Execute the Run function of kubelet, no log output after failure + * Prune defaults for CRD serving + ------------------------------------------------------------------- Tue Jul 19 01:53:28 UTC 2022 - jkowalczyk@suse.com diff --git a/kubernetes1.24.spec b/kubernetes1.24.spec index fad86a7..92c8f4e 100644 --- a/kubernetes1.24.spec +++ b/kubernetes1.24.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %define baseversionminus1 1.23 Name: kubernetes%{baseversion} -Version: 1.24.3 +Version: 1.24.11 Release: 0 Summary: Container Scheduling and Management License: Apache-2.0 @@ -68,6 +68,7 @@ It groups containers that make up an application into logical units for management and discovery. + # packages to build containerized control plane %package apiserver diff --git a/revert-coredns-image-renaming.patch b/revert-coredns-image-renaming.patch index d6bf086..4c3ef89 100644 --- a/revert-coredns-image-renaming.patch +++ b/revert-coredns-image-renaming.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Patch openSUSE revert coredns image renaming cmd/kubeadm/app/images/images.go | 5 ----- 1 file changed, 5 deletions(-) -diff --git a/cmd/kubeadm/app/images/images.go b/cmd/kubeadm/app/images/images.go -index ee55eb6c995..bdb61caa373 100644 ---- a/cmd/kubeadm/app/images/images.go -+++ b/cmd/kubeadm/app/images/images.go +Index: kubernetes-1.24.11/cmd/kubeadm/app/images/images.go +=================================================================== +--- kubernetes-1.24.11.orig/cmd/kubeadm/app/images/images.go ++++ kubernetes-1.24.11/cmd/kubeadm/app/images/images.go @@ -22,7 +22,6 @@ import ( "k8s.io/klog/v2" @@ -19,17 +19,14 @@ index ee55eb6c995..bdb61caa373 100644 "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 { +@@ -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 "k8s.gcr.io/coredns" to "k8s.gcr.io/coredns/coredns +- // 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 --- -2.33.1 -