BUG/MINOR: save alpn and strictSNI settings over updates

Author: oktalz

.aspell.yml

@@ -53,3 +53,8 @@ allowed:
   - dataplaneapi
   - usr
   - Redispatch
+  - backport
+  - cmd
+  - backports
+  - alpn
+  - SNI

pkg/controller/handler.go

@@ -31,7 +31,7 @@ func (c *HAProxyController) initHandlers() {
 
 	// handlers executed at reconciliation loop
 	c.updateHandlers = []UpdateHandler{
-		handler.HTTPS{
+		&handler.HTTPS{
 			Enabled:  !c.osArgs.DisableHTTPS,
 			CertDir:  c.haproxy.Certs.FrontendDir,
 			IPv4:     !c.osArgs.DisableIPV4,

pkg/handler/https.go

@@ -53,7 +53,7 @@ const (
 	BIND_IP_V6                      = "v6"
 )
 
-func (handler HTTPS) bindList(h haproxy.HAProxy) (binds []models.Bind) {
+func (handler *HTTPS) bindList(h haproxy.HAProxy) (binds []models.Bind) {
 	if handler.IPv4 {
 		binds = append(binds, models.Bind{
 			Address: handler.AddrIPv4,
@@ -78,7 +78,7 @@ func (handler HTTPS) bindList(h haproxy.HAProxy) (binds []models.Bind) {
 	return binds
 }
 
-func (handler HTTPS) bindListPassthrough(h haproxy.HAProxy) (binds []models.Bind) {
+func (handler *HTTPS) bindListPassthrough(h haproxy.HAProxy) (binds []models.Bind) {
 	binds = append(binds, models.Bind{
 		Address: "unix@" + handler.unixSocketPath(h),
 		BindParams: models.BindParams{
@@ -89,11 +89,11 @@ func (handler HTTPS) bindListPassthrough(h haproxy.HAProxy) (binds []models.Bind
 	return binds
 }
 
-func (handler HTTPS) unixSocketPath(h haproxy.HAProxy) string {
+func (handler *HTTPS) unixSocketPath(h haproxy.HAProxy) string {
 	return path.Join(h.Env.RuntimeDir, "ssl-frontend.sock")
 }
 
-func (handler HTTPS) handleClientTLSAuth(k store.K8s, h haproxy.HAProxy) (err error) {
+func (handler *HTTPS) handleClientTLSAuth(k store.K8s, h haproxy.HAProxy) (err error) {
 	// Parsing
 	var caFile string
 	var notFound store.ErrNotFound
@@ -158,7 +158,7 @@ func (handler HTTPS) handleClientTLSAuth(k store.K8s, h haproxy.HAProxy) (err er
 	return
 }
 
-func (handler HTTPS) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
+func (handler *HTTPS) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
 	if !handler.Enabled {
 		logger.Debug("Cannot proceed with SSL Passthrough update, HTTPS is disabled")
 		return nil
@@ -204,7 +204,7 @@ func (handler HTTPS) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annota
 	return nil
 }
 
-func (handler HTTPS) enableSSLPassthrough(h haproxy.HAProxy) (err error) {
+func (handler *HTTPS) enableSSLPassthrough(h haproxy.HAProxy) (err error) {
 	// Create TCP frontend for ssl-passthrough
 	frontend := models.Frontend{
 		Name:           h.FrontSSL,
@@ -242,7 +242,7 @@ func (handler HTTPS) enableSSLPassthrough(h haproxy.HAProxy) (err error) {
 	return errors.Result()
 }
 
-func (handler HTTPS) disableSSLPassthrough(h haproxy.HAProxy) (err error) {
+func (handler *HTTPS) disableSSLPassthrough(h haproxy.HAProxy) (err error) {
 	err = h.FrontendDelete(h.FrontSSL)
 	if err != nil {
 		return err
@@ -258,7 +258,7 @@ func (handler HTTPS) disableSSLPassthrough(h haproxy.HAProxy) (err error) {
 	return nil
 }
 
-func (handler HTTPS) toggleSSLPassthrough(passthrough bool, h haproxy.HAProxy) (err error) {
+func (handler *HTTPS) toggleSSLPassthrough(passthrough bool, h haproxy.HAProxy) (err error) {
 	handler.deleteHTTPSFrontendBinds(h)
 	bindListFunc := handler.bindList
 	if passthrough {
@@ -275,7 +275,7 @@ func (handler HTTPS) toggleSSLPassthrough(passthrough bool, h haproxy.HAProxy) (
 	return nil
 }
 
-func (handler HTTPS) deleteHTTPSFrontendBinds(h haproxy.HAProxy) {
+func (handler *HTTPS) deleteHTTPSFrontendBinds(h haproxy.HAProxy) {
 	bindsToDelete := []string{BIND_IP_V4, BIND_IP_V6, BIND_UNIX_SOCKET}
 	for _, bind := range bindsToDelete {
 		if err := h.FrontendBindDelete(h.FrontHTTPS, bind); err != nil {
@@ -284,7 +284,7 @@ func (handler HTTPS) deleteHTTPSFrontendBinds(h haproxy.HAProxy) {
 	}
 }
 
-func (handler HTTPS) sslPassthroughRules(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) error {
+func (handler *HTTPS) sslPassthroughRules(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) error {
 	inspectTimeout, err := a.Timeout("timeout-client", k.ConfigMaps.Main.Annotations)
 	if inspectTimeout == nil {
 		if err != nil {