diff --git a/charts/tfy-karpenter-config/Chart.yaml b/charts/tfy-karpenter-config/Chart.yaml index 38b3745e0..32c007f24 100644 --- a/charts/tfy-karpenter-config/Chart.yaml +++ b/charts/tfy-karpenter-config/Chart.yaml @@ -15,4 +15,4 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.2 +version: 0.1.3 diff --git a/charts/tfy-karpenter-config/templates/karpenter-default-awsnodetemplate.yaml b/charts/tfy-karpenter-config/templates/karpenter-default-awsnodetemplate.yaml index 1ddc21ca2..d3b70837b 100644 --- a/charts/tfy-karpenter-config/templates/karpenter-default-awsnodetemplate.yaml +++ b/charts/tfy-karpenter-config/templates/karpenter-default-awsnodetemplate.yaml @@ -4,14 +4,14 @@ metadata: name: default namespace: karpenter spec: - instanceProfile: {{ .Values.karpenter.settings.aws.defaultInstanceProfile }} + instanceProfile: {{ .Values.karpenter.instanceProfile }} subnetSelector: - kubernetes.io/cluster/{{ .Values.karpenter.settings.aws.clusterName }}: shared + kubernetes.io/cluster/{{ .Values.cluster.name }}: shared subnet: private securityGroupSelector: - karpenter.sh/discovery: {{ .Values.karpenter.settings.aws.clusterName }} + karpenter.sh/discovery: {{ .Values.cluster.name }} tags: - karpenter.sh/discovery: {{ .Values.karpenter.settings.aws.clusterName }} + karpenter.sh/discovery: {{ .Values.cluster.name }} blockDeviceMappings: - deviceName: /dev/xvda ebs: diff --git a/charts/tfy-karpenter-config/templates/karpenter-default-provisioner.yaml b/charts/tfy-karpenter-config/templates/karpenter-default-provisioner.yaml index 2187b2f6e..005d06cb1 100644 --- a/charts/tfy-karpenter-config/templates/karpenter-default-provisioner.yaml +++ b/charts/tfy-karpenter-config/templates/karpenter-default-provisioner.yaml @@ -4,9 +4,9 @@ metadata: name: default namespace: karpenter spec: -{{ toYaml .Values.karpenter.provisioners.defaultProvisionerSpec | indent 2 }} +{{ toYaml .Values.karpenter.defaultProvisionerSpec | indent 2 }} providerRef: name: default -{{- if not .Values.karpenter.provisioners.defaultProvisionerSpec.consolidation.enabled }} +{{- if not .Values.karpenter.defaultProvisionerSpec.consolidation.enabled }} ttlSecondsAfterEmpty: 30 {{- end }} \ No newline at end of file diff --git a/charts/tfy-karpenter-config/templates/karpenter-gpu-provisioner.yaml b/charts/tfy-karpenter-config/templates/karpenter-gpu-provisioner.yaml index 4f19589f3..30262b629 100644 --- a/charts/tfy-karpenter-config/templates/karpenter-gpu-provisioner.yaml +++ b/charts/tfy-karpenter-config/templates/karpenter-gpu-provisioner.yaml @@ -1,4 +1,4 @@ -{{- if .Values.karpenter.provisioners.gpuProvisionerSpec.enabled }} +{{- if .Values.karpenter.gpuProvisionerSpec.enabled }} apiVersion: karpenter.sh/v1alpha5 kind: Provisioner metadata: @@ -6,8 +6,8 @@ metadata: namespace: karpenter spec: weight: 10 - consolidation: - enabled: true + consolidation: + enabled: true requirements: - key: karpenter.sh/capacity-type operator: In