MINOR: add master socket

Author: hdurand0710

Makefile

@@ -1,5 +1,7 @@
 PROJECT_PATH=${PWD}
 TARGETPLATFORM?=linux/amd64
+GOOS?=linux
+GOARCH?=amd64
 GOLANGCI_LINT_VERSION=1.54.1
 
 .PHONY: test
@@ -33,6 +35,15 @@ yaml-lint:
 example:
 	deploy/tests/create.sh
 
+.PHONY: example-pebble
+example-pebble:
+	CUSTOMDOCKERFILE=build/Dockerfile.pebble deploy/tests/create.sh
+
+## Install the `example` with an image built from a local build.
+.PHONY: example-dev
+example-dev: build-dev
+	CUSTOMDOCKERFILE=build/Dockerfile.dev deploy/tests/create.sh
+
 .PHONY: example-experimental-gwapi
 example-experimental-gwapi:
 	EXPERIMENTAL_GWAPI=1 deploy/tests/create.sh
@@ -53,6 +64,13 @@ build:
 build-pebble:
 	docker build -t haproxytech/kubernetes-ingress --build-arg TARGETPLATFORM=$(TARGETPLATFORM) -f build/Dockerfile.pebble .
 
+### build-dev builds locally an ingress-controller binary and copies it into the docker image.
+### Can be used for example to use `go replace` and build with a local library,
+.PHONY: build-dev
+build-dev:
+	GOOS=$(GOSS) GOARCH=$(GOARCH) go build .
+	docker build -t haproxytech/kubernetes-ingress --build-arg TARGETPLATFORM=$(TARGETPLATFORM) -f build/Dockerfile.dev .
+
 .PHONY: publish
 publish:
 	goreleaser release --rm-dist

build/Dockerfile.dev

