Ignore kube proxy version + typed queues

pkg/controller/base/controller.go

@@ -34,14 +34,14 @@ type Reconciler interface {
 type controller struct {
 	config.Factories
 
-	queue      workqueue.RateLimitingInterface
+	queue      workqueue.RateLimitingInterface // nolint: staticcheck
 	reconciler Reconciler
 
 	logger      log.Logger
 	threadiness int
 }
 
-func NewController(threadiness int, factories config.Factories, reconciler Reconciler, logger log.Logger, queue workqueue.RateLimitingInterface, name string) Controller {
+func NewController(threadiness int, factories config.Factories, reconciler Reconciler, logger log.Logger, queue workqueue.RateLimitingInterface, name string) Controller { // nolint: staticcheck
 	c := &controller{
 		Factories:   factories,
 		queue:       queue,
@@ -50,7 +50,7 @@ func NewController(threadiness int, factories config.Factories, reconciler Recon
 		threadiness: threadiness,
 	}
 	if c.queue == nil {
-		c.queue = workqueue.NewNamedRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(BASE_DELAY, MAX_DELAY), name)
+		c.queue = workqueue.NewNamedRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(BASE_DELAY, MAX_DELAY), name) // nolint: staticcheck
 	}
 
 	c.Factories.Kubernikus.Kubernikus().V1().Klusters().Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{

pkg/controller/ground.go

@@ -63,7 +63,7 @@ type GroundControl struct {
 	config.Config
 	Recorder record.EventRecorder
 
-	queue           workqueue.RateLimitingInterface
+	queue           workqueue.RateLimitingInterface // nolint: staticcheck
 	klusterInformer informers_kubernikus.KlusterInformer
 	podInformer     informers_v1.PodInformer
 
@@ -80,7 +80,7 @@ func NewGroundController(threadiness int, factories config.Factories, clients co
 		Factories:       factories,
 		Config:          config,
 		Recorder:        recorder,
-		queue:           workqueue.NewNamedRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(5*time.Second, 300*time.Second), "ground"),
+		queue:           workqueue.NewNamedRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(5*time.Second, 300*time.Second), "ground"), // nolint: staticcheck
 		klusterInformer: factories.Kubernikus.Kubernikus().V1().Klusters(),
 		podInformer:     factories.Kubernetes.Core().V1().Pods(),
 		Logger:          logger,

pkg/controller/launch/controller.go

@@ -49,7 +49,7 @@ func NewController(threadiness int, factories config.Factories, clients config.C
 		Failed:     metrics.LaunchFailedOperationsTotal,
 	}
 
-	queue := workqueue.NewNamedRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(base.BASE_DELAY, base.MAX_DELAY), "launch")
+	queue := workqueue.NewNamedRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(base.BASE_DELAY, base.MAX_DELAY), "launch") // nolint: staticcheck
 	factories.NodesObservatory.NodeInformer().AddEventHandlerFuncs(nodeobservatory.NodeEventHandlerFuncs{
 		AddFunc: func(kluster *v1.Kluster, node *core_v1.Node) {
 			if key, err := cache.MetaNamespaceKeyFunc(kluster); err == nil {

pkg/controller/nodeobservatory/controller.go

@@ -41,7 +41,7 @@ type (
 		clientFactory       kube.SharedClientFactory
 		klusterInformer     kubernikus_informers_v1.KlusterInformer
 		namespace           string
-		queue               workqueue.RateLimitingInterface
+		queue               workqueue.RateLimitingInterface // nolint: staticcheck
 		logger              log.Logger
 		nodeInformerMap     sync.Map
 		handlersMux         sync.RWMutex
@@ -62,7 +62,7 @@ func NewController(informer kubernikus_informers_v1.KlusterInformer, factory kub
 	controller := &NodeObservatory{
 		clientFactory:   factory,
 		klusterInformer: informer,
-		queue:           workqueue.NewNamedRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(BaseDelay, MaxDelay), "nodeobservatory"),
+		queue:           workqueue.NewNamedRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(BaseDelay, MaxDelay), "nodeobservatory"), // nolint: staticcheck
 		logger:          logger,
 		nodeInformerMap: sync.Map{},
 		threadiness:     threadiness,

pkg/controller/servicing/collector.go

@@ -108,12 +108,10 @@ func (c *servicingNodesCollector) Collect(ch chan<- prometheus.Metric) {
 		waitingUptodate := float64(len(nodes.All())) - waitingReboot - waitingReplace
 
 		kubeletVersions := map[string]int{}
-		proxyVersions := map[string]int{}
 		osVersions := map[string]int{}
 
 		for _, node := range nodes.All() {
 			kubeletVersions[node.Status.NodeInfo.KubeletVersion]++
-			proxyVersions[node.Status.NodeInfo.KubeProxyVersion]++
 
 			osVersion, err := flatcar.ExractVersion(node)
 			if err != nil {
@@ -135,10 +133,6 @@ func (c *servicingNodesCollector) Collect(ch chan<- prometheus.Metric) {
 			ch <- prometheus.MustNewConstMetric(c.kubelet, prometheus.GaugeValue, float64(count), kluster.GetName(), version)
 		}
 
-		for version, count := range proxyVersions {
-			ch <- prometheus.MustNewConstMetric(c.proxy, prometheus.GaugeValue, float64(count), kluster.GetName(), version)
-		}
-
 		for version, count := range osVersions {
 			ch <- prometheus.MustNewConstMetric(c.osimage, prometheus.GaugeValue, float64(count), kluster.GetName(), version)
 		}

pkg/controller/servicing/lister.go

@@ -275,21 +275,6 @@ func (d *NodeLister) Replace() []*core_v1.Node {
 			continue
 		}
 
-		kubeProxyVersion, err := getKubeProxyVersion(node)
-		if err != nil {
-			d.Logger.Log(
-				"msg", "Couldn't get KubeProxy version from Node. Skipping node upgrade.",
-				"node", node.GetName(),
-				"err", err,
-			)
-			continue
-		}
-
-		if kubeProxyVersion.LessThan(klusterVersion) {
-			found = append(found, node)
-			continue
-		}
-
 		if util.IsFlatcarNodeWithRkt(node) {
 			uptodate := true
 
@@ -608,10 +593,6 @@ func getKubeletVersion(node *core_v1.Node) (*version.Version, error) {
 	return version.ParseSemantic(node.Status.NodeInfo.KubeletVersion)
 }
 
-func getKubeProxyVersion(node *core_v1.Node) (*version.Version, error) {
-	return version.ParseSemantic(node.Status.NodeInfo.KubeProxyVersion)
-}
-
 // GetNodeCondition extracts the provided condition from the given status and returns that.
 // Returns nil and -1 if the condition is not present, and the index of the located condition.
 func getNodeCondition(status *core_v1.NodeStatus,

pkg/controller/servicing/testing.go

@@ -136,10 +136,8 @@ func NewFakeKluster(opts *FakeKlusterOptions, afterFlatCarRktRemoval bool) (*v1.
 
 			if p.NodeKubeletOutdated {
 				node.Status.NodeInfo.KubeletVersion = "v1.10.11"
-				node.Status.NodeInfo.KubeProxyVersion = "v1.10.11"
 			} else {
 				node.Status.NodeInfo.KubeletVersion = "v1.10.15"
-				node.Status.NodeInfo.KubeProxyVersion = "v1.10.15"
 			}
 
 			nodes = append(nodes, node)

pkg/wormhole/server/controller.go

@@ -28,7 +28,7 @@ const (
 type Controller struct {
 	nodes       informers.NodeInformer
 	tunnel      *guttle.Server
-	queue       workqueue.RateLimitingInterface
+	queue       workqueue.RateLimitingInterface // nolint: staticcheck
 	store       map[string][]route
 	storeMu     sync.RWMutex
 	iptables    iptables.Interface
@@ -48,7 +48,7 @@ func NewController(informer informers.NodeInformer, serviceCIDR string, tunnel *
 	c := &Controller{
 		nodes:       informer,
 		tunnel:      tunnel,
-		queue:       workqueue.NewRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(5*time.Second, 300*time.Second)),
+		queue:       workqueue.NewRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(5*time.Second, 300*time.Second)), // nolint: staticcheck
 		store:       make(map[string][]route),
 		iptables:    iptables.New(utilexec.New(), iptables.ProtocolIpv4, logger),
 		hijackPort:  9191,