Skip to content

[WIP] template/router: explicitly handle "no child processes" error #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
frobware wants to merge 5 commits into from
Closed

[WIP] template/router: explicitly handle "no child processes" error #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b88763
Drop library-go/pkg/proc
frobware Jan 10, 2020
ac0bfaf
template/router: drop call to StartReaper
frobware Jan 10, 2020
99a59a3
images/router/haproxy: switch entrypoint to catatonit
frobware Jan 10, 2020
e7d6e4f
template/router/base: build catatonit
frobware Jan 10, 2020
dbdbb64
Add catatonit-0.1.4.tar.gz
frobware Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added catatonit-0.1.4.tar.gz
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ require (
github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292
github.com/fsnotify/fsnotify v1.4.7
github.com/getsentry/raven-go v0.2.0 // indirect
github.com/go-logr/logr v0.1.0
github.com/go-logr/zapr v0.1.1 // indirect
github.com/gocarina/gocsv v0.0.0-20190927101021-3ecffd272576
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/openshift/api v3.9.1-0.20190927132434-86c3b775619d+incompatible
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49P
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
github.com/go-logr/zapr v0.1.1 h1:qXBXPDdNncunGs7XeEpsJt8wCjYBygluzfdLO0G5baE=
github.com/go-logr/zapr v0.1.1/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk=
github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
github.com/go-openapi/jsonpointer v0.19.2 h1:A9+F4Dc/MCNB5jibxf6rRvOvR/iFgQdyNx9eIhnGqq0=
github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
Expand Down
11 changes: 10 additions & 1 deletion images/router/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@ FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
WORKDIR /go/src/github.com/openshift/router
COPY . .
RUN make

COPY catatonit-0.1.4.tar.gz .
RUN INSTALL_DEV_PKGS="automake libtool" && \
yum install -y $INSTALL_DEV_PKGS && \
tar xvzf catatonit-0.1.4.tar.gz && \
cd catatonit-0.1.4 && \
autoreconf -fvi && ./configure && make && \
pwd && \
ls -lR && \
yum remove -y $INSTALL_DEV_PKGS
FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
COPY --from=builder /go/src/github.com/openshift/router/openshift-router /usr/bin/
COPY --from=builder /go/src/github.com/openshift/router/catatonit-0.1.4/catatonit /usr/bin/
LABEL io.k8s.display-name="OpenShift Router" \
io.k8s.description="This is the base image from which all template based routers inherit." \
io.openshift.tags="openshift,router"
2 changes: 1 addition & 1 deletion images/router/haproxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ EXPOSE 80 443
WORKDIR /var/lib/haproxy/conf
ENV TEMPLATE_FILE=/var/lib/haproxy/conf/haproxy-config.template \
RELOAD_SCRIPT=/var/lib/haproxy/reload-haproxy
ENTRYPOINT ["/usr/bin/openshift-router"]
ENTRYPOINT ["/usr/bin/catatonit", "--", "/usr/bin/openshift-router"]
2 changes: 1 addition & 1 deletion images/router/haproxy/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ EXPOSE 80 443
WORKDIR /var/lib/haproxy/conf
ENV TEMPLATE_FILE=/var/lib/haproxy/conf/haproxy-config.template \
RELOAD_SCRIPT=/var/lib/haproxy/reload-haproxy
ENTRYPOINT ["/usr/bin/openshift-router"]
ENTRYPOINT ["/usr/bin/catatonit", "--", "/usr/bin/openshift-router"]
3 changes: 0 additions & 3 deletions pkg/cmd/infra/router/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (
routeclientset "github.com/openshift/client-go/route/clientset/versioned"
routelisters "github.com/openshift/client-go/route/listers/route/v1"
"github.com/openshift/library-go/pkg/crypto"
"github.com/openshift/library-go/pkg/proc"

"github.com/openshift/router/pkg/router"
"github.com/openshift/router/pkg/router/controller"
Expand Down Expand Up @@ -539,8 +538,6 @@ func (o *TemplateRouterOptions) Run() error {
c.Run()
}

proc.StartReaper()

select {}
}

Expand Down
37 changes: 0 additions & 37 deletions vendor/github.com/openshift/library-go/pkg/proc/reaper.go
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions vendor/github.com/openshift/library-go/pkg/proc/reaper_unsupported.go
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ github.com/openshift/client-go/route/clientset/versioned/typed/route/v1/fake
# github.com/openshift/library-go v0.0.0-20191003152030-97c62d8a2901
github.com/openshift/library-go/pkg/serviceability
github.com/openshift/library-go/pkg/crypto
github.com/openshift/library-go/pkg/proc
# github.com/pkg/errors v0.8.0
github.com/pkg/errors
# github.com/pkg/profile v1.2.1
Expand Down Expand Up @@ -202,7 +201,6 @@ k8s.io/apimachinery/pkg/labels
k8s.io/apimachinery/pkg/util/sets
k8s.io/apimachinery/pkg/util/validation
k8s.io/apimachinery/pkg/util/wait
k8s.io/apimachinery/pkg/version
k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/util/runtime
Expand All @@ -211,6 +209,7 @@ k8s.io/apimachinery/pkg/runtime
k8s.io/apimachinery/pkg/types
k8s.io/apimachinery/pkg/util/net
k8s.io/apimachinery/pkg/runtime/schema
k8s.io/apimachinery/pkg/version
k8s.io/apimachinery/pkg/util/intstr
k8s.io/apimachinery/pkg/api/resource
k8s.io/apimachinery/pkg/conversion
Expand Down