15912923878

Committed 26 Jun 2025 09:31PM UTC coverage: 49.506% (+1.6%) from 47.946%

Build # 15912923878

Build Type

Pull #696

github

Committed by

demonCoder95

Commit Message

fix tests for stack ingress and rg generation

Pull Request Pull Request #696: introduce per-stack hostname suffix as a CLI config parameter

Run Details

4 of 121 new or added lines in 19 files covered. (3.31%)

3 existing lines in 3 files now uncovered.

2606 of 5264 relevant lines covered (49.51%)

0.56 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/cmd/stackset-controller/main.go

package main

import (
        "context"
        "net"
        "net/http"
        "net/url"
        "os"
        "os/signal"
        "syscall"
        "time"

        "github.com/alecthomas/kingpin/v2"
        "github.com/prometheus/client_golang/prometheus"
        "github.com/prometheus/client_golang/prometheus/promhttp"
        log "github.com/sirupsen/logrus"
        "github.com/zalando-incubator/stackset-controller/controller"
        "github.com/zalando-incubator/stackset-controller/pkg/clientset"
        "github.com/zalando-incubator/stackset-controller/pkg/traffic"
        corev1 "k8s.io/api/core/v1"
        "k8s.io/client-go/rest"
        "k8s.io/client-go/transport"
)

const (
        defaultInterval               = "10s"
        defaultIngressSourceSwitchTTL = "5m"
        defaultMetricsAddress         = ":7979"
        defaultClientGOTimeout        = 30 * time.Second
        defaultReconcileWorkers       = "10"
        defaultPerStackDomain         = "ingress.cluster.local"
)

var (
        config struct {
                Debug                       bool
                Interval                    time.Duration
                APIServer                   *url.URL
                Namespace                   string
                MetricsAddress              string
                ClusterDomains              []string
                PerStackDomain              string
                NoTrafficScaledownTTL       time.Duration
                ControllerID                string
                BackendWeightsAnnotationKey string
                RouteGroupSupportEnabled    bool
                SyncIngressAnnotations      []string
                ReconcileWorkers            int
                ConfigMapSupportEnabled     bool
                SecretSupportEnabled        bool
                PCSSupportEnabled           bool
        }
)

func main() {
        kingpin.Flag("debug", "Enable debug logging.").BoolVar(&config.Debug)
        kingpin.Flag("interval", "Interval between syncing stacksets.").
                Default(defaultInterval).DurationVar(&config.Interval)
        kingpin.Flag("apiserver", "API server url.").URLVar(&config.APIServer)
        kingpin.Flag("namespace", "Limit scope to a particular namespace.").Default(corev1.NamespaceAll).StringVar(&config.Namespace)
        kingpin.Flag("metrics-address", "defines where to serve metrics").Default(defaultMetricsAddress).StringVar(&config.MetricsAddress)
        kingpin.Flag("controller-id", "ID of the controller used to determine ownership of StackSet resources").StringVar(&config.ControllerID)
        kingpin.Flag("reconcile-workers", "The amount of stacksets to reconcile in parallel at a time.").
                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 StackSet Ingress hostnames").Envar("CLUSTER_DOMAIN").Required().StringsVar(&config.ClusterDomains)
        kingpin.Flag("per-stack-domain", "Domain used for generating per-stack Ingress hostnames").Default(defaultPerStackDomain).StringVar(&config.PerStackDomain)
        kingpin.Flag("enable-routegroup-support", "Enable support for RouteGroups on StackSets.").Default("false").BoolVar(&config.RouteGroupSupportEnabled)
        kingpin.Flag(
                "sync-ingress-annotation",
                "Ingress/RouteGroup annotation to propagate to all traffic segments.",
        ).StringsVar(&config.SyncIngressAnnotations)
        kingpin.Flag("enable-configmap-support", "Enable support for ConfigMaps on StackSets.").Default("false").BoolVar(&config.ConfigMapSupportEnabled)
        kingpin.Flag("enable-secret-support", "Enable support for Secrets on StackSets.").Default("false").BoolVar(&config.SecretSupportEnabled)
        kingpin.Flag("enable-pcs-support", "Enable support for PlatformCredentialsSet on StackSets.").Default("false").BoolVar(&config.PCSSupportEnabled)
        kingpin.Parse()

        if config.Debug {
                log.SetLevel(log.DebugLevel)
        }

        stackSetConfig := controller.StackSetConfig{
                Namespace:    config.Namespace,
                ControllerID: config.ControllerID,

                ClusterDomains:              config.ClusterDomains,
                PerStackDomain:              config.PerStackDomain,
                BackendWeightsAnnotationKey: config.BackendWeightsAnnotationKey,
                SyncIngressAnnotations:      config.SyncIngressAnnotations,

                ReconcileWorkers: config.ReconcileWorkers,
                Interval:         config.Interval,

                RouteGroupSupportEnabled: config.RouteGroupSupportEnabled,
                ConfigMapSupportEnabled:  config.ConfigMapSupportEnabled,
                SecretSupportEnabled:     config.SecretSupportEnabled,
                PcsSupportEnabled:        config.PCSSupportEnabled,
        }

        ctx, cancel := context.WithCancel(context.Background())
        kubeConfig, err := configureKubeConfig(config.APIServer, defaultClientGOTimeout, ctx.Done())
        if err != nil {
                log.Fatalf("Failed to setup Kubernetes config: %v", err)
        }

        client, err := clientset.NewForConfig(kubeConfig)
        if err != nil {
                log.Fatalf("Failed to initialize Kubernetes client: %v", err)
        }

        controller, err := controller.NewStackSetController(
                client,
                prometheus.DefaultRegisterer,
                stackSetConfig,
        )
        if err != nil {
                log.Fatalf("Failed to create Stackset controller: %v", err)
        }

        go handleSigterm(cancel)
        go serveMetrics(config.MetricsAddress)
        err = controller.Run(ctx)
        if err != nil {
                cancel()
                log.Fatalf("Failed to run controller: %v", err)
        }
}

