Hello community, here is the log from the commit of package cilium for openSUSE:Factory checked in at 2020-03-11 18:33:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cilium (Old) and /work/SRC/openSUSE:Factory/.cilium.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cilium" Wed Mar 11 18:33:53 2020 rev:23 rq:783750 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cilium/cilium.changes 2020-02-29 21:20:06.754001460 +0100 +++ /work/SRC/openSUSE:Factory/.cilium.new.3160/cilium.changes 2020-03-11 18:34:55.126993370 +0100 @@ -1,0 +2,10 @@ +Mon Mar 9 11:03:44 UTC 2020 - Michał Rostecki <[email protected]> + +- Remove cilium-init package. + +------------------------------------------------------------------- +Fri Mar 6 10:50:09 UTC 2020 - Michał Rostecki <[email protected]> + +- Add bpftool as a runtime dependency. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cilium.spec ++++++ --- /var/tmp/diff_new_pack.64fsqp/_old 2020-03-11 18:34:56.630994293 +0100 +++ /var/tmp/diff_new_pack.64fsqp/_new 2020-03-11 18:34:56.630994293 +0100 @@ -71,6 +71,7 @@ BuildRequires: golang(API) = 1.13 Requires: awk Requires: binutils +Requires: bpftool %requires_eq cilium-proxy # clang is needed as runtime dependency for compiling BPF programs by cilium Requires: clang @@ -130,19 +131,6 @@ This package provides a Docker libnetwork plugin for Cilium. -%package init -Summary: Script for the Cilium init container - -%description init -Cilium is a software for providing, and transparently securing, network -connectivity, and for load-balancing between application containers and -services deployed using Linux container management platforms like Docker and -Kubernetes. - -This package provides a script for the Cilium init container which cleans BPF -maps states which should be executed before launching Cilium in Kubernetes -clusters. - %package operator Summary: Kubernetes operator for Cilium @@ -259,7 +247,6 @@ sed -i \ -e 's|cniInstallScript: /cni-install.sh|cilium-cni-install|' \ -e 's|cniUninstallScript: /cni-uninstall.sh|cilium-cni-uninstall|' \ - -e 's|initImage: cilium|initImage: cilium-init|' \ -e 's|initScript: /init-container.sh|initScript: cilium-init|' \ %{buildroot}%{_datadir}/k8s-helm/cilium/charts/agent/values.yaml sed -i \ @@ -317,6 +304,7 @@ %{_bindir}/cilium-bugtool %{_bindir}/cilium-health %{_bindir}/cilium-health-responder +%{_bindir}/cilium-init %{_bindir}/cilium-map-migrate %{_bindir}/cilium-node-monitor %{_bindir}/maptool @@ -336,9 +324,6 @@ %{_sbindir}/rccilium-docker %{_bindir}/cilium-docker -%files init -%{_bindir}/cilium-init - %files operator %{_bindir}/cilium-operator ++++++ 0004-helm-Allow-variables-for-compatibility-with-openSUSE.patch ++++++ --- /var/tmp/diff_new_pack.64fsqp/_old 2020-03-11 18:34:56.642994300 +0100 +++ /var/tmp/diff_new_pack.64fsqp/_new 2020-03-11 18:34:56.646994303 +0100 @@ -1,4 +1,4 @@ -From 74e791429bb4483c9039a4c93ba0b398991bb73b Mon Sep 17 00:00:00 2001 +From 6f533168004d9bdc7be259e0b0860bc6b4792936 Mon Sep 17 00:00:00 2001 From: Michal Rostecki <[email protected]> Date: Mon, 24 Feb 2020 19:57:31 +0100 Subject: [PATCH 4/4] helm: Allow variables for compatibility with openSUSE @@ -16,18 +16,15 @@ - cniUninstallScript - path or command of the script which uninstalls CNI plugin (default: /cni-uninstall.sh; openSUSE: cilium-cni-uninstall) -- initImage - name of the image used for the init container - (default: cilium; openSUSE: cilium-init) - initScript - path or command of the init container script (default: /init-container.sh; openSUSE: cilium-init) -There are two motivations behind those values: -- openSUSE images use only RPM packages, RPM packages have strict rules - where files can be installed. It's against openSUSE policies to - install scipts in the / directory, they have to be installed in - /usr/bin. Having ".sh" in names of installed scripts is discouraged. -- openSUSE ships a separate container image for the init container - script, which has its own dedicated RPM package. +Reason behind those changes is that openSUSE images use only RPM +packages as the source of any files. rpmlint has strict rules where +files can be installed. It's against rpmlintrc rules and openSUSE +policies to install scripts in the / directory, they have to be +installed in /usr/bin. Having ".sh" extensions in names of installed +scripts is discouraged. After this commit, generating YAML manifest using openSUSE images can be done with: @@ -39,7 +36,6 @@ --set global.tag=1.6.5 \ --set agent.cniInstallScript=cilium-cni-install \ --set agent.cniUninstallScript=cilium-cni-uninstall \ - --set agent.initImage=cilium-init \ --set agent.initScript=cilium-init \ --set operator.image=cilium-operator > opensuse.yaml @@ -48,8 +44,8 @@ Signed-off-by: Michal Rostecki <[email protected]> --- .../charts/agent/templates/daemonset.yaml | 18 +++++++++--------- - .../kubernetes/cilium/charts/agent/values.yaml | 4 ++++ - 2 files changed, 13 insertions(+), 9 deletions(-) + .../kubernetes/cilium/charts/agent/values.yaml | 3 +++ + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/install/kubernetes/cilium/charts/agent/templates/daemonset.yaml b/install/kubernetes/cilium/charts/agent/templates/daemonset.yaml index fe99c9e53..de24ad7c4 100644 @@ -108,14 +104,13 @@ imagePullPolicy: {{ .Values.global.pullPolicy }} name: clean-cilium-state diff --git a/install/kubernetes/cilium/charts/agent/values.yaml b/install/kubernetes/cilium/charts/agent/values.yaml -index 233d3e068..d534de3d2 100644 +index 233d3e068..788bde816 100644 --- a/install/kubernetes/cilium/charts/agent/values.yaml +++ b/install/kubernetes/cilium/charts/agent/values.yaml -@@ -1,4 +1,8 @@ +@@ -1,4 +1,7 @@ +cniInstallScript: /cni-install.sh +cniUninstallScript: /cni-uninstall.sh image: cilium -+initImage: cilium +initScript: /init-container.sh # Specifies the maximum number of Pods that can be unavailable during the
