Merge pull request #66 from /issues/65

Fix Helm warnings seen in cofidectl up
cofide · Dec 6, 2024 · d669116 · d669116
2 parents 9a46cb8 + 15b7fee
commit d669116
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/internal/pkg/attestationpolicy/attestationpolicy.go b/internal/pkg/attestationpolicy/attestationpolicy.go
@@ -70,8 +70,12 @@ func getAPLabelSelectorHelmConfig(selector *attestation_policy_proto.APLabelSele
 		return nil
 	}
 
-	var matchExpressions = []map[string]any{}
+	matchLabels := map[string]any{}
+	for k, v := range selector.MatchLabels {
+		matchLabels[k] = v
+	}
 
+	matchExpressions := []map[string]any{}
 	for _, me := range selector.MatchExpressions {
 		matchExpressions = append(matchExpressions, map[string]any{
 			"key":      me.GetKey(),
@@ -81,7 +85,7 @@ func getAPLabelSelectorHelmConfig(selector *attestation_policy_proto.APLabelSele
 	}
 
 	return map[string]any{
-		"matchLabels":      selector.MatchLabels,
+		"matchLabels":      matchLabels,
 		"matchExpressions": matchExpressions,
 	}
 }
diff --git a/pkg/provider/helm/values_test.go b/pkg/provider/helm/values_test.go
@@ -188,7 +188,7 @@ func TestHelmValuesGenerator_GenerateValues_success(t *testing.T) {
 									},
 									"namespaceSelector": Values{
 										"matchExpressions": []map[string]any{},
-										"matchLabels": map[string]string{
+										"matchLabels": map[string]any{
 											"kubernetes.io/metadata.name": "ns1",
 										},
 									},