Merge pull request kubevirt#4984 from ashleyschuett/patches-generic-m…

…atch

Patches generic match

api/openapi-spec/swagger.json

@@ -9242,6 +9242,12 @@
    },
    "v1.CustomizeComponentsPatch": {
     "type": "object",
+    "required": [
+     "resourceName",
+     "resourceType",
+     "patch",
+     "type"
+    ],
     "properties": {
      "patch": {
       "type": "string"

manifests/generated/kv-resource.yaml

@@ -226,6 +226,11 @@ spec:
                         type: string
                       type:
                         type: string
+                    required:
+                    - patch
+                    - resourceName
+                    - resourceType
+                    - type
                     type: object
                   type: array
                   x-kubernetes-list-type: atomic

pkg/virt-operator/resource/apply/patches.go

@@ -181,14 +181,22 @@ func (c *Customizer) GetPatchesForResource(resourceType, name string) []v1.Custo
 	patches := make([]v1.CustomizeComponentsPatch, 0)
 
 	for _, p := range allPatches {
-		if strings.EqualFold(p.ResourceType, resourceType) && strings.EqualFold(p.ResourceName, name) {
+		if valueMatchesKey(p.ResourceType, resourceType) && valueMatchesKey(p.ResourceName, name) {
 			patches = append(patches, p)
 		}
 	}
 
 	return patches
 }
 
+func valueMatchesKey(value, key string) bool {
+	if value == "*" {
+		return true
+	}
+
+	return strings.EqualFold(key, value)
+}
+
 func getHash(customizations v1.CustomizeComponents) (string, error) {
 	// #nosec CWE: 326 - Use of weak cryptographic primitive (http://cwe.mitre.org/data/definitions/326.html)
 	// reason: sha1 is not used for encryption but for creating a hash value

pkg/virt-operator/resource/apply/patches_test.go

@@ -21,6 +21,7 @@ package apply
 
 import (
 	. "github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 
 	"kubevirt.io/client-go/log"
@@ -57,6 +58,12 @@ var _ = Describe("Patches", func() {
 					Patch:        `{"metadata":{"labels":{"new-key":"added-this-label"}}}`,
 					Type:         v1.StrategicMergePatchType,
 				},
+				{
+					ResourceName: "*",
+					ResourceType: "Deployment",
+					Patch:        `{"spec":{"template":{"spec":{"imagePullSecrets":[{"name":"image-pull"}]}}}}`,
+					Type:         v1.StrategicMergePatchType,
+				},
 			},
 		})
 
@@ -75,6 +82,7 @@ var _ = Describe("Patches", func() {
 			err := config.GenericApplyPatches(deployments)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(deployment.ObjectMeta.Labels["new-key"]).To(Equal("added-this-label"))
+			Expect(deployment.Spec.Template.Spec.ImagePullSecrets[0].Name).To(Equal("image-pull"))
 
 			err = config.GenericApplyPatches([]string{"string"})
 			Expect(err).To(HaveOccurred())
@@ -146,4 +154,16 @@ var _ = Describe("Patches", func() {
 			Expect(h1).To(Equal(h2))
 		})
 	})
+
+	table.DescribeTable("valueMatchesKey", func(value, key string, expected bool) {
+
+		matches := valueMatchesKey(value, key)
+		Expect(matches).To(Equal(expected))
+
+	},
+		table.Entry("should match wildcard", "*", "Deployment", true),
+		table.Entry("should match with different cases", "deployment", "Deployment", true),
+		table.Entry("should not match", "Service", "Deployment", false),
+	)
+
 })

pkg/virt-operator/resource/generate/components/validations_generated.go

@@ -422,6 +422,11 @@ var CRDsValidation map[string]string = map[string]string{
                     type: string
                   type:
                     type: string
+                required:
+                - patch
+                - resourceName
+                - resourceType
+                - type
                 type: object
               type: array
               x-kubernetes-list-type: atomic

staging/src/kubevirt.io/client-go/api/v1/types.go

@@ -1352,10 +1352,10 @@ type CustomizeComponents struct {
 
 // +k8s:openapi-gen=true
 type CustomizeComponentsPatch struct {
-	ResourceName string    `json:"resourceName,omitempty"`
-	ResourceType string    `json:"resourceType,omitempty"`
-	Patch        string    `json:"patch,omitempty"`
-	Type         PatchType `json:"type,omitempty"`
+	ResourceName string    `json:"resourceName"`
+	ResourceType string    `json:"resourceType"`
+	Patch        string    `json:"patch"`
+	Type         PatchType `json:"type"`
 }
 
 type PatchType string