From 5603609d21b09d399b4418c111e8e86ac79ea370 Mon Sep 17 00:00:00 2001 From: Helene Durand Date: Tue, 21 Jan 2025 10:20:09 +0100 Subject: [PATCH] MEDIUM: change backend ssl name from ssl to ssl-backend [WARNING] (345) : config : Parsing [/etc/haproxy/haproxy.cfg:163]: backend 'ssl' has the same name as frontend 'ssl' declared at /etc/haproxy/haproxy.cfg:77. This is dangerous and will not be supported anymore in version 3.3. --- .aspell.yml | 1 + deploy/tests/integration/base-suite.go | 2 +- deploy/tests/tnr/routeacl/suite_test.go | 2 +- deploy/tests/ut/acls/suite_test.go | 2 +- deploy/tests/ut/httprequests/suite_test.go | 2 +- pkg/controller/constants/const.go | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.aspell.yml b/.aspell.yml index b97dd901..38909476 100644 --- a/.aspell.yml +++ b/.aspell.yml @@ -34,3 +34,4 @@ allowed: - parallelize - maxconn - kubebuilder + - cfg diff --git a/deploy/tests/integration/base-suite.go b/deploy/tests/integration/base-suite.go index edfd3831..9d3dd27e 100644 --- a/deploy/tests/integration/base-suite.go +++ b/deploy/tests/integration/base-suite.go @@ -137,7 +137,7 @@ func (suite *BaseSuite) StartController() { FrontHTTP: "http", FrontHTTPS: "https", FrontSSL: "ssl", - BackSSL: "ssl", + BackSSL: "ssl-backend", }, } diff --git a/deploy/tests/tnr/routeacl/suite_test.go b/deploy/tests/tnr/routeacl/suite_test.go index d9bff85b..738c4ab1 100644 --- a/deploy/tests/tnr/routeacl/suite_test.go +++ b/deploy/tests/tnr/routeacl/suite_test.go @@ -113,7 +113,7 @@ func (suite *UseBackendSuite) UseBackendFixture() (eventChan chan k8ssync.SyncDa FrontHTTP: "http", FrontHTTPS: "https", FrontSSL: "ssl", - BackSSL: "ssl", + BackSSL: "ssl-backend", }, } diff --git a/deploy/tests/ut/acls/suite_test.go b/deploy/tests/ut/acls/suite_test.go index 5be4c03b..7ab75869 100644 --- a/deploy/tests/ut/acls/suite_test.go +++ b/deploy/tests/ut/acls/suite_test.go @@ -89,7 +89,7 @@ func (suite *ACLSuite) UseACLFixture() (eventChan chan k8ssync.SyncDataEvent) { FrontHTTP: "http", FrontHTTPS: "https", FrontSSL: "ssl", - BackSSL: "ssl", + BackSSL: "ssl-backend", }, } haproxyConfig, err := os.ReadFile("../../../../fs/usr/local/etc/haproxy/haproxy.cfg") diff --git a/deploy/tests/ut/httprequests/suite_test.go b/deploy/tests/ut/httprequests/suite_test.go index 51b53510..3b20b175 100644 --- a/deploy/tests/ut/httprequests/suite_test.go +++ b/deploy/tests/ut/httprequests/suite_test.go @@ -89,7 +89,7 @@ func (suite *HTTPRequestsSuite) UseHTTPRequestsFixture() (eventChan chan k8ssync FrontHTTP: "http", FrontHTTPS: "https", FrontSSL: "ssl", - BackSSL: "ssl", + BackSSL: "ssl-backend", }, } haproxyConfig, err := os.ReadFile("../../../../fs/usr/local/etc/haproxy/haproxy.cfg") diff --git a/pkg/controller/constants/const.go b/pkg/controller/constants/const.go index a12234c3..50e4f79d 100644 --- a/pkg/controller/constants/const.go +++ b/pkg/controller/constants/const.go @@ -18,7 +18,7 @@ package constants const ( DefaultsSectionName = "haproxytech" SSL_FRONTEND = "ssl" - SSL_BACKEND = "ssl" + SSL_BACKEND = "ssl-backend" HTTP_FRONTEND = "http" HTTPS_FRONTEND = "https" )