// handleSigterm handles SIGTERM signal sent to the process.
func handleSigterm(cancelFunc func()) {
        signals := make(chan os.Signal, 1)
        signal.Notify(signals, syscall.SIGTERM)
        <-signals
        log.Info("Received Term signal. Terminating...")
        cancelFunc()
}

// configureKubeConfig configures a kubeconfig.
func configureKubeConfig(apiServerURL *url.URL, timeout time.Duration, stopCh <-chan struct{}) (*rest.Config, error) {
        tr := &http.Transport{
                DialContext: (&net.Dialer{
                        Timeout:   timeout,
                        KeepAlive: 30 * time.Second,
                        DualStack: false, // K8s do not work well with IPv6
                }).DialContext,
                TLSHandshakeTimeout:   timeout,
                ResponseHeaderTimeout: 10 * time.Second,
                MaxIdleConns:          10,
                MaxIdleConnsPerHost:   2,
                IdleConnTimeout:       20 * time.Second,
        }

        // We need this to reliably fade on DNS change, which is right
        // now not fixed with IdleConnTimeout in the http.Transport.
        // https://github.com/golang/go/issues/23427
        go func(d time.Duration) {
                for {
                        select {
                        case <-time.After(d):
                                tr.CloseIdleConnections()
                        case <-stopCh:
                                return
                        }
                }
        }(20 * time.Second)

        if apiServerURL != nil {
                return &rest.Config{
                        Host:      apiServerURL.String(),
                        Timeout:   timeout,
                        Transport: tr,
                        QPS:       100.0,
                        Burst:     500,
                }, nil
        }

        config, err := rest.InClusterConfig()
        if err != nil {
                return nil, err
        }

        // patch TLS config
        restTransportConfig, err := config.TransportConfig()
        if err != nil {
                return nil, err
        }
        restTLSConfig, err := transport.TLSConfigFor(restTransportConfig)
        if err != nil {
                return nil, err
        }
        tr.TLSClientConfig = restTLSConfig

        config.Timeout = timeout
        config.Transport = tr
        config.QPS = 100.0
        config.Burst = 500
        // disable TLSClientConfig to make the custom Transport work
        config.TLSClientConfig = rest.TLSClientConfig{}
        return config, nil
}

// gather go metrics
func serveMetrics(address string) {
        http.Handle("/metrics", promhttp.Handler())
        log.Fatal(http.ListenAndServe(address, nil))
}

