replace edgeDNSServers with ParentZoneDNSServers

Signed-off-by: Andre Aguas <[email protected]>

Author: abaguas

Makefile

@@ -262,7 +262,6 @@ deploy-k8gb-with-helm:
 	kubectl -n k8gb create secret generic rfc2136 --from-literal=secret=96Ah/a2g0/nLeFGK+d/0tzQcccf9hCEIy34PoXX2Qg8= || true
 	helm repo add --force-update k8gb https://www.k8gb.io
 	cd chart/k8gb && helm dependency update
-
 	helm -n k8gb upgrade -i k8gb $(CHART) -f $(VALUES_YAML) -f $(call get-helm-values-file,$(CHART)) \
 		$(call get-helm-args,$(CLUSTER_ID)) \
 		$(call get-next-args,$(CHART),$(CLUSTER_ID)) \

controllers/depresolver/depresolver.go

@@ -128,11 +128,11 @@ type Config struct {
 	extClustersGeoTags []string `env:"EXT_GSLB_CLUSTERS_GEO_TAGS, default=[]"`
 	// EdgeDNSType is READONLY and is set automatically by configuration
 	EdgeDNSType EdgeDNSType
-	// EdgeDNSServers
-	EdgeDNSServers utils.DNSList
-	// to avoid breaking changes is used as fallback server for EdgeDNSServers
+	// ParentZoneDNSServers
+	ParentZoneDNSServers utils.DNSList
+	// to avoid breaking changes is used as fallback server for ParentZoneDNSServers
 	fallbackEdgeDNSServerName string `env:"EDGE_DNS_SERVER"`
-	// to avoid breaking changes is used as fallback server port for EdgeDNSServers
+	// to avoid breaking changes is used as fallback server port for ParentZoneDNSServers
 	fallbackEdgeDNSServerPort int `env:"EDGE_DNS_SERVER_PORT, default=53"`
 	// DelegationZones
 	DelegationZones DelegationZones

controllers/depresolver/depresolver_config.go

@@ -43,7 +43,7 @@ const (
 	CoreDNSServiceTypeKey      = "COREDNS_SERVICE_TYPE"
 	ExtClustersGeoTagsKey      = "EXT_GSLB_CLUSTERS_GEO_TAGS"
 	ExtDNSEnabledKey           = "EXTDNS_ENABLED"
-	EdgeDNSServersKey          = "EDGE_DNS_SERVERS"
+	ParentZoneDNSServersKey    = "EDGE_DNS_SERVERS"
 	DNSZonesKey                = "DNS_ZONES"
 	InfobloxGridHostKey        = "INFOBLOX_GRID_HOST"
 	InfobloxVersionKey         = "INFOBLOX_WAPI_VERSION"
@@ -95,8 +95,8 @@ func (dr *DependencyResolver) ResolveOperatorConfig() (*Config, error) {
 
 		// calculation
 		fallbackDNS := fmt.Sprintf("%s:%v", dr.config.fallbackEdgeDNSServerName, dr.config.fallbackEdgeDNSServerPort)
-		edgeDNSServerList := env.GetEnvAsArrayOfStringsOrFallback(EdgeDNSServersKey, []string{fallbackDNS})
-		dr.config.EdgeDNSServers = parseEdgeDNSServers(edgeDNSServerList)
+		edgeDNSServerList := env.GetEnvAsArrayOfStringsOrFallback(ParentZoneDNSServersKey, []string{fallbackDNS})
+		dr.config.ParentZoneDNSServers = parseParentZoneDNSServers(edgeDNSServerList)
 		dr.config.extClustersGeoTags = excludeGeoTag(dr.config.extClustersGeoTags, dr.config.ClusterGeoTag)
 		dr.config.Log.Level, _ = zerolog.ParseLevel(strings.ToLower(dr.config.Log.level))
 		dr.config.Log.Format = parseLogOutputFormat(strings.ToLower(dr.config.Log.format))
@@ -151,23 +151,23 @@ func (dr *DependencyResolver) validateConfig(config *Config, recognizedDNSTypes
 			return err
 		}
 	}
-	err = field(EdgeDNSServersKey, os.Getenv(EdgeDNSServersKey)).isNotEmpty().matchRegexp(hostNamesWithPortsRegex1).err
+	err = field(ParentZoneDNSServersKey, os.Getenv(ParentZoneDNSServersKey)).isNotEmpty().matchRegexp(hostNamesWithPortsRegex1).err
 	if err != nil {
 		return err
 	}
-	err = field(EdgeDNSServersKey, os.Getenv(EdgeDNSServersKey)).isNotEmpty().matchRegexp(hostNamesWithPortsRegex2).err
+	err = field(ParentZoneDNSServersKey, os.Getenv(ParentZoneDNSServersKey)).isNotEmpty().matchRegexp(hostNamesWithPortsRegex2).err
 	if err != nil {
 		return err
 	}
 	err = validateLocalhostNotAmongDNSServers(config)
 	if err != nil {
 		return err
 	}
-	err = field(EdgeDNSServersKey, config.EdgeDNSServers).isNotEmpty().matchRegexp(hostNamesWithPortsRegex1).err
+	err = field(ParentZoneDNSServersKey, config.ParentZoneDNSServers).isNotEmpty().matchRegexp(hostNamesWithPortsRegex1).err
 	if err != nil {
 		return err
 	}
-	for _, s := range config.EdgeDNSServers {
+	for _, s := range config.ParentZoneDNSServers {
 		if s.Port < 1 || s.Port > 65535 {
 			return fmt.Errorf("error for port of edge dns server(%v): it must be a positive integer between 1 and 65535", s)
 		}
@@ -205,8 +205,8 @@ func validateLocalhostNotAmongDNSServers(config *Config) error {
 		}
 		return false
 	}
-	if len(config.EdgeDNSServers) > 1 && containsLocalhost(config.EdgeDNSServers) {
-		return fmt.Errorf("invalid %s: the list can't contain 'localhost' or '127.0.0.1' on other than the first position", EdgeDNSServersKey)
+	if len(config.ParentZoneDNSServers) > 1 && containsLocalhost(config.ParentZoneDNSServers) {
+		return fmt.Errorf("invalid %s: the list can't contain 'localhost' or '127.0.0.1' on other than the first position", ParentZoneDNSServersKey)
 	}
 	return nil
 }
@@ -252,11 +252,11 @@ func (dr *DependencyResolver) GetDeprecations() (deprecations []string) {
 
 	var deprecated = map[oldVar]newVar{
 		EdgeDNSServerKey: newVar{
-			Name: EdgeDNSServersKey,
+			Name: ParentZoneDNSServersKey,
 			Msg:  "Pass the hostname or IP address as comma-separated list",
 		},
 		EdgeDNSServerPortKey: newVar{
-			Name: EdgeDNSServersKey,
+			Name: ParentZoneDNSServersKey,
 			Msg: "Port is an optional item in the comma-separated list of dns edge servers, in following form: dns1:53,dns2 (if not provided after the " +
 				"hostname and colon, it defaults to '53')",
 		},
@@ -281,7 +281,7 @@ func parseMetricsAddr(metricsAddr string) (host string, port int, err error) {
 	return
 }
 
-func parseEdgeDNSServers(serverList []string) (r []utils.DNSServer) {
+func parseParentZoneDNSServers(serverList []string) (r []utils.DNSServer) {
 	r = []utils.DNSServer{}
 	var host, portStr string
 	var err error