Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package k3s for openSUSE:Factory checked in at 2021-03-30 21:21:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/k3s (Old) and /work/SRC/openSUSE:Factory/.k3s.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "k3s" Tue Mar 30 21:21:11 2021 rev:4 rq:881465 version:1.20.4+k3s1 Changes: -------- --- /work/SRC/openSUSE:Factory/k3s/k3s.changes 2020-08-04 20:18:47.508940386 +0200 +++ /work/SRC/openSUSE:Factory/.k3s.new.2401/k3s.changes 2021-03-30 21:50:10.894901709 +0200 @@ -1,0 +2,54 @@ +Thu Mar 25 14:25:49 UTC 2021 - Michal Suchanek <msuchanek@suse.com> + +- Update to upstream version 1.20.4+k3s1 + * Known Issues + - K3s servers should always be upgraded before agents. Agents upgraded to + this release before all servers have been upgraded will fail to start due to + the issue described at #2996 + * Changes since v1.20.2+k3s2: + + Upgrade Kubernetes to v1.20.4 (#2960) + + K3s servers now use appropriate HTTP response codes to node join failures + caused by incorrect credentials (#2915) + + ServiceLB now adds IP addresses for all nodes running LB pods to the + Service ingress IP list (#2909) + + K3s will now reliably enable CFS quotas when the cpu and cpuacct cgroup + controllers are comounted (#2911) + + K3s nodes can now successfully join clusters when the cluster CA + certificate is trusted by the OS CA bundle (#2743) + + K3s binary size has been reduced; time to first launch a new version of + K3s should be reduced as well (#2905) + + K3s is now compiled with golang 1.15.8, resolving a common source of + crashes on 32bit arm systems (#2896) + + Crictl will more reliably locate its config file when run by non-root users (#2894) + + The K3s systemd unit will successfully start with a missing + EnvironmentFile (#2886 @AkihiroSuda) + + The K3s Network Policy Controller has been updated, offering improved + performance and reliability of network policy enforcement (#2867) + + K3s containerd now supports AppArmor signal mediation (#2877) + + The K3s embedded userspace (k3s-root) has been updated to fix several + BusyBox CVEs and allow use of the fuse-overlayfs snapshotter (#2862 #2847) + + K3s now supports cgroupv2 (#2844) + + Several regressions in rootless support have been resolved (#2846) + + Cadvisor statistics are no longer missing pod labels (#2836) + + Embedded etcd's Prometheus metrics can now be exposed beyond localhost (#2750 @yuriydzobak) + + The node.cloudprovider.kubernetes.io/uninitialized taint on new nodes is + now cleared more reliably (#2843) + + Embedded etc snapshots can now be performed on-demand (#2819) + + K3s no longer validates containerd snapshotter functionality when not + using the embedded containerd (#2800 @sonicaj) + * Embedded Component Versions + * Kubernetes v1.20.4 + * Kine v0.6.0 + * SQLite 3.33.0 + * Etcd v3.4.13-k3s1 + * Containerd v1.4.3-k3s3 + * Flannel v0.12.0-k3s1 + * Metrics-server v0.3.6 + * Traefik v1.7.19 + * CoreDNS v1.8.0 + * Helm-controller v0.8.3 + * Local-path-provisioner v0.0.19 +- Refresh cni-bin-dir.patch +- hyperkube no longer available + +------------------------------------------------------------------- Old: ---- k3s-0.4.0.tar.gz New: ---- k3s-1.20.4+k3s1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3s.spec ++++++ --- /var/tmp/diff_new_pack.hV9Q58/_old 2021-03-30 21:50:11.714902403 +0200 +++ /var/tmp/diff_new_pack.hV9Q58/_new 2021-03-30 21:50:11.718902407 +0200 @@ -1,7 +1,7 @@ # # spec file for package k3s # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,16 +20,16 @@ %define build_kubectl 1 # baseversion - version of kubernetes for this package -%define baseversion 1.14 +%define baseversion 1.20 Name: k3s -Version: 0.4.0 +Version: 1.20.4+k3s1 Release: 0 Summary: A container orchestration system based on a reduced Kubernetes feature set License: Apache-2.0 Group: System/Management URL: https://k3s.io -Source0: https://github.com/rancher/k3s/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/k3s-io/k3s/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: k3s-server.service Source2: k3s-agent.service Source3: server.conf @@ -68,18 +68,8 @@ * There is a new launcher that handles a lot of the complexity of TLS and options. -%package hyperkube -Summary: The Kubernetes server components from k3s -Group: System/Management -Requires: %{name} = %{version} -Conflicts: kubernetes-common - -%description hyperkube -hyperkube from k3s. hyperkube is an all-in-one binary for the -Kubernetes server components. - %prep -%setup -q +%setup -q -n %{name}-%(echo %{version} | tr '+' '-') sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{PATCH0} %patch0 -p1 @@ -89,7 +79,6 @@ %if %{build_kubectl} %{gobuild} ./cmd/kubectl %endif -%{gobuild} ./vendor/k8s.io/kubernetes/cmd/hyperkube %install %{goinstall} @@ -97,7 +86,6 @@ %{goinstall} ./cmd/kubectl mv -v %{buildroot}%{_bindir}/kubectl %{buildroot}%{_bindir}/kubectl%{baseversion} %endif -%{goinstall} ./vendor/k8s.io/kubernetes/cmd/hyperkube # Install symlinks pushd %{buildroot}%{_bindir} @@ -161,7 +149,4 @@ %{_sbindir}/rck3s-server %ghost %_sysconfdir/alternatives/kubectl -%files hyperkube -%{_bindir}/hyperkube - %changelog ++++++ cni-bin-dir.patch ++++++ --- /var/tmp/diff_new_pack.hV9Q58/_old 2021-03-30 21:50:11.754902437 +0200 +++ /var/tmp/diff_new_pack.hV9Q58/_new 2021-03-30 21:50:11.754902437 +0200 @@ -1,12 +1,12 @@ -diff -u -r k3s-0.1.0.orig/pkg/agent/config/config.go k3s-0.1.0/pkg/agent/config/config.go ---- k3s-0.1.0.orig/pkg/agent/config/config.go 2019-02-28 14:03:10.799290792 +0100 -+++ k3s-0.1.0/pkg/agent/config/config.go 2019-02-28 14:10:39.627579439 +0100 -@@ -150,7 +150,7 @@ - return nil, err +diff -ur k3s-1.20.4-k3s1.orig/pkg/agent/config/config.go k3s-1.20.4-k3s1/pkg/agent/config/config.go +--- k3s-1.20.4-k3s1.orig/pkg/agent/config/config.go 2021-02-18 23:51:40.000000000 +0100 ++++ k3s-1.20.4-k3s1/pkg/agent/config/config.go 2021-03-25 15:23:56.297142787 +0100 +@@ -463,7 +463,7 @@ } -- hostLocal, err := exec.LookPath("host-local") -+ hostLocal, err := exec.LookPath("@LIBEXECDIR@/cni/host-local") - if err != nil { - return nil, errors.Wrapf(err, "failed to find host-local") - } + if !nodeConfig.NoFlannel { +- hostLocal, err := exec.LookPath("host-local") ++ hostLocal, err := exec.LookPath("/usr/libexec/cni/host-local") + if err != nil { + return nil, errors.Wrapf(err, "failed to find host-local") + }