koord-manager: fix noderesource update when compared values are zero (#…

…1550)

Signed-off-by: saintube <[email protected]>

.goreleaser.yaml

@@ -31,10 +31,7 @@ archives:
       {{ .Version }}_
       {{ .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
-      {{- else }}{{ .Arch }}{{ end }}
-      {{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_
-      {{ . }}{{ end }}
-      {{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}
+      {{- else }}{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ end }}
 checksum:
   name_template: 'checksums.txt'
 snapshot:

pkg/slo-controller/noderesource/noderesource_controller.go

@@ -50,6 +50,7 @@ const (
 
 var (
 	NodeResourcePlugins []string
+	AllPlugins          []string
 )
 
 type NodeResourceReconciler struct {
@@ -137,7 +138,14 @@ func InitFlags(fs *flag.FlagSet) {
 		"'-noderesource-plugins=*' enables all plugins. "+
 		"'-noderesource-plugins=BatchResource' means only the 'BatchResource' plugin is enabled. "+
 		"'-noderesource-plugins=*,-BatchResource' means all plugins except the 'BatchResource' plugin are enabled.\n"+
-		"All plugins: %s", strings.Join(NodeResourcePlugins, ", ")))
+		"All plugins: %s", strings.Join(AllPlugins, ", ")))
+}
+
+func addPluginOption(plugin framework.Plugin, enabled bool) {
+	AllPlugins = append(AllPlugins, plugin.Name())
+	if enabled {
+		NodeResourcePlugins = append(NodeResourcePlugins, plugin.Name())
+	}
 }
 
 func isPluginEnabled(pluginName string) bool {

pkg/slo-controller/noderesource/plugins_profile.go

@@ -26,8 +26,8 @@ import (
 
 func init() {
 	// set default plugins
-	NodeResourcePlugins = append(NodeResourcePlugins, midresource.PluginName)
-	NodeResourcePlugins = append(NodeResourcePlugins, batchresource.PluginName)
+	addPluginOption(&midresource.Plugin{}, true)
+	addPluginOption(&batchresource.Plugin{}, true)
 }
 
 func addPlugins(filter framework.FilterFn) {
@@ -40,6 +40,7 @@ func addPlugins(filter framework.FilterFn) {
 }
 
 var (
+	// SetupPlugins implement the setup for node resource plugin.
 	setupPlugins = []framework.SetupPlugin{}
 	// NodePreparePlugin implements node resource preparing for the calculated results.
 	nodePreparePlugins = []framework.NodePreparePlugin{

pkg/util/resource.go

@@ -111,7 +111,8 @@ func IsResourceDiff(old, new corev1.ResourceList, resourceName corev1.ResourceNa
 		return false
 	}
 
-	return newQuant >= oldQuant*(1+diffThreshold) || newQuant <= oldQuant*(1-diffThreshold)
+	// not equal for both are zero
+	return newQuant > oldQuant*(1+diffThreshold) || newQuant < oldQuant*(1-diffThreshold)
 }
 
 func QuantityPtr(q resource.Quantity) *resource.Quantity {

pkg/util/resource_test.go

@@ -313,12 +313,25 @@ func TestIsResourceDiff(t *testing.T) {
 			},
 			want: true,
 		},
+		{
+			name: "both resources are zero",
+			args: args{
+				old: corev1.ResourceList{
+					corev1.ResourceCPU: *resource.NewQuantity(0, resource.DecimalSI),
+				},
+				new: corev1.ResourceList{
+					corev1.ResourceCPU: *resource.NewQuantity(0, resource.DecimalSI),
+				},
+				resourceName:  corev1.ResourceCPU,
+				diffThreshold: 2,
+			},
+			want: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := IsResourceDiff(tt.args.old, tt.args.new, tt.args.resourceName, tt.args.diffThreshold); got != tt.want {
-				t.Errorf("IsResourceDiff() = %v, want %v", got, tt.want)
-			}
+			got := IsResourceDiff(tt.args.old, tt.args.new, tt.args.resourceName, tt.args.diffThreshold)
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }