Merge branch 'main' into cgroups-nodepool

giantswarm · Oct 3, 2024 · 3094dcf · 3094dcf
2 parents 7a5e50d + 650f0ce
commit 3094dcf
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Allow configuring `cgroups` v1 or v2 compatibility per node pool, instead of the whole cluster. Control plane nodes always use cgroups v2.
 
+## [1.5.1] - 2024-10-03
+
+### Changed
+
+- Pass `Template` object through to generated systemd unit values.
+
 ## [1.5.0] - 2024-10-03
 
 ### Added
@@ -639,7 +645,8 @@ For Kubernetes <v1.29, you will need to re-enable it using the respective values
 
 - Update and clean up the template repo.
 
-[Unreleased]: https://github.com/giantswarm/cluster/compare/v1.5.0...HEAD
+[Unreleased]: https://github.com/giantswarm/cluster/compare/v1.5.1...HEAD
+[1.5.1]: https://github.com/giantswarm/cluster/compare/v1.5.0...v1.5.1
 [1.5.0]: https://github.com/giantswarm/cluster/compare/v1.4.1...v1.5.0
 [1.4.1]: https://github.com/giantswarm/cluster/compare/v1.4.0...v1.4.1
 [1.4.0]: https://github.com/giantswarm/cluster/compare/v1.3.0...v1.4.0

diff --git a/helm/cluster/Chart.yaml b/helm/cluster/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: cluster
 type: application
-version: 1.5.0
+version: 1.5.1
 description: Giant Swarm cluster chart with provider-independent cluster resources
 icon: https://s.giantswarm.io/app-icons/giantswarm/1/dark.svg
 home: https://github.com/giantswarm/cluster

diff --git a/helm/cluster/templates/bastion/_helpers_flatcar.tpl b/helm/cluster/templates/bastion/_helpers_flatcar.tpl
@@ -3,7 +3,7 @@ containerLinuxConfig:
   additionalConfig: |
     systemd:
       {{- if (((((($.Values.providerIntegration.bastion).kubeadmConfig).ignition).containerLinuxConfig).additionalConfig).systemd).units }}
-      {{- $systemdUnitValues := dict "global" $.Values.global "units" $.Values.providerIntegration.bastion.kubeadmConfig.ignition.containerLinuxConfig.additionalConfig.systemd.units }}
+      {{- $systemdUnitValues := dict "global" $.Values.global "Template" $.Template "units" $.Values.providerIntegration.bastion.kubeadmConfig.ignition.containerLinuxConfig.additionalConfig.systemd.units }}
       units:
       {{- include "cluster.internal.kubeadm.ignition.containerLinuxConfig.additionalConfig.systemd.units" $systemdUnitValues | indent 6 }}
       {{- else }}

diff --git a/helm/cluster/templates/clusterapi/controlplane/_helpers_flatcar.tpl b/helm/cluster/templates/clusterapi/controlplane/_helpers_flatcar.tpl
@@ -19,11 +19,11 @@ containerLinuxConfig:
 
 {{- define "cluster.internal.controlPlane.kubeadm.ignition.containerLinuxConfig.additionalConfig.systemd.units" }}
 {{- if ((((($.Values.providerIntegration.kubeadmConfig).ignition).containerLinuxConfig).additionalConfig).systemd).units }}
-{{- $systemdUnitValues := dict "global" $.Values.global "units" $.Values.providerIntegration.kubeadmConfig.ignition.containerLinuxConfig.additionalConfig.systemd.units }}
+{{- $systemdUnitValues := dict "global" $.Values.global "Template" $.Template "units" $.Values.providerIntegration.kubeadmConfig.ignition.containerLinuxConfig.additionalConfig.systemd.units }}
 {{- include "cluster.internal.kubeadm.ignition.containerLinuxConfig.additionalConfig.systemd.units" $systemdUnitValues }}
 {{- end }}
 {{- if (((((($.Values.providerIntegration.controlPlane).kubeadmConfig).ignition).containerLinuxConfig).additionalConfig).systemd).units }}
-{{- $systemdUnitValues := dict "global" $.Values.global "units" $.Values.providerIntegration.controlPlane.kubeadmConfig.ignition.containerLinuxConfig.additionalConfig.systemd.units }}
+{{- $systemdUnitValues := dict "global" $.Values.global "Template" $.Template "units" $.Values.providerIntegration.controlPlane.kubeadmConfig.ignition.containerLinuxConfig.additionalConfig.systemd.units }}
 {{- include "cluster.internal.kubeadm.ignition.containerLinuxConfig.additionalConfig.systemd.units" $systemdUnitValues }}
 {{- end }}
 {{- end }}

diff --git a/helm/cluster/templates/clusterapi/workers/_helpers_flatcar.tpl b/helm/cluster/templates/clusterapi/workers/_helpers_flatcar.tpl
@@ -16,11 +16,11 @@ containerLinuxConfig:
 
 {{- define "cluster.internal.workers.kubeadm.ignition.containerLinuxConfig.additionalConfig.systemd.units" }}
 {{- if ((((($.Values.providerIntegration.kubeadmConfig).ignition).containerLinuxConfig).additionalConfig).systemd).units }}
-{{- $systemdUnitValues := dict "global" $.Values.global "units" $.Values.providerIntegration.kubeadmConfig.ignition.containerLinuxConfig.additionalConfig.systemd.units }}
+{{- $systemdUnitValues := dict "global" $.Values.global "Template" $.Template "units" $.Values.providerIntegration.kubeadmConfig.ignition.containerLinuxConfig.additionalConfig.systemd.units }}
 {{- include "cluster.internal.kubeadm.ignition.containerLinuxConfig.additionalConfig.systemd.units" $systemdUnitValues }}
 {{- end }}
 {{- if (((((($.Values.providerIntegration.workers).kubeadmConfig).ignition).containerLinuxConfig).additionalConfig).systemd).units }}
-{{- $systemdUnitValues := dict "global" $.Values.global "units" $.Values.providerIntegration.workers.kubeadmConfig.ignition.containerLinuxConfig.additionalConfig.systemd.units }}
+{{- $systemdUnitValues := dict "global" $.Values.global "Template" $.Template "units" $.Values.providerIntegration.workers.kubeadmConfig.ignition.containerLinuxConfig.additionalConfig.systemd.units }}
 {{- include "cluster.internal.kubeadm.ignition.containerLinuxConfig.additionalConfig.systemd.units" $systemdUnitValues }}
 {{- end }}
 {{- end }}