Remove deprectatet kustomize dings

deploy/base/kustomization.yaml

@@ -2,9 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 commonAnnotations:
   source-repository: https://edugit.org/Teckids/team-pr/teckids.org
-commonLabels:
-  app: teckids-website
 resources:
-  - deployment.yaml
-  - service.yaml
-  - ingress.yaml
+- deployment.yaml
+- service.yaml
+- ingress.yaml
+labels:
+- includeSelectors: true
+  pairs:
+    app: teckids-website

deploy/overlays/production/kustomization.yaml

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
-- ../../base
 commonAnnotations:
   source-repository: https://edugit.org/Teckids/team-pr/teckids.org
-commonLabels:
-  app: teckids-website
-  environment: production
 namespace: teckids-website
 patches:
-- target:
-    kind: Ingress
-    name: teckids-website-caddy
-  patch: |-
+- patch: |-
     - op: replace
       path: /spec/rules/0/host
       value: teckids.org
     - op: replace
       path: /spec/tls/0/hosts/0
       value: teckids.org
+  target:
+    kind: Ingress
+    name: teckids-website-caddy
+resources:
+- ../../base
+labels:
+- includeSelectors: true
+  pairs:
+    app: teckids-website
+    environment: production

deploy/overlays/review/kustomization.yaml

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
-- ../../base
 commonAnnotations:
   source-repository: https://edugit.org/Teckids/team-pr/teckids.org
-commonLabels:
-  app: teckids-website
-  environment: __REVIEW_NAME__
 namespace: teckids-website
 patches:
-- target:
-    kind: Ingress
-    name: teckids-website-caddy
-  patch: |-
+- patch: |-
     - op: replace
       path: /spec/rules/0/host
       value: __REVIEW_NAME__.review.teckids.org
@@ -22,3 +14,13 @@ patches:
     - op: replace
       path: /spec/tls/0/secretName
       value: __REVIEW_NAME__-website-tls
+  target:
+    kind: Ingress
+    name: teckids-website-caddy
+resources:
+- ../../base
+labels:
+- includeSelectors: true
+  pairs:
+    app: teckids-website
+    environment: __REVIEW_NAME__