🤖 Sync from open-cluster-management-io/policy-generator-plugin: #136

examples/input-kustomize/base/kustomization.yaml

@@ -1,5 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
 - nginx-pod.yaml
 labels:
-  - pairs:
-      app: myapp
+- pairs:
+    app: myapp

examples/input-kustomize/dev/kustomization.yml

@@ -1,3 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
 - ../base
 namePrefix: dev-

examples/input-kustomize/kustomization.yml

@@ -1,4 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
 - dev
 - prod
-

examples/input-kustomize/prod/kustomization.yml

@@ -1,3 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
 - ../base
 namePrefix: prod-

examples/kustomization.yml

@@ -1,7 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 generators:
 - ./policyGenerator.yaml
 - ./policyGenerator-kustomize.yaml
-patchesStrategicMerge:
-- input/patch.yaml
-commonLabels:
-  custom: myApp
+
+patches:
+- path: input/patch.yaml
+
+labels:
+- includeSelectors: true
+  pairs:
+    custom: myApp

internal/patches.go

@@ -175,8 +175,8 @@ func (m *manifestPatcher) ApplyPatches() ([]map[string]interface{}, error) {
 	}
 
 	kustomizationYAMLFile := map[string][]interface{}{
-		"resources":             {},
-		"patchesStrategicMerge": {},
+		"resources": {},
+		"patches":   {},
 	}
 
 	options := []struct {
@@ -185,7 +185,7 @@ func (m *manifestPatcher) ApplyPatches() ([]map[string]interface{}, error) {
 		objects      []map[string]interface{}
 	}{
 		{"manifest", "resources", m.manifests},
-		{"patch", "patchesStrategicMerge", m.patches},
+		{"patch", "patches", m.patches},
 	}
 	for _, option := range options {
 		for i, object := range option.objects {
@@ -205,9 +205,15 @@ func (m *manifestPatcher) ApplyPatches() ([]map[string]interface{}, error) {
 				return nil, fmt.Errorf(errTemplate, option.optionType, err)
 			}
 
-			kustomizationYAMLFile[option.kustomizeKey] = append(
-				kustomizationYAMLFile[option.kustomizeKey], manifestFileName,
-			)
+			if option.kustomizeKey != "patches" {
+				kustomizationYAMLFile[option.kustomizeKey] = append(
+					kustomizationYAMLFile[option.kustomizeKey], manifestFileName,
+				)
+			} else {
+				kustomizationYAMLFile[option.kustomizeKey] = append(
+					kustomizationYAMLFile[option.kustomizeKey], map[string]interface{}{"path": manifestFileName},
+				)
+			}
 		}
 	}
 

internal/patches_test.go

@@ -288,7 +288,8 @@ func TestApplyPatchesInvalidPatch(t *testing.T) {
 	patcher := manifestPatcher{manifests: manifests, patches: patches}
 	_, err := patcher.ApplyPatches()
 
-	expected := "failed to apply the patch(es) to the manifest(s) using Kustomize: no matches " +
+	expected := "failed to apply the patch(es) to the manifest(s) using Kustomize: no resource " +
+		"matches strategic merge patch \"ToasterOven.v1.[noGrp]/configmap2.default\": no matches " +
 		"for Id ToasterOven.v1.[noGrp]/configmap2.default; failed to find unique target for patch " +
 		"ToasterOven.v1.[noGrp]/configmap2.default"
 	assertEqual(t, err.Error(), expected)

internal/plugin.go

@@ -1703,6 +1703,11 @@ func (p *Plugin) generateSelector(
 			resolvedSelectorsLS.MatchExpressions = append(resolvedSelectorsLS.MatchExpressions, lsReq)
 		}
 
+		// Sort the MatchExpressions to make the result deterministic
+		sort.Slice(resolvedSelectorsLS.MatchExpressions, func(i, j int) bool {
+			return resolvedSelectorsLS.MatchExpressions[i].Key < resolvedSelectorsLS.MatchExpressions[j].Key
+		})
+
 		resolved, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&resolvedSelectorsLS)
 		if err != nil {
 			panic(err)