Test Strategic Merge and JSON 6902 patches

Signed-off-by: Hidde Beydals <hello@hidde.co>

.github/workflows/e2e.yaml

@@ -82,12 +82,21 @@ jobs:
           kubectl -n impersonation wait kustomizations/podinfo --for=condition=ready --timeout=4m
           kubectl -n impersonation delete kustomizations/podinfo
           until kubectl -n impersonation get deploy/podinfo 2>&1 | grep NotFound ; do sleep 2; done
-      - name: Run image overide tests
+      - name: Run images override tests
         run: |
-          kubectl -n override-test apply -f ./config/testdata/overrides
-          kubectl -n override-test wait kustomizations/podinfo --for=condition=ready --timeout=1m
-          ACTUAL_TAG=$(kubectl -n override-test get deployments podinfo -o jsonpath='{.spec.template.spec.containers[0].image}' | cut -f2 -d ":")
+          kubectl -n images-test apply -f ./config/testdata/overrides/images.yaml
+          kubectl -n images-test wait kustomizations/podinfo --for=condition=ready --timeout=1m
+          ACTUAL_TAG=$(kubectl -n images-test get deployments podinfo -o jsonpath='{.spec.template.spec.containers[0].image}' | cut -f2 -d ":")
           if [[ $ACTUAL_TAG != "5.0.0" ]]; then echo "Image tag did not override" && exit 1; fi
+      - name: Run patches override tests
+        run: |
+          kubectl -n patches-test apply -f ./config/testdata/overrides/patches.yaml
+          kubectl -n patches-test wait kustomizations/podinfo --for=condition=ready --timeout=1m
+          RESULT=$(kubectl -n patches-test get deployment mypodinfo -o jsonpath='{.metadata.labels.yyyy}')
+          if [ "$RESULT" != "xxxx" ]; then
+              echo -e "$RESULT\n\ndoes not equal\n\nxxxx"
+              exit 1
+          fi
       - name: Logs
         run: |
           kubectl -n kustomize-system logs deploy/source-controller

config/testdata/overrides/test.yaml → config/testdata/overrides/images.yaml

@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: override-test
+  name: images-test
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
   name: podinfo
-  namespace: override-test
+  namespace: images-test
 spec:
   interval: 5m
   url: https://github.com/stefanprodan/podinfo
@@ -18,9 +18,9 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
 kind: Kustomization
 metadata:
   name: podinfo
-  namespace: override-test
+  namespace: images-test
 spec:
-  targetNamespace: override-test
+  targetNamespace: images-test
   interval: 5m
   path: "./kustomize"
   prune: true

config/testdata/overrides/patches.yaml

@@ -0,0 +1,47 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: patches-test
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: podinfo
+  namespace: patches-test
+spec:
+  interval: 5m
+  url: https://github.com/stefanprodan/podinfo
+  ref:
+    branch: master
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+kind: Kustomization
+metadata:
+  name: podinfo
+  namespace: patches-test
+spec:
+  targetNamespace: patches-test
+  interval: 5m
+  path: "./kustomize"
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: podinfo
+  validation: client
+  patchesStrategicMerge:
+    - kind: Deployment
+      apiVersion: apps/v1
+      metadata:
+        name: mypodinfo
+        labels:
+          xxxx: yyyy
+  patchesJson6902:
+    - target:
+        group: apps
+        version: v1
+        kind: Deployment
+        name: mypodinfo
+      patch:
+        - op: add
+          path: /metadata/labels/yyyy
+          value: xxxx