File project.diff of Package kubernetes1.34
--- kubernetes1.34.spec.orig
+++ kubernetes1.34.spec
@@ -67,98 +67,6 @@ management of containerized applications
It groups containers that make up an application into logical units
for management and discovery.
-
-
-
-
-# packages to build containerized control plane
-
-%package apiserver
-Summary: Kubernetes apiserver for container image
-Group: System/Management
-Provides: kubernetes-apiserver-provider = %{version}
-Conflicts: kubernetes-apiserver-provider
-
-%description apiserver
-This subpackage contains the kube-apiserver binary for Kubic images
-
-%package controller-manager
-Summary: Kubernetes controller-manager for container image
-Group: System/Management
-Provides: kubernetes-controller-manager-provider = %{version}
-Conflicts: kubernetes-controller-manager-provider
-
-%description controller-manager
-This subpackage contains the kube-controller-manager binary for Kubic images
-
-%package scheduler
-Summary: Kubernetes scheduler for container image
-Group: System/Management
-Provides: kubernetes-scheduler-provider = %{version}
-Conflicts: kubernetes-scheduler-provider
-
-%description scheduler
-This subpackage contains the kube-scheduler binary for Kubic images
-
-%package proxy
-Summary: Kubernetes proxy for container image
-Group: System/Management
-Provides: kubernetes-proxy-provider = %{version}
-Conflicts: kubernetes-proxy-provider
-Requires: conntrack-tools
-Requires: ebtables
-Requires: ipset
-Requires: iptables
-
-%description proxy
-This subpackage contains the kube-proxy binary for Kubic images
-
-%package kubelet
-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}
-
-%description kubelet
-Manage a cluster of Linux containers as a single system to accelerate Dev and simplify Ops.
-kubelet daemon (current version)
-
-%package kubelet-common
-Summary: Kubernetes kubelet daemon
-Group: System/Management
-Requires: cri-runtime
-Requires: kubernetes-kubelet%{baseversion}
-Provides: kubernetes-kubelet-common = %{version}
-Conflicts: kubernetes-kubelet-common
-
-%description kubelet-common
-Manage a cluster of Linux containers as a single system to accelerate Dev and simplify Ops.
-kubelet daemon
-
-%package kubeadm
-Summary: Kubernetes kubeadm bootstrapping tool
-Group: System/Management
-Provides: kubernetes-kubeadm-provider = %{version}
-Conflicts: kubernetes-kubeadm-provider
-Obsoletes: kubernetes%{baseversionminus1}-kubeadm
-Requires: cri-runtime
-Requires: cri-tools
-Requires: ebtables
-Requires: ethtool
-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.
-kubeadm bootstrapping tool
-
%package client
Summary: Kubernetes client tools
Group: System/Management
@@ -241,10 +149,10 @@ export FORCE_HOST_GO=y
# `-buildmode=pie` with "internal linking" is not yet supported on linux/s390x platform
# https://github.com/golang/go/blob/a63907808d14679c723e566cb83acc76fc8cafc2/src/internal/platform/supported.go#L223-L232
# https://github.com/golang/go/issues/64875#issuecomment-1870734528
- make WHAT="cmd/kube-apiserver cmd/kube-controller-manager cmd/kube-scheduler cmd/kube-proxy cmd/kubelet cmd/kubectl cmd/kubeadm"
+ make WHAT="cmd/kubectl"
%else
# On openSUSE (non-s390x), build all with PIE
- make WHAT="cmd/kube-apiserver cmd/kube-controller-manager cmd/kube-scheduler cmd/kube-proxy cmd/kubelet cmd/kubectl cmd/kubeadm" GOFLAGS="-buildmode=pie"
+ make WHAT="cmd/kubectl" GOFLAGS="-buildmode=pie"
%endif
%else
%ifarch s390x
@@ -283,32 +191,9 @@ output_path="_output/local/bin/linux/%{g
install -m 755 -d %{buildroot}%{_bindir}
-%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
-echo "+++ INSTALLING kubeadm"
-install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/kubeadm
-
-binaries=(kube-apiserver kube-controller-manager kube-scheduler kube-proxy)
-for bin in "${binaries[@]}"; do
- echo "+++ INSTALLING ${bin}"
- install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/${bin}
-done
-
-echo "+++ INSTALLING kubelet with %{baseversion} suffix"
-install -p -m 755 ${output_path}/kubelet %{buildroot}%{_bindir}/kubelet%{baseversion}
-%endif
-
echo "+++ INSTALLING kubectl with %{baseversion} suffix"
install -p -m 755 ${output_path}/kubectl %{buildroot}%{_bindir}/kubectl%{baseversion}
-%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
-echo "+++ INSTALLING kubelet multi-version loader"
-install -p -m 755 %{SOURCE3} %{buildroot}%{_bindir}/kubelet
-
-# create sysconfig.kubelet-kubernetes in fullupdir
-sed -i -e 's|BASE_VERSION|%{baseversion}|g' %{SOURCE22}
-install -D -m 0644 %{SOURCE22} %{buildroot}%{_fillupdir}/sysconfig.kubelet-kubernetes%{baseversion}
-%endif
-
# install the bash completion
install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions/
%{buildroot}%{_bindir}/kubectl%{baseversion} completion bash > %{buildroot}%{_datadir}/bash-completion/completions/kubectl
@@ -326,52 +211,9 @@ find . -name '.gitignore' -type f -de
find hack -name '*.sh.orig' -type f -delete
find hack -name '.golint_*' -type f -delete
-%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
-# systemd service
-install -d -m 0755 %{buildroot}%{_unitdir}
-install -m 0644 -t %{buildroot}%{_unitdir}/ %{SOURCE10}
-
-# make symlinks to rc files
-install -d -m 0755 %{buildroot}%{_sbindir}
-ln -sf service "%{buildroot}%{_sbindir}/rckubelet"
-
-# install manpages
-install -d %{buildroot}%{_mandir}/man1
-install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1
-%else
# install kubectl manpages
install -d %{buildroot}%{_mandir}/man1
install -p -m 644 docs/man/man1/kubectl* %{buildroot}%{_mandir}/man1
-%endif
-
-%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
-# create config folder
-install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
-
-# manifests file for the kubelet
-install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/manifests
-
-# place kubernetes.tmp.conf to /usr/lib/tmpfiles.d/kubernetes.conf
-install -d -m 0755 %{buildroot}%{_tmpfilesdir}
-install -D -m 0644 %{SOURCE27} %{buildroot}/%{_tmpfilesdir}/kubelet.conf
-
-# install the place the kubelet defaults to put volumes
-install -d %{buildroot}%{_localstatedir}/lib/kubelet
-
-%define volume_plugin_dir %{_localstatedir}/lib/kubelet/volume-plugin
-install -d %{buildroot}/%{volume_plugin_dir}
-
-# Add kubeadm modprobe.d and sysctl.d drop-in configs
-mkdir -p %{buildroot}%{_prefix}/lib/modules-load.d
-mkdir -p %{buildroot}%{_sysctldir}
-install -m 0644 -t %{buildroot}%{_prefix}/lib/modules-load.d/ %{SOURCE23}
-install -m 0644 -t %{buildroot}%{_sysctldir} %{SOURCE24}
-
-# Create kubeadm systemd unit drop-in
-install -d -m 0755 %{buildroot}%{_unitdir}/kubelet.service.d
-sed -i -e 's|PATH_TO_FLEXVOLUME|%{volume_plugin_dir}|g' %{SOURCE25}
-install -m 0644 -t %{buildroot}%{_unitdir}/kubelet.service.d/ %{SOURCE25}
-%endif
# alternatives
ln -s -f %{_sysconfdir}/alternatives/kubectl %{buildroot}%{_bindir}/kubectl
@@ -387,105 +229,6 @@ if [ ! -f %{_bindir}/kubectl%{baseversio
update-alternatives --remove kubectl %{_bindir}/kubectl%{baseversion}
fi
-%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
-%pre kubelet-common
-%service_add_pre kubelet.service
-
-%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
- if [ "`findmnt -o FSTYPE -l /|grep -v FSTYPE`" = "btrfs" ]; then
- %{_sbindir}/mksubvolume %{_localstatedir}/lib/cni
- fi
-fi
-%endif
-%tmpfiles_create %{_tmpfilesdir}/kubelet.conf
-
-%preun kubelet-common
-%service_del_preun kubelet.service
-
-%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
-%{_mandir}/man1/kubelet.1%{?ext_man}
-%{_bindir}/kubelet
-%{_unitdir}/kubelet.service
-%dir %{_unitdir}/kubelet.service.d
-%{_sbindir}/rckubelet
-%dir %{_localstatedir}/lib/kubelet
-%dir %{_sysconfdir}/%{name}
-%dir %{_sysconfdir}/%{name}/manifests
-%{_tmpfilesdir}/kubelet.conf
-%attr(0750,root,root) %dir %ghost %{_rundir}/%{name}
-%dir %{volume_plugin_dir}
-%{_fillupdir}/sysconfig.kubelet-kubernetes%{baseversion}
-
-# openSUSE is using kubeadm with containerizied control plane, we
-# only need the binaries
-
-%files apiserver
-%doc README.md CONTRIBUTING.md
-%license LICENSE
-%{_mandir}/man1/kube-apiserver.1%{?ext_man}
-%{_bindir}/kube-apiserver
-
-%files controller-manager
-%doc README.md CONTRIBUTING.md
-%license LICENSE
-%{_mandir}/man1/kube-controller-manager.1%{?ext_man}
-%{_bindir}/kube-controller-manager
-
-%files scheduler
-%doc README.md CONTRIBUTING.md
-%license LICENSE
-%{_mandir}/man1/kube-scheduler.1%{?ext_man}
-%{_bindir}/kube-scheduler
-
-%files proxy
-%doc README.md CONTRIBUTING.md
-%license LICENSE
-%{_mandir}/man1/kube-proxy.1%{?ext_man}
-%{_bindir}/kube-proxy
-
-%files kubelet
-%license LICENSE
-%{_bindir}/kubelet%{baseversion}
-
-%files kubeadm
-%doc README.md CONTRIBUTING.md CHANGELOG-%{baseversion}.md
-%{_unitdir}/kubelet.service.d/10-kubeadm.conf
-%dir %{_prefix}/lib/modules-load.d
-%{_prefix}/lib/modules-load.d/kubeadm.conf
-%{_sysctldir}/90-kubeadm.conf
-%license LICENSE
-%{_bindir}/kubeadm
-%{_mandir}/man1/kubeadm*
-%endif
-
%files client
%doc README.md CONTRIBUTING.md
%license LICENSE
