Accepting request 1070425 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.23.17:
  * Release commit for Kubernetes v1.23.17
  * 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
  * add scale test for probes
  * use custom dialer for http probes
  * use custom dialer for tcp probes
  * add custom dialer optimized for probes
  * egress_selector: prevent goroutines leak on connect() step.
  * tls.Dial() validates hostname, no need to do that manually
  * 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
  * Bump Konnectivity to v0.0.35
  * Improve vendor verification works for each staging repo
  * Update to go1.19
  * Adjust for os/exec changes in 1.19
  * Update golangci-lint to 1.46.2 and fix errors
  * Match go1.17 defaults for SHA-1 and GC
  * update golangci-lint to 1.45.0
  * kubelet: make the image pull time more accurate in event
  * change k8s.gcr.io/pause to registry.k8s.io/pause
  * use etcd 3.5.6-0 after promotion

OBS-URL: https://build.opensuse.org/request/show/1070425
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.23?expand=0&rev=15
This commit is contained in:
Richard Brown
2023-03-10 15:52:38 +00:00
committed by Git OBS Bridge
parent 2cec97ce8e
commit c532ee83a5
9 changed files with 84 additions and 34 deletions

View File

@@ -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.23.9</param>
<param name="revision">v1.23.17</param>
<param name="changesgenerate">enable</param>
</service>
<service name="tar" mode="disabled"/>

View File

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

View File

@@ -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.23.17/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go
===================================================================
--- kubernetes-1.23.17.orig/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go
+++ kubernetes-1.23.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.23.17/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go
===================================================================
--- kubernetes-1.23.17.orig/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go
+++ kubernetes-1.23.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"

View File

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

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7212328f4720551ee8d1cf26d2730b1e40ef8f03646206c4e4c103237158ad13
size 22371348

View File

@@ -1,4 +1,4 @@
name: kubernetes
version: 1.23.9
mtime: 1657721923
commit: c1de2d70269039fe55efb98e737d9a29f9155246
version: 1.23.17
mtime: 1677072390
commit: 953be8927218ec8067e1af2641e540238ffd7576

View File

@@ -1,3 +1,55 @@
-------------------------------------------------------------------
Thu Mar 2 12:48:04 UTC 2023 - Priyanka Saggu <priyanka.saggu@suse.com>
- 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 02 12:35:00 UTC 2023 - priyanka.saggu@suse.com
- Update to version 1.23.17:
* Release commit for Kubernetes v1.23.17
* 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
* add scale test for probes
* use custom dialer for http probes
* use custom dialer for tcp probes
* add custom dialer optimized for probes
* egress_selector: prevent goroutines leak on connect() step.
* tls.Dial() validates hostname, no need to do that manually
* 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
* Bump Konnectivity to v0.0.35
* Improve vendor verification works for each staging repo
* Update to go1.19
* Adjust for os/exec changes in 1.19
* Update golangci-lint to 1.46.2 and fix errors
* Match go1.17 defaults for SHA-1 and GC
* update golangci-lint to 1.45.0
* kubelet: make the image pull time more accurate in event
* change k8s.gcr.io/pause to registry.k8s.io/pause
* use etcd 3.5.6-0 after promotion
* changelog: CVE-2022-3294 and CVE-2022-3162 were fixed in v1.23.14
* Add CVE-2021-25749 to CHANGELOG-1.23.md
* Add CVE-2022-3294 to CHANGELOG-1.23.md
* kubeadm: use registry.k8s.io instead of k8s.gcr.io
* etcd: Updated to v3.5.5
* Bump konnectivity network proxy to v0.0.33. Includes a couple bug fixes for better handling of dial failures. [Agent & Server](https://github.com/kubernetes-sigs/apiserver-network-proxy/commits/v0.0.33) include numerous other fixes.
* kubeadm: allow RSA and ECDSA format keys in preflight check
* Fixes kubelet log compression on Windows
* Reduce default gzip compression level from 4 to 1 in apiserver
* exec auth: support TLS config caching
* Marshal MicroTime to json and proto at the same precision
* Windows: ensure runAsNonRoot does case-insensitive comparison on user name
* update structured-merge-diff to 4.2.3
* Add rate limiting when calling STS assume role API
* 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.
-------------------------------------------------------------------
Tue Jul 19 05:05:54 UTC 2022 - jkowalczyk@suse.com

View File

@@ -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.22
Name: kubernetes%{baseversion}
Version: 1.23.9
Version: 1.23.17
Release: 0
Summary: Container Scheduling and Management
License: Apache-2.0
@@ -68,8 +68,9 @@ It groups containers that make up an application into logical units
for management and discovery.
# packages to build containerized control plane
# packages to build containerized control plane
%package apiserver
Summary: Kubernetes apiserver for container image
Group: System/Management

View File

@@ -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.23.17/cmd/kubeadm/app/images/images.go
===================================================================
--- kubernetes-1.23.17.orig/cmd/kubeadm/app/images/images.go
+++ kubernetes-1.23.17/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