Hello community,

here is the log from the commit of package k3s for openSUSE:Factory checked in 
at 2019-03-28 22:49:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/k3s (Old)
 and      /work/SRC/openSUSE:Factory/.k3s.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "k3s"

Thu Mar 28 22:49:08 2019 rev:1 rq:689276 version:0.2.0

Changes:
--------
New Changes file:

--- /dev/null   2018-10-29 14:05:42.522318975 +0100
+++ /work/SRC/openSUSE:Factory/.k3s.new.25356/k3s.changes       2019-03-28 
22:49:10.159049495 +0100
@@ -0,0 +1,87 @@
+-------------------------------------------------------------------
+Fri Mar 15 18:57:35 UTC 2019 - Jan Engelhardt <[email protected]>
+
+- Replace the sales pitch in the description by new wording,
+  sourced from second block paragraph of k3s's README.md and
+  Wikipedia, so as to fulfill the openSUSE description
+  recommendations on what k3s is, and how it differs from other
+  implementations of its kind.
+
+-------------------------------------------------------------------
+Fri Mar 15 10:40:37 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Fix 'Conflicts'
+- Add 'iptables' requires
+- Package hyperkube sepraretly
+- Add a workaround for https://github.com/rancher/k3s/issues/231
+- Add kubectl and crictl symlinks
+- Update description
+
+-------------------------------------------------------------------
+Wed Mar 13 22:07:33 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Add requires to 'conntrack-tools' and 'runc' as it is needed at
+  runtime
+
+-------------------------------------------------------------------
+Wed Mar 13 15:07:20 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Fix k3s-agent.service as '-u' is not a valid option
+
+-------------------------------------------------------------------
+Tue Mar 12 15:02:30 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Update to version 0.2.0:
+  * Features and Enhancements:
+    - Support arbitrary CRI implementations [#107] - Users can now 
+    configure k3s to use cri-o and other CRI implementations that 
+    are not packaged into k3s.
+    - Support for preloading images [#92] - Users can now have node
+    agents load docker images from a location on the host at startup,
+    eliminating the need to pull images from a remote location.
+    - Upgrade to Kubernetes v1.13.4 [#95] - Update to the latest 
+    release of Kubernetes.
+    - Support k3s on Rancher [#69] - Users can now import k3s 
+    clusters into Rancher (supported in Rancher v2.2.0-rc3 and later).
+    - Support agent options in server command [#73] - Users can now
+    set any of the options available to agents when starting the k3s
+    server node.
+    - Support the ability to run k3s as non-root user [#38] - User 
+    can now run the k3s server as a non-root user.
+    - Support the ability to read node token from a file [#98] - Users
+    can now have the node-agent read its token from a file rather
+    than passing it as a string.
+  * Bug fixes:
+    - Fixed an issue where preloaded deployment manifests fail to
+    deploy if no namespace is specified #151
+    - Fixed an issue where changes to helm chart values or 
+    values.yaml aren't always triggering an upgrade #187
+    - Fixed an issue where nodes with uppercase hostnames hang 
+    indefinitely #160
+    - Fixed an issue where containerd log level environment variable 
+    is not respected #188
+    - Fixed an issue where node-token path doesn't resolve for root
+    user in agent scripts #189
+    - Fixed an issue where traefik is not listed in the --no-deploy 
+    flag's help text #186
+    - Fixed an issue where changing cluster CIDR was not possible #93
+    - Fixed an issue where k3s systemd service should wait until 
+    the server is ready #57
+    - Fixed an issue where test volume mount e2e fails for k3s 
+    image #45
+    - Fixed an issue where component status is not accurate #126
+    - Fixed an issue where install script fails if wget is not 
+    available #48
+    - Added the ability to dynamically install the latest release
+    of k3s #47
+
+-------------------------------------------------------------------
+Mon Mar  4 14:35:14 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Add _constraints to avoid 'cannot allocate memory' error seen 
+  on aarch64
+
+-------------------------------------------------------------------
+Thu Feb 28 07:33:11 UTC 2019 - Duncan Mac-Vicar <[email protected]>
+
+- Initial package - v0.1.0

New:
----
  _constraints
  agent.conf
  cni-bin-dir.patch
  k3s-0.2.0.tar.gz
  k3s-agent.service
  k3s-server.service
  k3s.changes
  k3s.spec
  server.conf

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ k3s.spec ++++++
#
# spec file for package k3s
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via https://bugs.opensuse.org/
#

# To workaround https://github.com/rancher/k3s/issues/231, build kubectl
%define build_kubectl 1

Name:           k3s
Version:        0.2.0
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
Source1:        k3s-server.service
Source2:        k3s-agent.service
Source3:        server.conf
Source4:        agent.conf
Patch0:         cni-bin-dir.patch
BuildRequires:  c_compiler
BuildRequires:  golang(API) >= 1.11
BuildRequires:  golang-packaging
BuildRequires:  pkgconfig
BuildRequires:  systemd-rpm-macros
BuildRequires:  pkgconfig(sqlite3)
Requires:       cni-plugins
Requires:       conntrack-tools
Requires:       containerd
Requires:       iptables
Requires:       runc
# Conflicts:      cri-tools
Conflicts:      kubectl
Conflicts:      kubernetes-client
%{?systemd_requires}

%description
k3s is a container orchestration system for automating application
deployment, scaling, and management. It is a Kubernetes-compliant
distribution that differs from the original Kubernetes (colloquially
"k8s") in that:

  * Legacy, alpha, or non-default features are removed.
  * Most in-tree plugins (cloud providers and storage plugins) were
    removed, since they can be replaced with out-of-tree addons.
  * sqlite3 is the default storage mechanism.
    etcd3 is still available, but not the default.
  * 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
%patch0 -p1

%build
%{goprep} github.com/rancher/k3s
%{gobuild}
%if %{build_kubectl}
%{gobuild} ./cmd/kubectl
%endif
%{gobuild} ./vendor/k8s.io/kubernetes/cmd/hyperkube

%install
%{goinstall}
%if %{build_kubectl}
%{goinstall} ./cmd/kubectl
%endif
%{goinstall} ./vendor/k8s.io/kubernetes/cmd/hyperkube

# Install symlinks
pushd %{buildroot}%{_bindir}
%if !%{build_kubectl}
ln -s k3s kubectl
%endif
# ln -s k3s crictl
popd

mkdir -p %{buildroot}%{_localstatedir}/lib/rancher/k3s
mkdir -p %{buildroot}%{_localstatedir}/lib/rancher/k3s/server/manifests

mkdir -p %{buildroot}%{_sysconfdir}/rancher/k3s
install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rancher/k3s/server.conf
install -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rancher/k3s/agent.conf

mkdir -p %{buildroot}%{_unitdir}
install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/k3s-server.service
install -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/k3s-agent.service
mkdir -p %{buildroot}%{_sbindir}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rck3s-server
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rck3s-agent

%pre
%service_add_pre k3s-server.service k3s-agent.service

%post
%service_add_post k3s-server.service k3s-agent.service

%preun
%service_del_preun k3s-server.service k3s-agent.service

%postun
%service_del_postun k3s-server.service k3s-agent.service

%files
%license LICENSE
%doc README.md
# %{_bindir}/crictl
%{_bindir}/k3s
%{_bindir}/kubectl
%{_localstatedir}/lib/rancher
%config %{_sysconfdir}/rancher
%config(noreplace) %{_sysconfdir}/rancher/k3s/agent.conf
%config(noreplace) %{_sysconfdir}/rancher/k3s/server.conf
%{_unitdir}/k3s-agent.service
%{_unitdir}/k3s-server.service
%{_sbindir}/rck3s-agent
%{_sbindir}/rck3s-server

%files hyperkube
%{_bindir}/hyperkube

%changelog
++++++ _constraints ++++++
<?xml version="1.0"?>
<constraints>
  <hardware>
    <memory>
      <size unit="G">4</size>
    </memory>
  </hardware>
</constraints>
++++++ agent.conf ++++++
SERVER_URL="https://myserver:6443";
NODE_TOKEN="REPLACE WITH TOKEN"
AGENT_OPTS=
#AGENT_OPTS="--no-flannel"
++++++ cni-bin-dir.patch ++++++
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
        }
 
-       hostLocal, err := exec.LookPath("host-local")
+       hostLocal, err := exec.LookPath("/usr/lib/cni/host-local")
        if err != nil {
                return nil, errors.Wrapf(err, "failed to find host-local")
        }
++++++ k3s-agent.service ++++++
[Unit]
Description=Lightweight Kubernetes
Documentation=https://k3s.io
After=network.target

[Service]
ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay
EnvironmentFile=/etc/rancher/k3s/agent.conf
ExecStart=/usr/bin/k3s agent --server ${SERVER_URL} --token ${NODE_TOKEN} 
${AGENT_OPTS}
KillMode=process
Delegate=yes
LimitNOFILE=infinity
LimitNPROC=infinity
LimitCORE=infinity
TasksMax=infinity

[Install]
WantedBy=multi-user.target
++++++ k3s-server.service ++++++
[Unit]
Description=Lightweight Kubernetes
Documentation=https://k3s.io
After=network.target

[Service]
ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay
EnvironmentFile=/etc/rancher/k3s/server.conf
ExecStart=/usr/bin/k3s server ${SERVER_OPTS}
KillMode=process
Delegate=yes
LimitNOFILE=infinity
LimitNPROC=infinity
LimitCORE=infinity
TasksMax=infinity

[Install]
WantedBy=multi-user.target
++++++ server.conf ++++++
SERVER_OPTS=
#SERVER_OPS="--no-deploy coredns --disable-agent"

Reply via email to