Default canal_iface_regex only for hetzner (#3798)

Signed-off-by: Artiom Diomin <artiom@kubermatic.com>
Co-authored-by: Artiom Diomin <artiom@kubermatic.com>

Author: kubermatic-bot

addons/cni-canal/canal-config.yaml

@@ -12,7 +12,7 @@ data:
   # default route.
   canal_iface: "{{ default "" .Params.IFACE }}"
 
-  canal_iface_regex: '{{ default "^en" .Params.IFACE_REGEX }}'
+  canal_iface_regex: '{{ default "" .Params.IFACE_REGEX }}'
 
   # Whether or not to masquerade traffic to destinations not within
   # the pod network.

pkg/addons/manifest.go

@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
+	"maps"
 	"os"
 	"path/filepath"
 	"strings"
@@ -184,9 +185,7 @@ func (a *applier) loadAddonsManifests(
 			res = strings.ReplaceAll(res, "}}", "}}^")
 			manifestBytes = []byte(res)
 		}
-
-		var manifest *bytes.Buffer
-		manifest = bytes.NewBuffer(manifestBytes)
+		manifest := bytes.NewBuffer(manifestBytes)
 
 		if !disableTemplating {
 			overwriteRegistry := k1cluster.RegistryConfiguration.ImageRegistry("")
@@ -205,17 +204,14 @@ func (a *applier) loadAddonsManifests(
 
 			// Make a copy and merge Params
 			tplDataParams := map[string]string{}
-			for k, v := range a.TemplateData.Params {
-				tplDataParams[k] = v
-			}
-			for k, v := range addonParams {
-				tplDataParams[k] = v
-			}
+			maps.Copy(tplDataParams, a.TemplateData.Params)
+			maps.Copy(tplDataParams, addonParams)
+
+			defaultAddonParams(k1cluster, addonName, tplDataParams)
 
 			// Resolve environment variables in Params
 			for k, v := range tplDataParams {
-				if strings.HasPrefix(v, ParamsEnvPrefix) {
-					envName := strings.TrimPrefix(v, ParamsEnvPrefix)
+				if envName, ok := strings.CutPrefix(v, ParamsEnvPrefix); ok {
 					if env, ok := os.LookupEnv(envName); ok {
 						tplDataParams[k] = env
 					} else {
@@ -274,6 +270,23 @@ func (a *applier) loadAddonsManifests(
 	return manifests, nil
 }
 
+func defaultAddonParams(k1cluster *kubeoneapi.KubeOneCluster, addonName string, tplDataParams map[string]string) {
+	if addonName == resources.AddonCNICanal {
+		if k1cluster.CloudProvider.Hetzner != nil {
+			// Customize cni-canal addon on hetzner
+			defaultIfaceParam(tplDataParams, "^en")
+		}
+	}
+}
+
+func defaultIfaceParam(tplDataParams map[string]string, reg string) {
+	_, iface := tplDataParams["IFACE"]
+	_, ifaceregex := tplDataParams["IFACE_REGEX"]
+	if !iface && !ifaceregex {
+		tplDataParams["IFACE_REGEX"] = reg
+	}
+}
+
 // ensureAddonsLabelsOnResources applies the addons label on all resources in the manifest
 func ensureAddonsLabelsOnResources(manifests []runtime.RawExtension, addonName string) ([]*bytes.Buffer, error) {
 	var rawManifests []*bytes.Buffer