BUG/MAJOR: external mode: set all paths

path for file was not changed when --config-dir was used
file was not reset on start, that could lead to invalid data or even prevent controller to start
since this uses Go 1.16 feature, go.mod file needs to be updated

Author: oktalz

.gitlab-ci.yml

@@ -11,7 +11,7 @@ variables:
 diff:
   stage: diff
   image:
-    name: $CI_REGISTRY_GO/golang:1.15
+    name: $CI_REGISTRY_GO/golang:1.16
     entrypoint: [ "" ]
   tags:
     - go
@@ -49,7 +49,7 @@ lint-commit-msg:
 unit-tests:
   stage: unit-tests
   image:
-    name: $CI_REGISTRY_GO/golang:1.15
+    name: $CI_REGISTRY_GO/golang:1.16
     entrypoint: [""]
   tags:
     - go

external.go

@@ -15,7 +15,6 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -40,8 +39,10 @@ func setupHAProxyEnv(osArgs utils.OSArgs) config.ControllerCfg {
 			StateDir:      "/tmp/haproxy-ingress/state",
 		},
 	}
+
 	if osArgs.CfgDir != "" {
 		cfg.Env.CfgDir = osArgs.CfgDir
+		cfg.Env.MainCFGFile = path.Join(cfg.Env.CfgDir, "haproxy.cfg")
 	}
 	if osArgs.RuntimeDir != "" {
 		cfg.Env.RuntimeDir = osArgs.RuntimeDir
@@ -53,29 +54,15 @@ func setupHAProxyEnv(osArgs utils.OSArgs) config.ControllerCfg {
 		logger.Panic(err)
 	}
 
-	// Try to copy original file if current directory is project directory
-	// Otherwise check if haproxy.cfg is already in config-dir
 	dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
 	if err != nil {
 		logger.Panic(err)
 	}
 	logger.Debug(dir)
-	origin := path.Join(dir, "fs/usr/local/etc/haproxy/haproxy.cfg")
-	_, err = os.Stat(origin)
+	err = renameio.WriteFile(cfg.Env.MainCFGFile, haproxyConf, 0755)
 	if err != nil {
-		if _, err = os.Stat(cfg.Env.MainCFGFile); err != nil {
-			logger.Panicf("%s not found", cfg.Env.MainCFGFile)
-		}
-	} else if err = copyFile(origin, cfg.Env.MainCFGFile); err != nil {
 		logger.Panic(err)
 	}
-	return cfg
-}
 
-func copyFile(src, dst string) (err error) {
-	content, err := ioutil.ReadFile(src)
-	if err != nil {
-		return
-	}
-	return renameio.WriteFile(dst, content, 0640)
+	return cfg
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/haproxytech/kubernetes-ingress
 
-go 1.12
+go 1.16
 
 require (
 	github.com/google/renameio v0.1.1-0.20200217212219-353f81969824

main.go

@@ -15,6 +15,7 @@
 package main
 
 import (
+	_ "embed"
 	"fmt"
 	"net/http"
 	"os"
@@ -31,9 +32,12 @@ import (
 	"github.com/jessevdk/go-flags"
 )
 
+//go:embed fs/usr/local/etc/haproxy/haproxy.cfg
+var haproxyConf []byte
+
 func main() {
 	var osArgs utils.OSArgs
-	var parser = flags.NewParser(&osArgs, flags.IgnoreUnknown)
+	parser := flags.NewParser(&osArgs, flags.IgnoreUnknown)
 	_, err := parser.Parse()
 	exitCode := 0
 	defer func() {