diff --git a/src/operator/controllers/node_watcher.go b/src/operator/controllers/node_watcher.go index a6367b88aad..372695c028d 100644 --- a/src/operator/controllers/node_watcher.go +++ b/src/operator/controllers/node_watcher.go @@ -74,18 +74,18 @@ type nodeCompatTracker struct { func (n *nodeCompatTracker) addNode(node *v1.Node) { n.numNodes++ - kVersion := getNodeKernelVersion(node) - n.kernelVersionDist[kVersion]++ - if !nodeIsCompatible(kVersion) { + kernelVersion := getNodeKernelVersion(node) + n.kernelVersionDist[kernelVersion]++ + if !nodeIsCompatible(kernelVersion) { n.numIncompatible++ } } func (n *nodeCompatTracker) removeNode(node *v1.Node) { n.numNodes-- - kVersion := getNodeKernelVersion(node) - n.kernelVersionDist[kVersion]-- - if !nodeIsCompatible(kVersion) { + kernelVersion := getNodeKernelVersion(node) + n.kernelVersionDist[kernelVersion]-- + if !nodeIsCompatible(kernelVersion) { n.numIncompatible-- } } diff --git a/src/operator/controllers/vizier_controller.go b/src/operator/controllers/vizier_controller.go index f93c7ff928d..897f6ccac0c 100644 --- a/src/operator/controllers/vizier_controller.go +++ b/src/operator/controllers/vizier_controller.go @@ -699,17 +699,6 @@ func (r *VizierReconciler) deployVizierCore(ctx context.Context, namespace strin return err } - // If updating, don't reapply service accounts as that will create duplicate service tokens. - if allowUpdate { - filteredResources := make([]*k8s.Resource, 0) - for _, r := range resources { - if r.GVK.Kind != "ServiceAccount" { - filteredResources = append(filteredResources, r) - } - } - resources = filteredResources - } - for _, r := range resources { err = updateResourceConfiguration(r, vz) if err != nil {