@@ -0,0 +1,52 @@
+# Copyright 2019 HAProxy Technologies LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM haproxytech/haproxy-alpine:2.7
+
+ARG TARGETPLATFORM
+
+ARG S6_OVERLAY_VERSION=2.2.0.3
+ENV S6_OVERLAY_VERSION $S6_OVERLAY_VERSION
+ENV S6_READ_ONLY_ROOT=1
+
+COPY /fs /
+
+RUN apk --no-cache add socat openssl util-linux htop tzdata curl libcap && \
+    rm -f /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi && \
+    chgrp -R haproxy /usr/local/etc/haproxy /run /var && \
+    chmod -R ug+rwx /usr/local/etc/haproxy /run /var && \
+    setcap 'cap_net_bind_service=+ep' /usr/local/sbin/haproxy && \
+    case "${TARGETPLATFORM}" in \
+        "linux/arm64")      S6_ARCH=aarch64     ;; \
+        "linux/amd64")      S6_ARCH=amd64       ;; \
+        "linux/arm/v6")     S6_ARCH=arm         ;; \
+        "linux/arm/v7")     S6_ARCH=armhf       ;; \
+        "linux/ppc64le")    S6_ARCH=ppc64le     ;; \
+        "linux/386")        S6_ARCH=x86         ;; \
+        *) echo "ARG TARGETPLATFORM undeclared" >&2 && exit 1 ;; \
+    esac && \
+    curl -sS -L -o /tmp/s6-overlay-installer "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}-installer" && \
+    chmod +x /tmp/s6-overlay-installer && \
+    /tmp/s6-overlay-installer / && \
+    rm -f /tmp/s6-overlay-installer && \
+    mkdir /var/run/s6 && \
+    chown haproxy:haproxy /var/run/s6 && \
+    chmod ug+rwx /var/run/s6 && \
+    sed -i 's/ root / haproxy /g' /etc/s6/init/init-stage2-fixattrs.txt && \
+    chmod ugo+x /etc/services.d/*/run /etc/cont-init.d/* && \
+    rm -rf /var/lib/pebble
+
+COPY kubernetes-ingress  ./haproxy-ingress-controller
+
+ENTRYPOINT ["/start.sh"]

deploy/tests/create.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 set -e
 clustername=${1:-dev}
+dockerfile=${CUSTOMDOCKERFILE:-build/Dockerfile}
 command -v kind >/dev/null 2>&1 || { echo >&2 "Kind not installed.  Aborting."; exit 1; }
 command -v kubectl >/dev/null 2>&1 || { echo >&2 "Kubectl not installed.  Aborting."; exit 1; }
 DIR=$(dirname "$0")
@@ -31,7 +32,7 @@ else
   kind create cluster --name $clustername --config $DIR/kind-config.yaml
 
   echo "building image for ingress controller"
-  docker build --build-arg TARGETPLATFORM="linux/amd64" -t haproxytech/kubernetes-ingress -f build/Dockerfile .
+  docker build --build-arg TARGETPLATFORM="linux/amd64" -t haproxytech/kubernetes-ingress -f "${dockerfile}" .
 
   echo "loading image of ingress controller in kind"
   kind load docker-image haproxytech/kubernetes-ingress:latest  --name=$clustername

fs/etc/services.d/haproxy/run

@@ -19,4 +19,4 @@ fi
 
 echo "Memory limit for HAProxy: ${MEMLIMIT}MiB"
 
-exec /usr/local/sbin/haproxy -W -db -m "${MEMLIMIT}" -f /etc/haproxy/haproxy.cfg -f /etc/haproxy/haproxy-aux.cfg
+exec /usr/local/sbin/haproxy -W -db -m "${MEMLIMIT}" -S /var/run/haproxy-master.sock,level,admin -f /etc/haproxy/haproxy.cfg -f /etc/haproxy/haproxy-aux.cfg

fs/var/lib/pebble/default/run-haproxy

@@ -19,4 +19,4 @@ fi
 
 echo "Memory limit for HAProxy: ${MEMLIMIT}MiB"
 
-exec /usr/local/sbin/haproxy -W -db -m "${MEMLIMIT}" -f /etc/haproxy/haproxy.cfg -f /etc/haproxy/haproxy-aux.cfg
+exec /usr/local/sbin/haproxy -W -db -m "${MEMLIMIT}" -S /var/run/haproxy-master.sock,level,admin -f /etc/haproxy/haproxy.cfg -f /etc/haproxy/haproxy-aux.cfg

pkg/haproxy/env/main.go

@@ -31,6 +31,7 @@ type Env struct {
 	Proxies
 	CfgDir        string
 	RuntimeSocket string
+	MasterSocket  string
 	PIDFile       string
 	AuxCFGFile    string
 	RuntimeDir    string
@@ -67,9 +68,11 @@ func (env *Env) Init(osArgs utils.OSArgs) (err error) {
 	env.AuxCFGFile = filepath.Join(env.CfgDir, "haproxy-aux.cfg")
 	env.PIDFile = filepath.Join(env.RuntimeDir, "haproxy.pid")
 	env.RuntimeSocket = filepath.Join(env.RuntimeDir, "haproxy-runtime-api.sock")
+	env.MasterSocket = filepath.Join(env.RuntimeDir, "haproxy-master.sock")
 	if osArgs.Test {
 		env.Binary = "echo"
 		env.RuntimeSocket = ""
+		env.MasterSocket = ""
 	} else if _, err = os.Stat(env.Binary); err != nil {
 		return err
 	}

pkg/haproxy/process/direct-control.go

@@ -29,16 +29,18 @@ func (d *directControl) Service(action string) (err error) {
 	// hold information about a running Master HAproxy process
 	process, processErr := haproxyProcess(d.Env.PIDFile)
 
+	masterSocketArg := fmt.Sprintf("%s,level,admin", d.Env.MasterSocket)
+
 	//nolint:gosec //checks on HAProxyBinary should be done in configuration module.
 	switch action {
 	case "start":
 		if processErr == nil {
 			logger.Error("haproxy is already running")
 			return nil
 		}
-		cmd = exec.Command(d.Env.Binary, "-f", d.Env.MainCFGFile)
+		cmd = exec.Command(d.Env.Binary, "-S", masterSocketArg, "-f", d.Env.MainCFGFile)
 		if d.useAuxFile {
-			cmd = exec.Command(d.Env.Binary, "-f", d.Env.MainCFGFile, "-f", d.Env.AuxCFGFile)
+			cmd = exec.Command(d.Env.Binary, "-S", masterSocketArg, "-f", d.Env.MainCFGFile, "-f", d.Env.AuxCFGFile)
 		}
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
@@ -65,9 +67,9 @@ func (d *directControl) Service(action string) (err error) {
 			return d.Service("start")
 		}
 		pid := strconv.Itoa(process.Pid)
-		cmd = exec.Command(d.Env.Binary, "-f", d.Env.MainCFGFile, "-sf", pid)
+		cmd = exec.Command(d.Env.Binary, "-S", masterSocketArg, "-f", d.Env.MainCFGFile, "-sf", pid)
 		if d.useAuxFile {
-			cmd = exec.Command(d.Env.Binary, "-f", d.Env.MainCFGFile, "-f", d.Env.AuxCFGFile, "-sf", pid)
+			cmd = exec.Command(d.Env.Binary, "-S", masterSocketArg, "-f", d.Env.MainCFGFile, "-f", d.Env.AuxCFGFile, "-sf", pid)
 		}
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr