fix: fix skaffold label setter to work properly for cnrm resources (#7221)

Author: aaron-prindle

pkg/skaffold/kubernetes/manifest/labels.go

@@ -61,6 +61,9 @@ func (rsi *ResourceSelectorLabels) allowByGroupKind(gk apimachinery.GroupKind) b
 func (rsi *ResourceSelectorLabels) allowByNavpath(gk apimachinery.GroupKind, navpath string, k string) (string, bool) {
 	for _, w := range ConfigConnectorResourceSelector {
 		if w.Matches(gk.Group, gk.Kind) {
+			if k != metadataField {
+				return "", false
+			}
 			return "labels", true
 		}
 	}
@@ -85,7 +88,7 @@ func (rsi *ResourceSelectorLabels) allowByNavpath(gk apimachinery.GroupKind, nav
 	if rf, ok := rsi.allowlist[gk]; ok {
 		for _, allowpath := range rf.Labels {
 			if allowpath == ".*" {
-				if k != "metadata" {
+				if k != metadataField {
 					return "", false
 				}
 				return "labels", true

pkg/skaffold/kubernetes/manifest/namespaces.go

@@ -55,7 +55,7 @@ func newNamespaceCollector() *namespaceCollector {
 }
 
 func (r *namespaceCollector) Visit(gk schema.GroupKind, navpath string, o map[string]interface{}, k string, v interface{}, rs ResourceSelector) bool {
-	if k != "metadata" {
+	if k != metadataField {
 		return true
 	}
 

pkg/skaffold/kubernetes/manifest/visitor.go

@@ -25,6 +25,8 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/yaml"
 )
 
+const metadataField = "metadata"
+
 type ResourceSelector interface {
 	allowByGroupKind(apimachinery.GroupKind) bool
 	allowByNavpath(apimachinery.GroupKind, string, string) (string, bool)