Hello community,
here is the log from the commit of package nginx-ingress-controller for
openSUSE:Factory checked in at 2018-10-04 19:02:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nginx-ingress-controller (Old)
and /work/SRC/openSUSE:Factory/.nginx-ingress-controller.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nginx-ingress-controller"
Thu Oct 4 19:02:36 2018 rev:4 rq:639915 version:0.15.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/nginx-ingress-controller/nginx-ingress-controller.changes
2018-08-20 16:23:27.833165712 +0200
+++
/work/SRC/openSUSE:Factory/.nginx-ingress-controller.new/nginx-ingress-controller.changes
2018-10-04 19:02:40.279129133 +0200
@@ -1,0 +2,17 @@
+Thu Oct 4 08:52:31 UTC 2018 - Michał Rostecki <[email protected]>
+
+- Require at least 1.9 version of Go (newer versions can be used)
+- Use https instead of http in links
+
+-------------------------------------------------------------------
+Tue Oct 2 16:31:23 UTC 2018 - [email protected]
+
+- Cleanup of the spec file:
+ * Unpack source code using RPM macros. This makes easier to apply
+ patches
+ * Use go packaging macros to setup the build environment
+ * Get rid of the Go 1.9 requirment, even 1.11 is working fine
+- Add 'rootless-is-port-available.patch': this is a backport of a fix
+ that allows the controller to run as non-root user. bsc#1107700
+
+-------------------------------------------------------------------
New:
----
rootless-is-port-available.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nginx-ingress-controller.spec ++++++
--- /var/tmp/diff_new_pack.BRRyX6/_old 2018-10-04 19:02:40.791128593 +0200
+++ /var/tmp/diff_new_pack.BRRyX6/_new 2018-10-04 19:02:40.795128589 +0200
@@ -12,10 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+%global import_path k8s.io/ingress-nginx
+
Name: nginx-ingress-controller
Version: 0.15.0
Release: 0
@@ -25,7 +27,10 @@
Url: https://github.com/kubernetes/ingress-nginx
Source0:
https://github.com/kubernetes/ingress-nginx/archive/nginx-%{version}.tar.gz#/ingress-nginx-%{version}.tar.gz
Source1: nginx-ingress-controller-rpmlintrc
-BuildRequires: go1.9
+Patch0: rootless-is-port-available.patch
+Requires(pre): %fillup_prereq
+BuildRequires: golang-packaging
+BuildRequires: golang(API) >= 1.9
%description
An Ingress controller is meant to handle all the quirks associated
@@ -47,24 +52,22 @@
* Serve 200 on a /healthz
%prep
-mkdir -p %{name}-%{version}/src/k8s.io/ingress-nginx
-tar zxf %{SOURCE0} --strip-components=1 -C
%{name}-%{version}/src/k8s.io/ingress-nginx
+%setup -q -n ingress-nginx-nginx-%{version}
+%patch0 -p1
%build
-export GOPATH=$(pwd)/%{name}-%{version}
-cd %{name}-%{version}/src/k8s.io/ingress-nginx
-CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o
nginx-ingress-controller k8s.io/ingress-nginx/cmd/nginx
-
-cd images/404-server
-CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o
kubernetes-404-server
+%goprep %{import_path}
+export GOPATH=${RPM_BUILD_DIR}/go
+CGO_ENABLED=0 go build -a -installsuffix cgo -o nginx-ingress-controller
k8s.io/ingress-nginx/cmd/nginx
+CGO_ENABLED=0 go build -a -installsuffix cgo -o kubernetes-404-server
k8s.io/ingress-nginx/images/404-server
%install
-install -D -m 0755
%{name}-%{version}/src/k8s.io/ingress-nginx/nginx-ingress-controller
%{buildroot}%{_bindir}/nginx-ingress-controller
-install -D -m 0755
%{name}-%{version}/src/k8s.io/ingress-nginx/images/404-server/kubernetes-404-server
%{buildroot}%{_bindir}/kubernetes-404-server
+install -D -m 0755 nginx-ingress-controller
%{buildroot}%{_bindir}/nginx-ingress-controller
+install -D -m 0755 kubernetes-404-server
%{buildroot}%{_bindir}/kubernetes-404-server
%files
%{_bindir}/nginx-ingress-controller
-%license %{name}-%{version}/src/k8s.io/ingress-nginx/LICENSE
+%license LICENSE
%files -n kubernetes-404-server
%{_bindir}/kubernetes-404-server
++++++ rootless-is-port-available.patch ++++++
Index: ingress-nginx-nginx-0.15.0/internal/net/net.go
===================================================================
--- ingress-nginx-nginx-0.15.0.orig/internal/net/net.go
+++ ingress-nginx-nginx-0.15.0/internal/net/net.go
@@ -29,12 +29,12 @@ func IsIPV6(ip _net.IP) bool {
// IsPortAvailable checks if a TCP port is available or not
func IsPortAvailable(p int) bool {
- ln, err := _net.Listen("tcp", fmt.Sprintf(":%v", p))
+ conn, err := _net.Dial("tcp", fmt.Sprintf(":%v", p))
if err != nil {
- return false
+ return true
}
- ln.Close()
- return true
+ defer conn.Close()
+ return false
}
// IsIPv6Enabled checks if IPV6 is enabled or not
