diff --git a/_service b/_service index fc2a664..bad2469 100644 --- a/_service +++ b/_service @@ -5,7 +5,7 @@ .git @PARENT_TAG@ v(.*) - v1.22.7 + v1.22.17 enable diff --git a/_servicedata b/_servicedata index 2db2010..a9b78e5 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/kubernetes/kubernetes.git - 24b377b021ac443a1ee3afef5701e469516a1358 \ No newline at end of file + a7736eaf34d823d7652415337ac0ad06db9167fc \ No newline at end of file diff --git a/kubeadm-opensuse-registry.patch b/kubeadm-opensuse-registry.patch index c3e23c3..d13b9f5 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.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 -- 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.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 -- 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.22.17.tar.xz b/kubernetes-1.22.17.tar.xz new file mode 100644 index 0000000..134d540 --- /dev/null +++ b/kubernetes-1.22.17.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:678a6e0f9d6fa5c9deafb0411f08fb7590ffc4ddc5577738d97b9b88d9942343 +size 21493636 diff --git a/kubernetes-1.22.7.tar.xz b/kubernetes-1.22.7.tar.xz deleted file mode 100644 index 8ca08d9..0000000 --- a/kubernetes-1.22.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:abb6f1c686fe0ec85be19dcb3e924e679a146ac2bbc0cbb30a4ae817bd15b935 -size 21438360 diff --git a/kubernetes.obsinfo b/kubernetes.obsinfo index eb4e6be..bd1cc3b 100644 --- a/kubernetes.obsinfo +++ b/kubernetes.obsinfo @@ -1,4 +1,4 @@ name: kubernetes -version: 1.22.7 -mtime: 1645011772 -commit: b56e432f2191419647a6a13b9f5867801850f969 +version: 1.22.17 +mtime: 1670499664 +commit: a7736eaf34d823d7652415337ac0ad06db9167fc diff --git a/kubernetes1.22.changes b/kubernetes1.22.changes index 1ca4503..04fd4b6 100644 --- a/kubernetes1.22.changes +++ b/kubernetes1.22.changes @@ -1,3 +1,115 @@ +------------------------------------------------------------------- +Wed Mar 1 06:45:10 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 Feb 23 08:57:30 UTC 2023 - priyanka.saggu@suse.com + +- 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 + * GIT-110239: fix activeDeadlineSeconds enforcement bug + * fix: --chunk-size with selector returns missing result + * Fixed winkernel proxy failing to query v1 endpoints created by dockershim CNIs + * Winkernel proxier cache HNS data to improve syncProxyRules performance + * apiserver: printers should use int64 + * Revert "Automated cherry pick of #109124: Winkernel proxier cache HNS data to improve syncProxyRules" + * Prune defaults for CRD serving + * fix image pulling failure when IMDS is unavailalbe in kubelet startup + * test: update graceful node shutdown e2e with watch + * Ignore EndpointSlices that are already marked for deletion + * kubelet: Mark ready condition as false explicitly for terminal pods + * agnhost: bump version 2.39 + * kubelet: add e2e test to verify probe readiness + * kubelet: only shutdown probes for pods that are terminated + * kubelet: Pod probes should be handled by pod worker + * Reject proxy requests to 0.0.0.0 as well + * etcd-client starts retrying transient errors from the etcd cluster + * ipvs: fix prevent concurrent map read and map write + * restore endpoints topology fallback in kube-proxy, fix issue 110208 + * fix audit union loop variables in closures + * Updating e2e test to check EndpointSlices and Endpoints as well + * e2e: services with evicted pods doesn't have endpoints + * e2e test for evicted pods + * endpoints controller: don't consider terminal endpoints + * endpointslices: terminal pods doesn't receive enpoints + * add pod util to verify pod is terminal + * untangled HNS caching fix with healthCheck feature + * Fix requests scope classification + * authn: fix cache mutation by AuthenticatedGroupAdder + * Winkernel proxier cache HNS data to improve syncProxyRules performance + * fix: exclude non-ready nodes and deleted nodes from azure load balancers + * Fix OpenAPI loading error caused by empty APIService + * tests: Updates the should delete a collection of pods test + * component-base: replace url in rest client metrics + * Fix name for Pods of NonIndexed Jobs + * Correct event registration for multiple scheduler plugins. + * Avoid updating Services with stale specs Fix the bug that service specs in servicesToUpdate may have been updated by clients. + * Fix: abort nominating a pod that was already scheduled to a node + * cpu manager policy set to none, no one remove container id from container map, lead memory leak + * kubeadm: add etcd flag for member data consistency + * Copy request in timeout handler + * kube-up: use registry.k8s.io for containerd-related jobs + * Skip updating Endpoints and EndpointSlice if no relevant fields change + * ipvs: remove port opener + * iptables: remove port opener + * kubelet: If the container status is created, we are waiting + * rootcacertpublisher: drop the namespace label from metrics to reduce its cardinality + * Include pod UID in secret/configmap cache key + * Move kubelet secret and configmap manager calls to sync_Pod functions + * Extract containerID from systemd-style cgroupPath in cri_stats_provider And fix test to generate UUID without dash + * test: Add E2E for job completions with cpu reservation + * test: Add E2E for init container pod deletion + * kubelet: Delay writing a terminal phase until the pod is terminated + * azure_file: try to get secret namespace from ClaimRef + * azure_file: add namespace tests for InTree to CSI conversion + * Update Go to 1.16.15 + * cluster/gce: update konnectivity image tags to v0.0.30 + * wrap error from RunCordonOrUncordon + * bump sigs.k8s.io/apiserver-network-proxy/konnectivity-client@v0.0.30 + * fix dryrun when ca file exists + * fix regression introduced by PR 100320 + * Fix nodes volumesAttached status not updated + * remove InitFlags for pod_workers test + * cronjob_controllerv2: do not filter jobs to be reconciled by labels + * kubelet: Clean up a static pod that has been terminated before starting + * Add an e2e test for updating a static pod while it restarts + * kubelet: fix podstatus not containing pod full name + * increase Azure ACR credential provider timeout + * Updating EndpointSlice strategy to retain node name in topology until field is set + * Ignore container notfound error while getPodstatuses + * fix: do not return early in the node informer when there is no change of the topology label. + * Add PDB selector patch integration test + * Revert v1beta1 PodDisruptionBudget select patchStrategy + * kubeadm: fix the bug that 'kubeadm init --dry-run --upload-certs' command failed with 'secret not found' error + * tests: Wait for pod collection to enter a Running state + ------------------------------------------------------------------- Wed Mar 16 12:35:07 UTC 2022 - rbrown@suse.com diff --git a/kubernetes1.22.spec b/kubernetes1.22.spec index 37d84be..d2a2c3d 100644 --- a/kubernetes1.22.spec +++ b/kubernetes1.22.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.21 Name: kubernetes%{baseversion} -Version: 1.22.7 +Version: 1.22.17 Release: 0 Summary: Container Scheduling and Management License: Apache-2.0 @@ -70,6 +70,9 @@ for management and discovery. + + + # packages to build containerized control plane %package apiserver Summary: Kubernetes apiserver for container image diff --git a/revert-coredns-image-renaming.patch b/revert-coredns-image-renaming.patch index f576766..f9eac95 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 7e97dbc9421..187c71894cb 100644 ---- a/cmd/kubeadm/app/images/images.go -+++ b/cmd/kubeadm/app/images/images.go +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 @@ -20,7 +20,6 @@ import ( "fmt" @@ -19,17 +19,14 @@ index 7e97dbc9421..187c71894cb 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.32.0 -