separate public and private domains, allow to choose for stacks

Author: Martin Linkhorst

cmd/stackset-controller/main.go

@@ -38,6 +38,8 @@ var (
 		Namespace                   string
 		MetricsAddress              string
 		ClusterDomains              []string
+		ClusterInternalDomains      []string
+		IgnorePublicDomainsOnStacks bool
 		NoTrafficScaledownTTL       time.Duration
 		ControllerID                string
 		BackendWeightsAnnotationKey string
@@ -62,6 +64,8 @@ func main() {
 		Default(defaultReconcileWorkers).IntVar(&config.ReconcileWorkers)
 	kingpin.Flag("backend-weights-key", "Backend weights annotation key the controller will use to set current traffic values").Default(traffic.DefaultBackendWeightsAnnotationKey).StringVar(&config.BackendWeightsAnnotationKey)
 	kingpin.Flag("cluster-domain", "Main domains of the cluster, used for generating Stack Ingress hostnames").Envar("CLUSTER_DOMAIN").Required().StringsVar(&config.ClusterDomains)
+	kingpin.Flag("cluster-internal-domain", "Main internal domains of the cluster, used for generating Stack Ingress hostnames").Envar("CLUSTER_INTERNAL_DOMAIN").StringsVar(&config.ClusterInternalDomains)
+	kingpin.Flag("ignore-public-domains-on-stacks", "If true, only --cluster-internal-domain is considered on Stack Ingresses and RouteGroups").Default("false").BoolVar(&config.IgnorePublicDomainsOnStacks)
 	kingpin.Flag("enable-routegroup-support", "Enable support for RouteGroups on StackSets.").Default("false").BoolVar(&config.RouteGroupSupportEnabled)
 	kingpin.Flag(
 		"sync-ingress-annotation",
@@ -81,6 +85,8 @@ func main() {
 		ControllerID: config.ControllerID,
 
 		ClusterDomains:              config.ClusterDomains,
+		ClusterInternalDomains:      config.ClusterInternalDomains,
+		IgnorePublicDomainsOnStacks: config.IgnorePublicDomainsOnStacks,
 		BackendWeightsAnnotationKey: config.BackendWeightsAnnotationKey,
 		SyncIngressAnnotations:      config.SyncIngressAnnotations,
 

controller/stackset.go

@@ -67,6 +67,8 @@ type StackSetConfig struct {
 	ControllerID string
 
 	ClusterDomains              []string
+	ClusterInternalDomains      []string
+	IgnorePublicDomainsOnStacks bool
 	BackendWeightsAnnotationKey string
 	SyncIngressAnnotations      []string
 
@@ -252,6 +254,8 @@ func (c *StackSetController) collectResources(ctx context.Context) (map[types.UI
 			reconciler,
 			c.config.BackendWeightsAnnotationKey,
 			c.config.ClusterDomains,
+			c.config.ClusterInternalDomains,
+			c.config.IgnorePublicDomainsOnStacks,
 			c.config.SyncIngressAnnotations,
 		)
 		stacksets[uid] = stacksetContainer

pkg/core/types.go

@@ -64,7 +64,9 @@ type StackSetContainer struct {
 
 	// clusterDomains stores the main domain names of the cluster;
 	// per-stack ingress hostnames are not generated for names outside of them
-	clusterDomains []string
+	clusterDomains              []string
+	clusterInternalDomains      []string
+	ignorePublicDomainsOnStacks bool
 
 	// ingressAnnotationsToSync is a list of ingress annotations that should be
 	// synchronized across all existing stacks.
@@ -214,6 +216,8 @@ func NewContainer(
 	reconciler TrafficReconciler,
 	backendWeightsAnnotationKey string,
 	clusterDomains []string,
+	clusterInternalDomains []string,
+	ignorePublicDomainsOnStacks bool,
 	syncIngressAnnotations []string,
 ) *StackSetContainer {
 	return &StackSetContainer{
@@ -222,6 +226,8 @@ func NewContainer(
 		TrafficReconciler:           reconciler,
 		backendWeightsAnnotationKey: backendWeightsAnnotationKey,
 		clusterDomains:              clusterDomains,
+		clusterInternalDomains:      clusterInternalDomains,
+		ignorePublicDomainsOnStacks: ignorePublicDomainsOnStacks,
 		ingressAnnotationsToSync:    syncIngressAnnotations,
 	}
 }
@@ -350,7 +356,10 @@ func (ssc *StackSetContainer) UpdateFromResources() error {
 		sc.syncAnnotationsInRouteGroup = syncAnnotationsInRouteGroup
 		sc.backendPort = backendPort
 		sc.scaledownTTL = scaledownTTL
-		sc.clusterDomains = ssc.clusterDomains
+		sc.clusterDomains = ssc.clusterInternalDomains
+		if !ssc.ignorePublicDomainsOnStacks {
+			sc.clusterDomains = append(sc.clusterDomains, ssc.clusterDomains...)
+		}
 		err := sc.updateStackResources()
 		if err != nil {
 			return err