OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.20?expand=0&rev=27

_service

@@ -5,7 +5,7 @@
     <param name="exclude">.git</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">v1.20.9</param>
+    <param name="revision">v1.20.10</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="tar" mode="disabled"/>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/kubernetes/kubernetes.git</param>
-              <param name="changesrevision">57f38e4e5bb0f2258805fc79e6dcb9933ab7f302</param></service></servicedata>
+              <param name="changesrevision">cf1001207eeb4d2e3a569d213191b063434f3b1d</param></service></servicedata>

kubernetes-1.20.10.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2108eb15a738f4a658b4e5c77f63e1021ad69a38e0f591a251d6f02b1bd39ac2
+size 20403940

kubernetes-1.20.9.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:90b9c0c2cff5229e76a270b365cc62417742b07b4a74e99e47a7790d3f7c3cc6
-size 20379480

kubernetes.obsinfo

@@ -1,5 +1,5 @@
 name: kubernetes
-version: 1.20.9
-mtime: 1626382542
-commit: 7a576bc3935a6b555e33346fd73ad77c925e9e4a
+version: 1.20.10
+mtime: 1628704774
+commit: 8152330a2b6ca3621196e62966ef761b8f5a61bb
 

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
 

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