Hello community, here is the log from the commit of package cilium for openSUSE:Factory checked in at 2020-11-02 09:41:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cilium (Old) and /work/SRC/openSUSE:Factory/.cilium.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cilium" Mon Nov 2 09:41:18 2020 rev:30 rq:845100 version:1.8.5 Changes: -------- --- /work/SRC/openSUSE:Factory/cilium/cilium.changes 2020-08-16 20:27:35.898108844 +0200 +++ /work/SRC/openSUSE:Factory/.cilium.new.3463/cilium.changes 2020-11-02 09:41:37.845681164 +0100 @@ -1,0 +2,21 @@ +Fri Oct 30 16:50:02 UTC 2020 - Michał Rostecki <mroste...@suse.com> + +- Update to 1.8.5 + * Release notes: https://github.com/cilium/cilium/releases/tag/v1.8.5 +- Remove patches which were included upstream: + * 0001-option-mark-keep-bpf-templates-as-deprecated.patch + * 0002-make-remove-the-need-for-go-bindata.patch + * 0003-bpf-don-t-use-fixed-size-integer-types-from-stdint.h.patch + * 0005-bpf-re-add-a-proper-types.h-mapper.patch + * 0006-build-Avoid-using-git-if-not-in-a-git-repo.patch + * 0007-option-rename-PolicyMapMaxEntries-to-PolicyMapEntrie.patch + * 0008-helm-allow-to-configure-bpf-nat-global-max-using-Hel.patch + * 0009-option-reduce-default-number-for-TCP-CT-and-NAT-tabl.patch + * 0010-daemon-add-option-to-dynamically-size-BPF-maps-based.patch +- Remove downstream patch which is not needed anymore (now it's + enough to just modify the Helm chart with sed to set out images): + * 0004-helm-Allow-variables-for-compatibility-with-openSUSE.patch +- Add upstream patch for installing the operator binary: + * 0001-operator-make-Add-install-target.patch + +------------------------------------------------------------------- Old: ---- 0001-option-mark-keep-bpf-templates-as-deprecated.patch 0002-make-remove-the-need-for-go-bindata.patch 0003-bpf-don-t-use-fixed-size-integer-types-from-stdint.h.patch 0004-helm-Allow-variables-for-compatibility-with-openSUSE.patch 0005-bpf-re-add-a-proper-types.h-mapper.patch 0006-build-Avoid-using-git-if-not-in-a-git-repo.patch 0007-option-rename-PolicyMapMaxEntries-to-PolicyMapEntrie.patch 0008-helm-allow-to-configure-bpf-nat-global-max-using-Hel.patch 0009-option-reduce-default-number-for-TCP-CT-and-NAT-tabl.patch 0010-daemon-add-option-to-dynamically-size-BPF-maps-based.patch cilium-1.7.6.obscpio New: ---- 0001-operator-make-Add-install-target.patch cilium-1.8.5.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cilium.spec ++++++ --- /var/tmp/diff_new_pack.fm2RQv/_old 2020-11-02 09:41:39.389682646 +0100 +++ /var/tmp/diff_new_pack.fm2RQv/_new 2020-11-02 09:41:39.393682649 +0100 @@ -35,7 +35,7 @@ %endif Name: cilium -Version: 1.7.6 +Version: 1.8.5 Release: 0 Summary: Linux Native, HTTP Aware Networking and Security for Containers License: Apache-2.0 AND GPL-2.0-or-later @@ -44,28 +44,8 @@ Source1: %{name}-rpmlintrc Source2: cilium-cni-install Source3: cilium-cni-uninstall -# PATCH-FIX-UPSTREAM 0001-option-mark-keep-bpf-templates-as-deprecated.patch -Patch1: 0001-option-mark-keep-bpf-templates-as-deprecated.patch -# PATCH-FIX-UPSTREAM 0002-make-remove-the-need-for-go-bindata.patch -Patch2: 0002-make-remove-the-need-for-go-bindata.patch -# PATCH-FIX-UPSTREAM 0003-bpf-don-t-use-fixed-size-integer-types-from-stdint.h.patch -Patch3: 0003-bpf-don-t-use-fixed-size-integer-types-from-stdint.h.patch -# PATCH-FIX-OPENSUSE 0004-helm-Allow-variables-for-compatibility-with-openSUSE.patch -# TODO(mrostecki): Submit it upstream after we confirm that our images work 100% -# fine, also on aarch64. -Patch4: 0004-helm-Allow-variables-for-compatibility-with-openSUSE.patch -# PATCH-FIX-UPSTREAM 0005-bpf-re-add-a-proper-types.h-mapper.patch -Patch5: 0005-bpf-re-add-a-proper-types.h-mapper.patch -# PATCH-FIX-UPSTREAM 0006-build-Avoid-using-git-if-not-in-a-git-repo.patch -Patch6: 0006-build-Avoid-using-git-if-not-in-a-git-repo.patch -# PATCH-FIX-UPSTREAM 0007-option-rename-PolicyMapMaxEntries-to-PolicyMapEntrie.patch -Patch7: 0007-option-rename-PolicyMapMaxEntries-to-PolicyMapEntrie.patch -# PATCH-FIX-UPSTREAM 0008-helm-allow-to-configure-bpf-nat-global-max-using-Hel.patch -Patch8: 0008-helm-allow-to-configure-bpf-nat-global-max-using-Hel.patch -# PATCH-FIX-UPSTREAM 0009-option-reduce-default-number-for-TCP-CT-and-NAT-tabl.patch -Patch9: 0009-option-reduce-default-number-for-TCP-CT-and-NAT-tabl.patch -# PATCH-FIX-UPSTREAM 0010-daemon-add-option-to-dynamically-size-BPF-maps-based.patch -Patch10: 0010-daemon-add-option-to-dynamically-size-BPF-maps-based.patch +# PATCH-FIX-UPSTREAM 0001-operator-make-Add-install-target.patch +Patch0: 0001-operator-make-Add-install-target.patch # Cilium needs to be aware of the version string of cilium-proxy BuildRequires: cilium-proxy BuildRequires: clang @@ -262,10 +242,10 @@ -e 's|tag: v%{version}|tag: %{version}|' \ %{buildroot}%{_datadir}/k8s-helm/cilium/values.yaml sed -i \ - -e 's|cniInstallScript: /cni-install.sh|cniInstallScript: cilium-cni-install|' \ - -e 's|cniUninstallScript: /cni-uninstall.sh|cniUninstallScript: cilium-cni-uninstall|' \ - -e 's|initScript: /init-container.sh|initScript: cilium-init|' \ - %{buildroot}%{_datadir}/k8s-helm/cilium/charts/agent/values.yaml + -e 's|/cni-install.sh|cilium-cni-install|' \ + -e 's|/cni-uninstall.sh|cilium-cni-uninstall|' \ + -e 's|/init-container.sh|cilium-init|' \ + %{buildroot}%{_datadir}/k8s-helm/cilium/charts/agent/templates/daemonset.yaml sed -i \ -e 's|image: operator|image: cilium-operator|' \ %{buildroot}%{_datadir}/k8s-helm/cilium/charts/operator/values.yaml @@ -273,6 +253,7 @@ mkdir -p %{buildroot}%{bash_completion_dir} %{buildroot}%{_bindir}/cilium completion > %{buildroot}%{bash_completion_dir}/cilium rm %{buildroot}%{_sysconfdir}/bash_completion.d/cilium +mv %{buildroot}%{_sysconfdir}/bash_completion.d/hubble-relay %{buildroot}%{bash_completion_dir}/hubble-relay mv %{buildroot}%{_sysconfdir}/cni/net.d/05-cilium-cni.conf %{buildroot}%{_sysconfdir}/cni/net.d/10-cilium-cni.conf @@ -308,6 +289,7 @@ %files %{bash_completion_dir}/cilium +%{bash_completion_dir}/hubble-relay %{_fillupdir}/sysconfig.cilium %{_unitdir}/cilium-consul.service %{_unitdir}/cilium-etcd.service @@ -324,6 +306,8 @@ %{_bindir}/cilium-init %{_bindir}/cilium-map-migrate %{_bindir}/cilium-node-monitor +%{_bindir}/cilium-probe-kernel-hz +%{_bindir}/hubble-relay %{_bindir}/maptool %{_localstatedir}/lib/cilium %license LICENSE @@ -344,6 +328,9 @@ %files operator %{_bindir}/cilium-operator +%{_bindir}/cilium-operator-aws +%{_bindir}/cilium-operator-azure +%{_bindir}/cilium-operator-generic %files -n %{lname} %{_libdir}/libcilium.so.%{sover} ++++++ 0001-operator-make-Add-install-target.patch ++++++ >From 36059fb7b4282da8e8674937fee986d1c88c486d Mon Sep 17 00:00:00 2001 From: Michal Rostecki <mroste...@opensuse.org> Date: Fri, 19 Jun 2020 13:07:46 +0200 Subject: [PATCH] operator: make: Add install target Add `install` make target which installs cilium-operator binaries. Fixes: #12184 Signed-off-by: Michal Rostecki <mroste...@opensuse.org> --- operator/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/operator/Makefile b/operator/Makefile index dc88e5f80..8da5d7ea0 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -26,3 +26,7 @@ clean: @$(ECHO_CLEAN) $(QUIET)rm -f $(TARGETS) $(GO) clean $(GOCLEAN) + +install: $(TARGETS) + $(QUIET)$(INSTALL) -m 0755 -d $(DESTDIR)$(BINDIR) + $(foreach target,$(TARGETS), $(QUIET)$(INSTALL) -m 0755 $(target) $(DESTDIR)$(BINDIR);) -- 2.29.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.fm2RQv/_old 2020-11-02 09:41:39.445682699 +0100 +++ /var/tmp/diff_new_pack.fm2RQv/_new 2020-11-02 09:41:39.445682699 +0100 @@ -4,7 +4,8 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">refs/tags/v1.7.6</param> + <param name="versionrewrite-pattern">v(.*)</param> + <param name="revision">refs/tags/v1.8.5</param> <param name="filename">cilium</param> <param name="changesgenerate">disable</param> </service> ++++++ cilium-1.7.6.obscpio -> cilium-1.8.5.obscpio ++++++ /work/SRC/openSUSE:Factory/cilium/cilium-1.7.6.obscpio /work/SRC/openSUSE:Factory/.cilium.new.3463/cilium-1.8.5.obscpio differ: char 27, line 1 ++++++ cilium.obsinfo ++++++ --- /var/tmp/diff_new_pack.fm2RQv/_old 2020-11-02 09:41:39.529682780 +0100 +++ /var/tmp/diff_new_pack.fm2RQv/_new 2020-11-02 09:41:39.529682780 +0100 @@ -1,5 +1,5 @@ name: cilium -version: 1.7.6 -mtime: 1593726906 -commit: 4dce9cb9eaeef9f8cef71eda65bbd926d7bde7e9 +version: 1.8.5 +mtime: 1603927672 +commit: fc1a8ac7c35bbf5f1c1d93a94358e17c61662e2d
