diff --git a/_service b/_service index 344aa3c..f7c0c97 100644 --- a/_service +++ b/_service @@ -5,7 +5,7 @@ .git @PARENT_TAG@ v(.*) - v1.20.9 + v1.20.10 enable diff --git a/_servicedata b/_servicedata index 0c805df..0b4fd54 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/kubernetes/kubernetes.git - 57f38e4e5bb0f2258805fc79e6dcb9933ab7f302 \ No newline at end of file + cf1001207eeb4d2e3a569d213191b063434f3b1d diff --git a/kubernetes-1.20.10.tar.xz b/kubernetes-1.20.10.tar.xz new file mode 100644 index 0000000..cd52d7b --- /dev/null +++ b/kubernetes-1.20.10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2108eb15a738f4a658b4e5c77f63e1021ad69a38e0f591a251d6f02b1bd39ac2 +size 20403940 diff --git a/kubernetes-1.20.9.tar.xz b/kubernetes-1.20.9.tar.xz deleted file mode 100644 index 77587c9..0000000 --- a/kubernetes-1.20.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90b9c0c2cff5229e76a270b365cc62417742b07b4a74e99e47a7790d3f7c3cc6 -size 20379480 diff --git a/kubernetes.obsinfo b/kubernetes.obsinfo index cfc8b26..4d000dd 100644 --- a/kubernetes.obsinfo +++ b/kubernetes.obsinfo @@ -1,5 +1,5 @@ name: kubernetes -version: 1.20.9 -mtime: 1626382542 -commit: 7a576bc3935a6b555e33346fd73ad77c925e9e4a +version: 1.20.10 +mtime: 1628704774 +commit: 8152330a2b6ca3621196e62966ef761b8f5a61bb diff --git a/kubernetes1.20.changes b/kubernetes1.20.changes index 43cca46..4a2184a 100644 --- a/kubernetes1.20.changes +++ b/kubernetes1.20.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Wed Aug 25 11:29:41 UTC 2021 - rbrown@suse.com + +- Update to version 1.20.10: + * Bump to golang 1.15.15 in build/** + * Bump to golang 1.15.15 in cluster/** and staging/** + * Bump to golang 1.15.15 in test/** + * Avoid spurious calls to update/delete validation + * Fix metrics reporting for the deprecated watch path + * Update configure-helper.sh + * Update configure-helper.sh + * Update configure-helper.sh + * Fix: ignore not a VMSS error for VMAS nodes in reconcileBackendPools + * feat: Provide IPv6 support for internal load balancer + * Update to using apiserver-network-proxy v1.22 + * Make CSR cleaner tolerate objects with invalid status.certificate + * disable aufs module + * update comments and owners file for pkg/util/removeall + * kubelet: do not call RemoveAll on volumes directory for orphaned pods + * APF e2e: wait for steady state before proceeding + * Update CHANGELOG/CHANGELOG-1.20.md for v1.20.9 + * Updated to use konnectivity client v0.0.21, and implemented placeholder context + * include google/go-cmp in client-go/dynamic/fake/BUILD + * Simplify use of the fake dynamic client + * fix: return empty VMAS name if using standalone VM + * Fix race in attachdetach tests + * Fix frameworkImpl.extenders being not set + * Fix closing of decorated watcher channel on timeout + * update bazel + * (scheduler e2e) Create balanced pods in parallel + ------------------------------------------------------------------- Fri Jul 16 13:08:59 UTC 2021 - rbrown@suse.com diff --git a/kubernetes1.20.spec b/kubernetes1.20.spec index 3320254..cbd03b3 100644 --- a/kubernetes1.20.spec +++ b/kubernetes1.20.spec @@ -22,7 +22,7 @@ %define baseversionminus1 1.19 Name: kubernetes%{baseversion} -Version: 1.20.9 +Version: 1.20.10 Release: 0 Summary: Container Scheduling and Management License: Apache-2.0 @@ -51,8 +51,8 @@ BuildRequires: bash-completion BuildRequires: fdupes BuildRequires: git BuildRequires: go-go-md2man -# Kubernetes 1.20.9 requires at least go 1.15.14 (see changelog) -BuildRequires: go >= 1.15.14 +# Kubernetes 1.20.10 requires at least go 1.15.15 (see changelog) +BuildRequires: go >= 1.15.15 BuildRequires: golang-packaging BuildRequires: rsync BuildRequires: systemd-rpm-macros @@ -69,8 +69,14 @@ for management and discovery. +<<<<<<< .mine + +======= + +>>>>>>> .new # packages to build containerized control plane + %package apiserver Summary: Kubernetes apiserver for container image Group: System/Management