improve api calls for patches

send only one api call per node to apply patches

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

Author: mblaschke

config/config.go

@@ -104,13 +104,13 @@ func (p *PoolConfig) IsMatchingNode(node *corev1.Node) (bool, error) {
 	return true, nil
 }
 
-func (p *PoolConfig) CreateJsonPatchSet() (patches []k8s.JsonPatch) {
-	patches = []k8s.JsonPatch{}
+func (p *PoolConfig) CreateJsonPatchSet() (patchSet *k8s.JsonPatchSet) {
+	patchSet = k8s.NewJsonPatchSet()
 
 	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{
+			patchSet.Add(k8s.JsonPatchString{
 				Op:    "replace",
 				Path:  fmt.Sprintf("/metadata/labels/%s", k8s.PatchPathEsacpe(label)),
 				Value: "",
@@ -119,7 +119,7 @@ func (p *PoolConfig) CreateJsonPatchSet() (patches []k8s.JsonPatch) {
 	}
 
 	if p.Node.ConfigSource != nil {
-		patches = append(patches, k8s.JsonPatchObject{
+		patchSet.Add(k8s.JsonPatchObject{
 			Op:    "replace",
 			Path:  "/spec/configSource",
 			Value: *p.Node.ConfigSource,
@@ -128,7 +128,7 @@ func (p *PoolConfig) CreateJsonPatchSet() (patches []k8s.JsonPatch) {
 
 	if p.Node.Labels != nil {
 		for name, value := range *p.Node.Labels {
-			patches = append(patches, k8s.JsonPatchString{
+			patchSet.Add(k8s.JsonPatchString{
 				Op:    "replace",
 				Path:  fmt.Sprintf("/metadata/labels/%s", k8s.PatchPathEsacpe(name)),
 				Value: value,
@@ -138,13 +138,13 @@ func (p *PoolConfig) CreateJsonPatchSet() (patches []k8s.JsonPatch) {
 
 	if p.Node.Annotations != nil {
 		for name, value := range *p.Node.Annotations {
-			patches = append(patches, k8s.JsonPatchString{
+			patchSet.Add(k8s.JsonPatchString{
 				Op:    "replace",
 				Path:  fmt.Sprintf("/metadata/annotations/%s", k8s.PatchPathEsacpe(name)),
 				Value: value,
 			})
 		}
 	}
 
-	return patches
+	return
 }

k8s/patch.go

@@ -1,6 +1,9 @@
 package k8s
 
-import "strings"
+import (
+	"encoding/json"
+	"strings"
+)
 
 type (
 	JsonPatch interface{}
@@ -18,10 +21,46 @@ type (
 		Path  string      `json:"path"`
 		Value interface{} `json:"value"`
 	}
+
+	JsonPatchSet struct {
+		List map[string]JsonPatch
+	}
 )
 
 func PatchPathEsacpe(val string) string {
 	val = strings.ReplaceAll(val, "~", "~0")
 	val = strings.ReplaceAll(val, "/", "~1")
 	return val
 }
+
+func NewJsonPatchSet() *JsonPatchSet {
+	set := JsonPatchSet{}
+	set.List = map[string]JsonPatch{}
+	return &set
+}
+
+func (set *JsonPatchSet) AddSet(patchSet *JsonPatchSet) {
+	for _, patch := range patchSet.List {
+		set.Add(patch)
+	}
+}
+
+func (set *JsonPatchSet) Add(patch JsonPatch) {
+	switch v := patch.(type) {
+	case JsonPatchString:
+		set.List[v.Path] = patch
+	case JsonPatchObject:
+		set.List[v.Path] = patch
+	default:
+		panic("jsonPatch type not defined or allowed")
+	}
+}
+
+func (set *JsonPatchSet) Marshal() ([]byte, error) {
+	patchList := []JsonPatch{}
+	for _, patch := range set.List {
+		patchList = append(patchList, patch)
+	}
+
+	return json.Marshal(patchList)
+}

manager/manager.go

@@ -2,12 +2,12 @@ package manager
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"github.com/operator-framework/operator-sdk/pkg/leader"
 	"github.com/prometheus/client_golang/prometheus"
 	log "github.com/sirupsen/logrus"
 	"github.com/webdevops/kube-pool-manager/config"
+	"github.com/webdevops/kube-pool-manager/k8s"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -147,6 +147,9 @@ func (m *KubePoolManager) startNodeWatch() error {
 func (m *KubePoolManager) applyNode(node *corev1.Node) {
 	contextLogger := log.WithField("node", node.Name)
 
+	nodePatchSets := k8s.NewJsonPatchSet()
+	poolNameList := []string{}
+
 	for _, poolConfig := range m.Config.Pools {
 		m.prometheus.nodePoolStatus.WithLabelValues(node.Name, poolConfig.Name).Set(0)
 		poolLogger := contextLogger.WithField("pool", poolConfig.Name)
@@ -156,36 +159,40 @@ func (m *KubePoolManager) applyNode(node *corev1.Node) {
 		}
 
 		if matching {
-			poolLogger.Infof("applying pool \"%s\" to node \"%s\"", poolConfig.Name, node.Name)
+			poolLogger.Infof("adding configuration from pool \"%s\" to node \"%s\"", poolConfig.Name, node.Name)
 
 			// create json patch
 			patchSet := poolConfig.CreateJsonPatchSet()
-			patchBytes, patchErr := json.Marshal(patchSet)
-			if patchErr != nil {
-				poolLogger.Errorf("failed to create json patch: %v", err)
-				return
-			}
+			nodePatchSets.AddSet(patchSet)
+			poolNameList = append(poolNameList, poolConfig.Name)
+		} else {
+			poolLogger.Debugf("Node NOT matches pool \"%s\"", poolConfig.Name)
+		}
+	}
 
-			if !m.Opts.DryRun {
-				// patch node
-				_, k8sError := m.k8sClient.CoreV1().Nodes().Patch(m.ctx, node.Name, types.JSONPatchType, patchBytes, metav1.PatchOptions{})
-				if k8sError != nil {
-					poolLogger.Errorf("failed to apply json patch: %v", k8sError)
-					return
-				}
-			} else {
-				poolLogger.Infof("Not applying pool config, dry-run active")
-			}
+	// apply patches
+	contextLogger.Infof("applying configuration to node \"%s\"", node.Name)
 
-			m.prometheus.nodePoolStatus.WithLabelValues(node.Name, poolConfig.Name).Set(1)
-			m.prometheus.nodeApplied.WithLabelValues(node.Name).SetToCurrentTime()
+	patchBytes, patchErr := nodePatchSets.Marshal()
+	if patchErr != nil {
+		contextLogger.Errorf("failed to create json patch: %v", patchErr)
+		return
+	}
 
-			// check if this more pool configurations should be applied
-			if !poolConfig.Continue {
-				break
-			}
-		} else {
-			poolLogger.Debugf("Node NOT matches pool configuration \"%s\"", poolConfig.Name)
+	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)
+			return
 		}
+	} else {
+		contextLogger.Infof("Not applying pool config, dry-run active")
+	}
+
+	// metrics
+	for _, poolName := range poolNameList {
+		m.prometheus.nodePoolStatus.WithLabelValues(node.Name, poolName).Set(1)
+		m.prometheus.nodeApplied.WithLabelValues(node.Name).SetToCurrentTime()
 	}
 }