From 06725e52549b549dfbb19fa5a7125c7a85865133 Mon Sep 17 00:00:00 2001
From: Damien Chomat <damien.chomat@gmail.com>
Date: Thu, 29 Feb 2024 10:51:07 -0800
Subject: [PATCH] add missing intermediary path for Karpenter image (bis)

---
 .../components/karpenter/kustomization.yaml   | 80 +++++++++----------
 gitops/components/karpenter/resources.yaml    |  7 +-
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/gitops/components/karpenter/kustomization.yaml b/gitops/components/karpenter/kustomization.yaml
index 60e0809..032d7f3 100644
--- a/gitops/components/karpenter/kustomization.yaml
+++ b/gitops/components/karpenter/kustomization.yaml
@@ -25,43 +25,43 @@ patches:
           namespace: kube-node-lease
           server: https://kubernetes.default.svc
 
-#replacements:
-#  - source:
-#      version: v1
-#      kind: ConfigMap
-#      name: kustomize-environment
-#      fieldPath: data.KARPENTER_ROLE_ARN
-#    targets:
-#      - select:
-#          group: argoproj.io
-#          version: v1alpha1
-#          kind: Application
-#          name: karpenter
-#        fieldPaths:
-#          - spec.source.helm.valuesObject.serviceAccount.annotations.[eks.amazonaws.com/role-arn]
-#  - source:
-#      version: v1
-#      kind: ConfigMap
-#      name: kustomize-environment
-#      fieldPath: data.CLUSTER_NAME
-#    targets:
-#      - select:
-#          group: argoproj.io
-#          version: v1alpha1
-#          kind: Application
-#          name: karpenter
-#        fieldPaths:
-#          - spec.source.helm.valuesObject.settings.clusterName
-#  - source:
-#      version: v1
-#      kind: ConfigMap
-#      name: kustomize-environment
-#      fieldPath: data.CLUSTER_NAME
-#    targets:
-#      - select:
-#          group: argoproj.io
-#          version: v1alpha1
-#          kind: Application
-#          name: karpenter
-#        fieldPaths:
-#          - spec.source.helm.valuesObject.settings.interruptionQueue
+replacements:
+  - source:
+      version: v1
+      kind: ConfigMap
+      name: kustomize-environment
+      fieldPath: data.KARPENTER_ROLE_ARN
+    targets:
+      - select:
+          group: argoproj.io
+          version: v1alpha1
+          kind: Application
+          name: karpenter
+        fieldPaths:
+          - spec.source.helm.valuesObject.serviceAccount.annotations.[eks.amazonaws.com/role-arn]
+  - source:
+      version: v1
+      kind: ConfigMap
+      name: kustomize-environment
+      fieldPath: data.CLUSTER_NAME
+    targets:
+      - select:
+          group: argoproj.io
+          version: v1alpha1
+          kind: Application
+          name: karpenter
+        fieldPaths:
+          - spec.source.helm.valuesObject.settings.clusterName
+  - source:
+      version: v1
+      kind: ConfigMap
+      name: kustomize-environment
+      fieldPath: data.CLUSTER_NAME
+    targets:
+      - select:
+          group: argoproj.io
+          version: v1alpha1
+          kind: Application
+          name: karpenter
+        fieldPaths:
+          - spec.source.helm.valuesObject.settings.interruptionQueue
diff --git a/gitops/components/karpenter/resources.yaml b/gitops/components/karpenter/resources.yaml
index 4370f05..20d8ad1 100644
--- a/gitops/components/karpenter/resources.yaml
+++ b/gitops/components/karpenter/resources.yaml
@@ -23,9 +23,10 @@ spec:
       releaseName: karpenter
       valuesObject:
         controller:
-          image: ghcr.io/pelotech/karpenter
-          tag: v0.34.1-modified
-          digest: sha256:feb63abd6dbc2461ce5b7906cb6fe8e18a09f78aa8ed61cfd1f35df4db748cfe
+          image:
+            repository: ghcr.io/pelotech/karpenter
+            tag: v0.34.1-modified
+            digest: sha256:feb63abd6dbc2461ce5b7906cb6fe8e18a09f78aa8ed61cfd1f35df4db748cfe
         env:
           - name: IGNORED_RESOURCE_REQUESTS
             value: "devices.kubevirt.io/kvm,devices.kubevirt.io/tun,devices.kubevirt.io/vhost-net"