From 273135f3f2675dee8df611f80403d0a7314c147e Mon Sep 17 00:00:00 2001 From: nadav buchman Date: Wed, 28 Aug 2024 12:16:20 +0300 Subject: [PATCH 1/2] fix nodeclass ref --- charts/karpenter_nodes/templates/nodepool.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/karpenter_nodes/templates/nodepool.yaml b/charts/karpenter_nodes/templates/nodepool.yaml index d412ac2..b0710a1 100644 --- a/charts/karpenter_nodes/templates/nodepool.yaml +++ b/charts/karpenter_nodes/templates/nodepool.yaml @@ -27,7 +27,7 @@ spec: {{- $v.nodeClassRef | toYaml | nindent 8 }} {{- else }} name: {{ $k }}-{{ $v.instances.architecture | default $.Values.instances.architecture }} - apiVersion: karpenter.sh/{{ $.Values.ApiVersion }} + group: karpenter.k8s.aws kind: EC2NodeClass {{- end }} {{- if or (hasKey $v "taints") (eq ($v.autoTaint | default $.Values.autoTaint) "true") }} From 096b4fef960693ec0e4c5204d519c6c325641131 Mon Sep 17 00:00:00 2001 From: nadav buchman Date: Wed, 28 Aug 2024 12:16:43 +0300 Subject: [PATCH 2/2] fix other stuff --- charts/karpenter_nodes/Chart.yaml | 2 +- .../karpenter_nodes/examples/argocd_example.yaml | 2 +- .../karpenter_nodes/examples/output/output.yaml | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/karpenter_nodes/Chart.yaml b/charts/karpenter_nodes/Chart.yaml index ceacdd1..c7f69b1 100644 --- a/charts/karpenter_nodes/Chart.yaml +++ b/charts/karpenter_nodes/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: karpenter_nodes -version: 1.1.3 +version: 1.1.4 description: A Helm chart for generating NodeClasses and NodePools for Karpenter maintainers: - name: nadavbuc diff --git a/charts/karpenter_nodes/examples/argocd_example.yaml b/charts/karpenter_nodes/examples/argocd_example.yaml index 8590901..4062f22 100644 --- a/charts/karpenter_nodes/examples/argocd_example.yaml +++ b/charts/karpenter_nodes/examples/argocd_example.yaml @@ -9,7 +9,7 @@ spec: sources: - repoURL: 'https://opensource.fiverr.com/public_charts/' chart: karpenter_nodes - targetRevision: 1.1.3 + targetRevision: 1.1.4 helm: valueFiles: - $values/karpenter_nodes/eks-dev/common.yaml diff --git a/charts/karpenter_nodes/examples/output/output.yaml b/charts/karpenter_nodes/examples/output/output.yaml index abe4308..736dbdb 100644 --- a/charts/karpenter_nodes/examples/output/output.yaml +++ b/charts/karpenter_nodes/examples/output/output.yaml @@ -1088,7 +1088,7 @@ spec: spec: nodeClassRef: name: nodes-canary-amd64 - apiVersion: karpenter.sh/v1 + group: karpenter.k8s.aws kind: EC2NodeClass taints: - key: dedicated @@ -1179,7 +1179,7 @@ spec: spec: nodeClassRef: name: nodes-cilium-managed-amd64 - apiVersion: karpenter.sh/v1 + group: karpenter.k8s.aws kind: EC2NodeClass taints: - key: dedicated @@ -1266,7 +1266,7 @@ spec: spec: nodeClassRef: name: nodes-default-amd64 - apiVersion: karpenter.sh/v1 + group: karpenter.k8s.aws kind: EC2NodeClass requirements: - key: "karpenter.k8s.aws/instance-category" @@ -1433,7 +1433,7 @@ spec: spec: nodeClassRef: name: nodes-gpu-amd64 - apiVersion: karpenter.sh/v1 + group: karpenter.k8s.aws kind: EC2NodeClass taints: - key: dedicated @@ -1507,7 +1507,7 @@ spec: spec: nodeClassRef: name: nodes-ingress-multiarch - apiVersion: karpenter.sh/v1 + group: karpenter.k8s.aws kind: EC2NodeClass taints: - key: dedicated @@ -1585,7 +1585,7 @@ spec: spec: nodeClassRef: name: nodes-jobs-amd64 - apiVersion: karpenter.sh/v1 + group: karpenter.k8s.aws kind: EC2NodeClass taints: - key: dedicated @@ -1665,7 +1665,7 @@ spec: spec: nodeClassRef: name: nodes-monitoring-multiarch - apiVersion: karpenter.sh/v1 + group: karpenter.k8s.aws kind: EC2NodeClass taints: - key: dedicated @@ -1737,7 +1737,7 @@ spec: spec: nodeClassRef: name: nodes-workers-amd64 - apiVersion: karpenter.sh/v1 + group: karpenter.k8s.aws kind: EC2NodeClass taints: - key: dedicated