Accepting request 1112625 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/1112625
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kubernetes1.24?expand=0&rev=12

90-kubeadm.conf

@@ -1,2 +1,4 @@
 # The file is provided as part of the kubernetes-kubeadm package
+net.bridge.bridge-nf-call-iptables = 1
 net.ipv4.ip_forward = 1
+net.bridge.bridge-nf-call-ip6tables = 1

_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.24.16</param>
+    <param name="revision">v1.24.17</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">51e33fadff13065ae5518db94e84598293965939</param></service></servicedata>
+              <param name="changesrevision">22a9682c8fe855c321be75c5faacde343f909b04</param></service></servicedata>

kubeadm.conf

@@ -1,2 +1,3 @@
 # Load br_netfilter module at boot
 br_netfilter
+overlay

kubelet.service

@@ -2,7 +2,7 @@
 Description=kubelet: The Kubernetes Node Agent
 Documentation=https://kubernetes.io/docs/
 After=network.target network-online.target
-Wants=docker.service crio.service
+Wants=containerd.service crio.service
 ConditionPathExists=/var/lib/kubelet/config.yaml
 
 [Service]

kubernetes-1.24.16.tar.xz

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

kubernetes-1.24.17.tar.xz

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

kubernetes.obsinfo

@@ -1,4 +1,4 @@
 name: kubernetes
-version: 1.24.16
+version: 1.24.17
-mtime: 1689769046
+mtime: 1692833727
-commit: 51e33fadff13065ae5518db94e84598293965939
+commit: 22a9682c8fe855c321be75c5faacde343f909b04

kubernetes1.24.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Wed Sep 20 18:12:25 UTC 2023 - Priyanka Saggu <priyanka.saggu@suse.com>
+
+- fixes for bsc#1214406
+- update `Wants` directive in [Unit] section of `kubelet.service`:
+  * add: `containerd.service`
+  * remove: `docker.service`
+- updating container runtime prerequisites:
+  (Refer: k8s.io/docs/setup/production-environment/container-runtimes/#install-and-configure-prerequisites)
+  * update `90-kubeadm.conf` to add below iptables rules:
+    - net.bridge.bridge-nf-call-iptables = 1
+    - net.bridge.bridge-nf-call-ip6tables = 1
+  * update `kubeadm.conf` to add `overlay` kernel module
+  * update .spec file to:
+    - add post-installation scriptlet for `kubeadm` package to enable iptables rules defined in `90-kubeadm.conf` using sysctl
+    - add conditional checks to load kernel modules (br_netfilter, overlay) in `kubelet-common` package post-installation scriptlet
+    - update `kubelet-common` post scriptlet to correctly update `KUBELET_VER` var in `/etc/sysconfig/kubelet` file based on fillup template
+- add below to `kubelet` subpackage to recommend installing correct version of package providing `kubernetes-kubelet-common` :
+  * `Recommends: kubernetes-kubelet-common = %{version}`
+- add below to `kubeadm` subpackage to recommend installing correct version of `kubelet` and `kubelet-common` packages:
+  * `Recommends: kubernetes%{baseversion}-kubelet`
+
+-------------------------------------------------------------------
+Tue Sep 12 12:37:34 UTC 2023 - priyanka.saggu@suse.com
+
+- Update .spec file to bump go version build requirements:
+  * `BuildRequires:  go >= 1.20.7`
+- Update to version 1.24.17:
+  * Release commit for Kubernetes v1.24.17
+  * Use environment varaibles for parameters in Powershell
+  * Use env varaibles for passing path
+  * Fix capture loop vars in parallel or ginkgo tests
+  * Update protoc check for verify-generated-kms
+  * [release-1.24] releng/go: Bump images, versions and deps to use Go 1.20.7
+  * Update CHANGELOG/CHANGELOG-1.24.md for v1.24.16
+  * kmsv1: attempt AES-GCM before AES-CBC on reads
+
 -------------------------------------------------------------------
 Wed Jul 26 10:06:30 UTC 2023 - Priyanka Saggu <priyanka.saggu@suse.com>
 

kubernetes1.24.spec

@@ -22,7 +22,7 @@
 %define baseversionminus1 1.23
 
 Name:           kubernetes%{baseversion}
-Version:        1.24.16
+Version:        1.24.17
 Release:        0
 Summary:        Container Scheduling and Management
 License:        Apache-2.0
@@ -51,7 +51,7 @@ Patch4:         kubeadm-opensuse-flexvolume.patch
 Patch5:         revert-coredns-image-renaming.patch
 BuildRequires:  fdupes
 BuildRequires:  git
-BuildRequires:  go >= 1.20.6
+BuildRequires:  go >= 1.20.7
 BuildRequires:  go-go-md2man
 BuildRequires:  golang-packaging
 BuildRequires:  rsync
@@ -75,6 +75,9 @@ for management and discovery.
 
 
 
+
+
+
 # packages to build containerized control plane
 
 %package apiserver
@@ -122,6 +125,7 @@ Summary:        Kubernetes kubelet daemon
 Group:          System/Management
 Requires:       cri-runtime
 Requires:       kubernetes-kubelet-common
+Recommends:     kubernetes-kubelet-common = %{version}
 Provides:       kubernetes-kubelet%{baseversion} = %{version}
 Obsoletes:      kubernetes-kubelet%{baseversion} < %{version}
 %{?systemd_requires}
@@ -156,6 +160,7 @@ Requires:       kubernetes-kubeadm-criconfig
 Requires:       socat
 Requires(pre):  shadow
 Requires:       (kubernetes%{baseversion}-kubelet or kubernetes%{baseversionminus1}-kubelet)
+Recommends:     kubernetes%{baseversion}-kubelet
 
 %description kubeadm
 Manage a cluster of Linux containers as a single system to accelerate Dev and simplify Ops.
@@ -355,7 +360,18 @@ fi
 
 %post kubelet-common
 %fillup_only -an kubelet
+# Check if /etc/sysconfig/kubelet exists
+if [ -e "/etc/sysconfig/kubelet" ]; then
+  # Extract the value from the fillup file
+  UPDATED_KUBELET_VER=$(grep '^KUBELET_VER=' %{_fillupdir}/sysconfig.kubelet-kubernetes%{baseversion} | cut -d '=' -f2)
+  # Update the value in the sysconfig file
+  sed -i "s/^KUBELET_VER=.*/KUBELET_VER=$UPDATED_KUBELET_VER/" /etc/sysconfig/kubelet
+fi
 %service_add_post kubelet.service
+if [ $1 -eq 1 ]; then
+    # Check if modprobe command is available
+    [ ! -x /sbin/modprobe ] || { /sbin/modprobe br_netfilter && /sbin/modprobe overlay; } || true
+fi
 %if 0%{?suse_version} < 1500
 # create some subvolumes needed by CNI
 if [ ! -e %{_localstatedir}/lib/cni ]; then
@@ -372,6 +388,13 @@ fi
 %postun kubelet-common
 %service_del_postun kubelet.service
 
+%post kubeadm
+# Check if sysctl command is available
+if [ -x /usr/sbin/sysctl ]; then
+    # Run sysctl --system after the package installation
+    /usr/sbin/sysctl -p %{_sysctldir}/90-kubeadm.conf || true
+fi
+
 %files kubelet-common
 %doc README.md CONTRIBUTING.md CHANGELOG-%{baseversion}.md
 %license LICENSE