Hello community, here is the log from the commit of package weave for openSUSE:Leap:15.2 checked in at 2020-03-13 10:59:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/weave (Old) and /work/SRC/openSUSE:Leap:15.2/.weave.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "weave" Fri Mar 13 10:59:36 2020 rev:2 rq:784429 version:2.6.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/weave/weave.changes 2020-02-19 18:36:24.781692199 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.weave.new.3160/weave.changes 2020-03-13 11:01:42.008619700 +0100 @@ -1,0 +2,17 @@ +Tue Mar 10 11:17:28 CET 2020 - [email protected] + +- Fix typo in url + +------------------------------------------------------------------- +Mon Mar 9 15:17:01 UTC 2020 - Thorsten Kukuk <[email protected]> + +- weave-kubic needs modprobe + +------------------------------------------------------------------- +Mon Mar 9 15:05:02 UTC 2020 - Thorsten Kukuk <[email protected]> + +- Update weave to 2.6.1 + - Fix possible deadlock + - disable-iptables-setup.patch + +------------------------------------------------------------------- Old: ---- vendor.tar.gz weave-2.6.0.tar.gz weave-k8s-1.16.yaml New: ---- disable-iptables-setup.patch vendor.tar.xz weave-2.6.1.tar.gz weave-daemonset-k8s-1.11.yaml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ weave.spec ++++++ --- /var/tmp/diff_new_pack.3W87az/_old 2020-03-13 11:01:42.528620071 +0100 +++ /var/tmp/diff_new_pack.3W87az/_new 2020-03-13 11:01:42.528620071 +0100 @@ -1,7 +1,7 @@ # # spec file for package weave # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,20 @@ Name: weave -Version: 2.6.0 +Version: 2.6.1 Release: 0 Summary: Pod Network Add-On License: Apache-2.0 Group: System/Management URL: https://github.com/weaveworks/weave Source: %{name}-%{version}.tar.gz -Source1: vendor.tar.gz -Source2: weave-k8s-1.16.yaml +Source1: vendor.tar.xz +Source2: weave-daemonset-k8s-1.11.yaml # This package contains the content of a container image, so yes, # this includes the home directory and the database. Source3: weave-rpmlintrc Patch0: Makefile.diff -#BuildRequires: golang-packaging +Patch1: disable-iptables-setup.patch BuildRequires: binutils-gold BuildRequires: libpcap-devel BuildRequires: golang(API) >= 1.12 @@ -55,6 +55,7 @@ Requires: iproute2 Requires: ipset Requires: iptables +Requires: kmod-compat %description kube Weave Net creates a virtual network that connects containers across multiple @@ -103,6 +104,7 @@ rm -rf vendor tar xf %{SOURCE1} %patch0 -p1 +%patch1 -p1 %build make %{?_smp_mflags} exes WEAVE_VERSION=%{version} @@ -126,6 +128,7 @@ mkdir -p %{buildroot}%{_datadir}/k8s-yaml/weave install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/k8s-yaml/weave/weave.yaml +sed -i -e 's|weaveworks/weave-|registry.opensuse.org/kubic/weave-|g' %{buildroot}%{_datadir}/k8s-yaml/weave/weave.yaml %files kube %license LICENSE ++++++ disable-iptables-setup.patch ++++++ --- a/prog/weave-kube/launch.sh +++ b/prog/weave-kube/launch.sh 2020/03/09 14:39:53 @@ -52,7 +52,7 @@ [ -z "$NOT_EXIST" ] || (echo "\"xt_set\" does not exist" >&2 && return 1) } -setup_iptables_backend +#setup_iptables_backend # Default if not supplied - same as weave net default IPALLOC_RANGE=${IPALLOC_RANGE:-10.32.0.0/12} --- a/prog/weave-npc/launch.sh +++ b/prog/weave-npc/launch.sh 2020/03/09 14:40:07 @@ -30,7 +30,7 @@ fi } -setup_iptables_backend +#setup_iptables_backend # Start weave-npc with any flags specified in $EXTRA_ARGS as well as any flags passed to this container (for backwards compatibility) exec /usr/bin/weave-npc $EXTRA_ARGS $@ ++++++ weave-2.6.0.tar.gz -> weave-2.6.1.tar.gz ++++++ /work/SRC/openSUSE:Leap:15.2/weave/weave-2.6.0.tar.gz /work/SRC/openSUSE:Leap:15.2/.weave.new.3160/weave-2.6.1.tar.gz differ: char 12, line 1 ++++++ weave-daemonset-k8s-1.11.yaml ++++++ apiVersion: v1 kind: List items: - apiVersion: v1 kind: ServiceAccount metadata: name: weave-net labels: name: weave-net namespace: kube-system - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: weave-net labels: name: weave-net rules: - apiGroups: - '' resources: - pods - namespaces - nodes verbs: - get - list - watch - apiGroups: - extensions resources: - networkpolicies verbs: - get - list - watch - apiGroups: - 'networking.k8s.io' resources: - networkpolicies verbs: - get - list - watch - apiGroups: - '' resources: - nodes/status verbs: - patch - update - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: weave-net labels: name: weave-net roleRef: kind: ClusterRole name: weave-net apiGroup: rbac.authorization.k8s.io subjects: - kind: ServiceAccount name: weave-net namespace: kube-system - apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: weave-net namespace: kube-system labels: name: weave-net rules: - apiGroups: - '' resources: - configmaps resourceNames: - weave-net verbs: - get - update - apiGroups: - '' resources: - configmaps verbs: - create - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: weave-net namespace: kube-system labels: name: weave-net roleRef: kind: Role name: weave-net apiGroup: rbac.authorization.k8s.io subjects: - kind: ServiceAccount name: weave-net namespace: kube-system - apiVersion: apps/v1 kind: DaemonSet metadata: name: weave-net labels: name: weave-net namespace: kube-system spec: # Wait 5 seconds to let pod connect before rolling next pod selector: matchLabels: name: weave-net minReadySeconds: 5 template: metadata: labels: name: weave-net spec: containers: - name: weave command: - /home/weave/launch.sh env: - name: HOSTNAME valueFrom: fieldRef: apiVersion: v1 fieldPath: spec.nodeName image: 'weaveworks/weave-kube:2.6.1' readinessProbe: httpGet: host: 127.0.0.1 path: /status port: 6784 resources: requests: cpu: 50m securityContext: privileged: true volumeMounts: - name: weavedb mountPath: /weavedb - name: cni-bin mountPath: /host/opt - name: cni-bin2 mountPath: /host/home - name: cni-conf mountPath: /host/etc - name: dbus mountPath: /host/var/lib/dbus - name: lib-modules mountPath: /lib/modules - name: xtables-lock mountPath: /run/xtables.lock readOnly: false - name: weave-npc env: - name: HOSTNAME valueFrom: fieldRef: apiVersion: v1 fieldPath: spec.nodeName image: 'weaveworks/weave-npc:2.6.1' #npc-args resources: requests: cpu: 50m securityContext: privileged: true volumeMounts: - name: xtables-lock mountPath: /run/xtables.lock readOnly: false hostNetwork: true dnsPolicy: ClusterFirstWithHostNet hostPID: true restartPolicy: Always securityContext: seLinuxOptions: {} serviceAccountName: weave-net tolerations: - effect: NoSchedule operator: Exists - effect: NoExecute operator: Exists volumes: - name: weavedb hostPath: path: /var/lib/weave - name: cni-bin hostPath: path: /opt - name: cni-bin2 hostPath: path: /home - name: cni-conf hostPath: path: /etc - name: dbus hostPath: path: /var/lib/dbus - name: lib-modules hostPath: path: /lib/modules - name: xtables-lock hostPath: path: /run/xtables.lock type: FileOrCreate priorityClassName: system-node-critical updateStrategy: type: RollingUpdate
