Add multiple roles support

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

config/config.go

@@ -31,7 +31,7 @@ type (
 	}
 
 	PoolConfigNode struct {
-		Role         *string                     `yaml:"role"`
+		Roles        *[]string                   `yaml:"roles"`
 		ConfigSource *PoolConfigNodeConfigSource `yaml:"configSource"`
 		Labels       *map[string]string          `yaml:"labels"`
 		Annotations  *map[string]string          `yaml:"annotations"`
@@ -107,20 +107,15 @@ func (p *PoolConfig) IsMatchingNode(node *corev1.Node) (bool, error) {
 func (p *PoolConfig) CreateJsonPatchSet() (patches []k8s.JsonPatch) {
 	patches = []k8s.JsonPatch{}
 
-	if p.Node.Role != nil {
-		label := "kubernetes.io/role"
-		patches = append(patches, k8s.JsonPatchString{
-			Op:    "replace",
-			Path:  fmt.Sprintf("/metadata/labels/%s", k8s.PatchPathEsacpe(label)),
-			Value: *p.Node.Role,
-		})
-
-		label = fmt.Sprintf("node-role.kubernetes.io/%s", *p.Node.Role)
-		patches = append(patches, k8s.JsonPatchString{
-			Op:    "replace",
-			Path:  fmt.Sprintf("/metadata/labels/%s", k8s.PatchPathEsacpe(label)),
-			Value: "",
-		})
+	if p.Node.Roles != nil {
+		for _, role := range *p.Node.Roles {
+			label := fmt.Sprintf("node-role.kubernetes.io/%s", role)
+			patches = append(patches, k8s.JsonPatchString{
+				Op:    "replace",
+				Path:  fmt.Sprintf("/metadata/labels/%s", k8s.PatchPathEsacpe(label)),
+				Value: "",
+			})
+		}
 	}
 
 	if p.Node.ConfigSource != nil {

deployment/config.yaml

@@ -11,7 +11,7 @@ data:
           - path: "{.spec.providerID}"
             regexp: "^.+virtualMachineScaleSets\\/aks-agents-35471996-vmss\\/.+$"
         node:
-          role: agents
+          roles: [agents]
           #configSource:
           #  configMap:
           #    name: kubelet-config

example.yaml

@@ -6,7 +6,7 @@ pools:
       match: "linux"
   node:
     # sets the kubernetes node role
-    role: linux
+    roles: [linux]
 
 - pool: windows
   continue: true
@@ -15,7 +15,7 @@ pools:
       match: "windows"
   node:
     # sets the kubernetes node role
-    role: windows
+    role: [windows]
 
 - pool: agents
   selector:
@@ -24,7 +24,7 @@ pools:
       match: "azure:///subscriptions/d86bcf13-ddf7-45ea-82f1-6f656767a318/resourceGroups/mc_k8s_mblaschke_westeurope/providers/Microsoft.Compute/virtualMachineScaleSets/aks-agents-35471996-vmss/virtualMachines/30"
   node:
     # sets the kubernetes node role
-    role: testing
+    roles: [agent,foobar]
 
     # dynamic kubelet configuration
     # see https://kubernetes.io/docs/tasks/administer-cluster/reconfigure-kubelet/
@@ -49,7 +49,7 @@ pools:
       regexp: "^.+virtualMachineScaleSets\\/aks-agents-35471996-vmss\\/.+$"
   node:
     # sets the kubernetes node role
-    role: testing
+    roles: [agent,regexp]
 
     # dynamic kubelet configuration
     # see https://kubernetes.io/docs/tasks/administer-cluster/reconfigure-kubelet/

manager/manager.go

@@ -94,50 +94,38 @@ func (m *KubePoolManager) startWatch() {
 	}()
 }
 
-func (m *KubePoolManager) applyToAll() error {
-	result, err := m.k8sClient.CoreV1().Nodes().List(m.ctx, metav1.ListOptions{})
-	if err != nil {
-		return err
-	}
-
-	for _, node := range result.Items {
-		m.applyNode(&node)
-	}
-
-	return nil
-}
-
 func (m *KubePoolManager) applyNode(node *corev1.Node) {
 	contextLogger := log.WithField("node", node.Name)
 
 	m.prometheus.nodeApplied.WithLabelValues(node.Name).Set(0)
 
 	for _, poolConfig := range m.Config.Pools {
+		poolLogger := contextLogger.WithField("pool", poolConfig.Name)
 		matching, err := poolConfig.IsMatchingNode(node)
 		if err != nil {
 			log.Panic(err)
 		}
 
 		if matching {
-			contextLogger.Infof("Node \"%s\" matches pool configuration \"%s\", applying pool config", node.Name, poolConfig.Name)
+			poolLogger.Infof("applying pool \"%s\" to node \"%s\"", poolConfig.Name, node.Name)
 
 			// create json patch
 			patchSet := poolConfig.CreateJsonPatchSet()
 			patchBytes, patchErr := json.Marshal(patchSet)
 			if patchErr != nil {
-				contextLogger.Errorf("failed to create json patch: %v", err)
+				poolLogger.Errorf("failed to create json patch: %v", err)
 				return
 			}
 
 			if !m.Opts.DryRun {
 				// patch node
 				_, k8sError := m.k8sClient.CoreV1().Nodes().Patch(m.ctx, node.Name, types.JSONPatchType, patchBytes, metav1.PatchOptions{})
 				if k8sError != nil {
-					contextLogger.Errorf("failed to apply json patch: %v", k8sError)
+					poolLogger.Errorf("failed to apply json patch: %v", k8sError)
 					return
 				}
 			} else {
-				contextLogger.Infof("Not applying pool config, dry-run active")
+				poolLogger.Infof("Not applying pool config, dry-run active")
 			}
 
 			m.prometheus.nodeApplied.WithLabelValues(node.Name).Set(1)
@@ -147,7 +135,7 @@ func (m *KubePoolManager) applyNode(node *corev1.Node) {
 				break
 			}
 		} else {
-			contextLogger.Debugf("Node NOT matches pool configuration \"%s\"", poolConfig.Name)
+			poolLogger.Debugf("Node NOT matches pool configuration \"%s\"", poolConfig.Name)
 		}
 	}
 }