1	package main
2
3	import (
4	"context"
5	"net"
6	"net/http"
7	"net/url"
8	"os"
9	"os/signal"
10	"syscall"
11	"time"
12
13	"github.com/alecthomas/kingpin/v2"
14	"github.com/prometheus/client_golang/prometheus"
15	"github.com/prometheus/client_golang/prometheus/promhttp"
16	log "github.com/sirupsen/logrus"
17	"github.com/zalando-incubator/stackset-controller/controller"
18	"github.com/zalando-incubator/stackset-controller/pkg/clientset"
19	"github.com/zalando-incubator/stackset-controller/pkg/traffic"
20	corev1 "k8s.io/api/core/v1"
21	"k8s.io/client-go/rest"
22	"k8s.io/client-go/transport"
23	)
24
25	const (
26	defaultInterval = "10s"
27	defaultIngressSourceSwitchTTL = "5m"
28	defaultMetricsAddress = ":7979"
29	defaultClientGOTimeout = 30 * time.Second
30	defaultReconcileWorkers = "10"
31	defaultPerStackDomain = "ingress.cluster.local"
32	)
33
34	var (
35	config struct {
36	Debug bool
37	Interval time.Duration
38	APIServer *url.URL
39	Namespace string
40	MetricsAddress string
41	ClusterDomains []string
42	PerStackDomain string
43	NoTrafficScaledownTTL time.Duration
44	ControllerID string
45	BackendWeightsAnnotationKey string
46	RouteGroupSupportEnabled bool
47	SyncIngressAnnotations []string
48	ReconcileWorkers int
49	ConfigMapSupportEnabled bool
50	SecretSupportEnabled bool
51	PCSSupportEnabled bool
52	}
53	)
54
55	func main() {	×
56	kingpin.Flag("debug", "Enable debug logging.").BoolVar(&config.Debug)	×
57	kingpin.Flag("interval", "Interval between syncing stacksets.").	×
58	Default(defaultInterval).DurationVar(&config.Interval)	×
59	kingpin.Flag("apiserver", "API server url.").URLVar(&config.APIServer)	×
60	kingpin.Flag("namespace", "Limit scope to a particular namespace.").Default(corev1.NamespaceAll).StringVar(&config.Namespace)	×
61	kingpin.Flag("metrics-address", "defines where to serve metrics").Default(defaultMetricsAddress).StringVar(&config.MetricsAddress)	×
62	kingpin.Flag("controller-id", "ID of the controller used to determine ownership of StackSet resources").StringVar(&config.ControllerID)	×
63	kingpin.Flag("reconcile-workers", "The amount of stacksets to reconcile in parallel at a time.").	×
64	Default(defaultReconcileWorkers).IntVar(&config.ReconcileWorkers)	×
65	kingpin.Flag("backend-weights-key", "Backend weights annotation key the controller will use to set current traffic values").Default(traffic.DefaultBackendWeightsAnnotationKey).StringVar(&config.BackendWeightsAnnotationKey)	×
NEW 66	kingpin.Flag("cluster-domain", "Main domains of the cluster, used for generating StackSet Ingress hostnames").Envar("CLUSTER_DOMAIN").Required().StringsVar(&config.ClusterDomains)	×
NEW 67	kingpin.Flag("per-stack-domain", "Domain used for generating per-stack Ingress hostnames").Default(defaultPerStackDomain).StringVar(&config.PerStackDomain)	×
68	kingpin.Flag("enable-routegroup-support", "Enable support for RouteGroups on StackSets.").Default("false").BoolVar(&config.RouteGroupSupportEnabled)	×
69	kingpin.Flag(	×
70	"sync-ingress-annotation",	×
71	"Ingress/RouteGroup annotation to propagate to all traffic segments.",	×
72	).StringsVar(&config.SyncIngressAnnotations)	×
73	kingpin.Flag("enable-configmap-support", "Enable support for ConfigMaps on StackSets.").Default("false").BoolVar(&config.ConfigMapSupportEnabled)	×
74	kingpin.Flag("enable-secret-support", "Enable support for Secrets on StackSets.").Default("false").BoolVar(&config.SecretSupportEnabled)	×
75	kingpin.Flag("enable-pcs-support", "Enable support for PlatformCredentialsSet on StackSets.").Default("false").BoolVar(&config.PCSSupportEnabled)	×
76	kingpin.Parse()	×
77		×
78	if config.Debug {	×
79	log.SetLevel(log.DebugLevel)	×
80	}	×
81
82	stackSetConfig := controller.StackSetConfig{	×
83	Namespace: config.Namespace,	×
84	ControllerID: config.ControllerID,	×
85		×
86	ClusterDomains: config.ClusterDomains,	×
NEW 87	PerStackDomain: config.PerStackDomain,	×
88	BackendWeightsAnnotationKey: config.BackendWeightsAnnotationKey,	×
89	SyncIngressAnnotations: config.SyncIngressAnnotations,	×
90		×
91	ReconcileWorkers: config.ReconcileWorkers,	×
92	Interval: config.Interval,	×
93		×
94	RouteGroupSupportEnabled: config.RouteGroupSupportEnabled,	×
95	ConfigMapSupportEnabled: config.ConfigMapSupportEnabled,	×
96	SecretSupportEnabled: config.SecretSupportEnabled,	×
97	PcsSupportEnabled: config.PCSSupportEnabled,	×
98	}	×
99		×
100	ctx, cancel := context.WithCancel(context.Background())	×
101	kubeConfig, err := configureKubeConfig(config.APIServer, defaultClientGOTimeout, ctx.Done())	×
102	if err != nil {	×
103	log.Fatalf("Failed to setup Kubernetes config: %v", err)	×
104	}	×
105
106	client, err := clientset.NewForConfig(kubeConfig)	×
107	if err != nil {	×
108	log.Fatalf("Failed to initialize Kubernetes client: %v", err)	×
109	}	×
110
111	controller, err := controller.NewStackSetController(	×
112	client,	×
113	prometheus.DefaultRegisterer,	×
114	stackSetConfig,	×
115	)	×
116	if err != nil {	×
117	log.Fatalf("Failed to create Stackset controller: %v", err)	×
118	}	×
119
120	go handleSigterm(cancel)	×
121	go serveMetrics(config.MetricsAddress)	×
122	err = controller.Run(ctx)	×
123	if err != nil {	×
124	cancel()	×
125	log.Fatalf("Failed to run controller: %v", err)	×
126	}	×
127	}
128
129	// handleSigterm handles SIGTERM signal sent to the process.
130	func handleSigterm(cancelFunc func()) {	×
131	signals := make(chan os.Signal, 1)	×
132	signal.Notify(signals, syscall.SIGTERM)	×
133	<-signals	×
134	log.Info("Received Term signal. Terminating...")	×
135	cancelFunc()	×
136	}	×
137
138	// configureKubeConfig configures a kubeconfig.
139	func configureKubeConfig(apiServerURL url.URL, timeout time.Duration, stopCh <-chan struct{}) (rest.Config, error) {	×
140	tr := &http.Transport{	×
141	DialContext: (&net.Dialer{	×
142	Timeout: timeout,	×
143	KeepAlive: 30 * time.Second,	×
144	DualStack: false, // K8s do not work well with IPv6	×
145	}).DialContext,	×
146	TLSHandshakeTimeout: timeout,	×
147	ResponseHeaderTimeout: 10 * time.Second,	×
148	MaxIdleConns: 10,	×
149	MaxIdleConnsPerHost: 2,	×
150	IdleConnTimeout: 20 * time.Second,	×
151	}	×
152		×
153	// We need this to reliably fade on DNS change, which is right	×
154	// now not fixed with IdleConnTimeout in the http.Transport.	×
155	// https://github.com/golang/go/issues/23427	×
156	go func(d time.Duration) {	×
157	for {	×
158	select {	×
159	case <-time.After(d):	×
160	tr.CloseIdleConnections()	×
161	case <-stopCh:	×
162	return	×
163	}
164	}
165	}(20 * time.Second)
166
167	if apiServerURL != nil {	×
168	return &rest.Config{	×
169	Host: apiServerURL.String(),	×
170	Timeout: timeout,	×
171	Transport: tr,	×
172	QPS: 100.0,	×
173	Burst: 500,	×
174	}, nil	×
175	}	×
176
177	config, err := rest.InClusterConfig()	×
178	if err != nil {	×
179	return nil, err	×
180	}	×
181
182	// patch TLS config
183	restTransportConfig, err := config.TransportConfig()	×
184	if err != nil {	×
185	return nil, err	×
186	}	×
187	restTLSConfig, err := transport.TLSConfigFor(restTransportConfig)	×
188	if err != nil {	×
189	return nil, err	×
190	}	×
191	tr.TLSClientConfig = restTLSConfig	×
192		×
193	config.Timeout = timeout	×
194	config.Transport = tr	×
195	config.QPS = 100.0	×
196	config.Burst = 500	×
197	// disable TLSClientConfig to make the custom Transport work	×
198	config.TLSClientConfig = rest.TLSClientConfig{}	×
199	return config, nil	×
200	}
201
202	// gather go metrics
203	func serveMetrics(address string) {	×
204	http.Handle("/metrics", promhttp.Handler())	×
205	log.Fatal(http.ListenAndServe(address, nil))	×
206	}	×

zalando-incubator / stackset-controller / 15912923878

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous