render cleanup hook job using cluster chart

giantswarm · Sep 24, 2024 · 8a9acfe · 8a9acfe
1 parent 9ba89e7
commit 8a9acfe
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 168 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Migrated all worker resources (`KubeadmConfigTemplate`, `MachineDeployment` and `MachineHealthCheck`) to be rendered from the shared `cluster` chart.
+- Render cleanup hook job using cluster chart.
 
 ## [0.63.0] - 2024-09-03
 

diff --git a/helm/cluster-vsphere/templates/helmreleases/cleanup-helmreleases-hook-job.yaml b/helm/cluster-vsphere/templates/helmreleases/cleanup-helmreleases-hook-job.yaml
diff --git a/helm/cluster-vsphere/values.schema.json b/helm/cluster-vsphere/values.schema.json
@@ -359,7 +359,7 @@
                     "provider": "vsphere",
                     "resourcesApi": {
                         "bastionResourceEnabled": false,
-                        "cleanupHelmReleaseResourcesEnabled": false,
+                        "cleanupHelmReleaseResourcesEnabled": true,
                         "clusterResourceEnabled": true,
                         "controlPlaneResourceEnabled": true,
                         "helmRepositoryResourcesEnabled": true,

diff --git a/helm/cluster-vsphere/values.yaml b/helm/cluster-vsphere/values.yaml
@@ -155,7 +155,7 @@ cluster:
     provider: vsphere
     resourcesApi:
       bastionResourceEnabled: false
-      cleanupHelmReleaseResourcesEnabled: false
+      cleanupHelmReleaseResourcesEnabled: true
       clusterResourceEnabled: true
       controlPlaneResourceEnabled: true
       helmRepositoryResourcesEnabled: true