From bf8885b6852ab38a903b98c013319f7dc64a9fdd Mon Sep 17 00:00:00 2001
From: dark0dave <dark0dave@mykolab.com>
Date: Thu, 8 Aug 2024 20:58:07 +0000
Subject: [PATCH] Multicluster kustomize fix for demo (#1815)

* Fix Kustomize for multicluster demo

Signed-off-by: Brandon Marick <brandon.r.marick@intel.com>

* fix(autoscaler): Should use autoscaling/v2, not autoscaling/v2beta1 which was removed in 1.26

Signed-off-by: dark0dave <dark0dave@mykolab.com>

---------

Signed-off-by: Brandon Marick <brandon.r.marick@intel.com>
Signed-off-by: dark0dave <dark0dave@mykolab.com>
Co-authored-by: Brandon Marick <brandon.r.marick@intel.com>
Co-authored-by: Flynn <kflynn@users.noreply.github.com>
---
 multicluster/base/kustomization.yml              | 11 +++++++----
 .../base/{patch.yml => patch-deployment.yml}     | 10 ----------
 multicluster/east/kustomization.yml              | 16 +++++++++++++---
 multicluster/west/kustomization.yml              | 16 +++++++++++++---
 4 files changed, 33 insertions(+), 20 deletions(-)
 rename multicluster/base/{patch.yml => patch-deployment.yml} (64%)

diff --git a/multicluster/base/kustomization.yml b/multicluster/base/kustomization.yml
index 7a8b0b85a0..e04be782c6 100644
--- a/multicluster/base/kustomization.yml
+++ b/multicluster/base/kustomization.yml
@@ -1,9 +1,12 @@
-bases:
-  - github.com/stefanprodan/podinfo/kustomize?ref=4.0.2
-
 resources:
+  - github.com/stefanprodan/podinfo/kustomize?ref=6.7.0
   - frontend.yml
   - ns.yml
 
 patches:
-  - patch.yml
+  - target:
+      group: apps
+      version: v1
+      kind: Deployment
+      name: podinfo
+    path: patch-deployment.yml
diff --git a/multicluster/base/patch.yml b/multicluster/base/patch-deployment.yml
similarity index 64%
rename from multicluster/base/patch.yml
rename to multicluster/base/patch-deployment.yml
index b5e475ee2f..cd304bda53 100644
--- a/multicluster/base/patch.yml
+++ b/multicluster/base/patch-deployment.yml
@@ -13,13 +13,3 @@ spec:
         - name: podinfod
           securityContext:
             runAsUser: 1337
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: podinfo
----
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: podinfo
diff --git a/multicluster/east/kustomization.yml b/multicluster/east/kustomization.yml
index d093349549..7071482a89 100644
--- a/multicluster/east/kustomization.yml
+++ b/multicluster/east/kustomization.yml
@@ -1,6 +1,16 @@
-bases:
+resources:
   - ../base
 
 patches:
-  - podinfo.yml
-  - frontend.yml
+  - target:
+      group: apps
+      version: v1
+      kind: Deployment
+      name: podinfo
+    path: podinfo.yml
+  - target:
+      group: apps
+      version: v1
+      kind: Deployment
+      name: frontend
+    path: frontend.yml
diff --git a/multicluster/west/kustomization.yml b/multicluster/west/kustomization.yml
index d093349549..7071482a89 100644
--- a/multicluster/west/kustomization.yml
+++ b/multicluster/west/kustomization.yml
@@ -1,6 +1,16 @@
-bases:
+resources:
   - ../base
 
 patches:
-  - podinfo.yml
-  - frontend.yml
+  - target:
+      group: apps
+      version: v1
+      kind: Deployment
+      name: podinfo
+    path: podinfo.yml
+  - target:
+      group: apps
+      version: v1
+      kind: Deployment
+      name: frontend
+    path: frontend.yml