Add cluster label to default-apps bundle so that it's deleted when Cl…

…uster is deleted (#907)
giantswarm · Oct 5, 2022 · d6f7691 · d6f7691
1 parent da9d69e
commit d6f7691
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
 
 ## [Unreleased]
 
+### Changed
+
+- Add `giantswarm.io/cluster` label to the 'default-apps' bundle so that it's deleted when a `Cluster` is deleted.
+
 ## [2.23.2] - 2022-10-04
 
 ### Added

diff --git a/cmd/template/cluster/provider/capa.go b/cmd/template/cluster/provider/capa.go
@@ -228,6 +228,7 @@ func templateDefaultAppsAWS(ctx context.Context, k8sClient k8sclient.Interface,
 		var err error
 		appYAML, err = templateapp.NewAppCR(templateapp.Config{
 			AppName:                 appName,
+			Cluster:                 config.Name,
 			Catalog:                 config.App.DefaultAppsCatalog,
 			InCluster:               true,
 			Name:                    DefaultAppsRepoName,

diff --git a/cmd/template/cluster/provider/capg.go b/cmd/template/cluster/provider/capg.go
@@ -176,6 +176,7 @@ func templateDefaultAppsGCP(ctx context.Context, k8sClient k8sclient.Interface,
 		var err error
 		appYAML, err = templateapp.NewAppCR(templateapp.Config{
 			AppName:                 appName,
+			Cluster:                 config.Name,
 			Catalog:                 config.App.DefaultAppsCatalog,
 			InCluster:               true,
 			Name:                    DefaultAppsGCPRepoName,

diff --git a/cmd/template/cluster/provider/capo.go b/cmd/template/cluster/provider/capo.go
@@ -184,6 +184,7 @@ func templateDefaultAppsOpenstack(ctx context.Context, k8sClient k8sclient.Inter
 		var err error
 		appYAML, err = templateapp.NewAppCR(templateapp.Config{
 			AppName:                 appName,
+			Cluster:                 config.Name,
 			Catalog:                 config.App.DefaultAppsCatalog,
 			InCluster:               true,
 			Name:                    "default-apps-openstack",

diff --git a/cmd/template/cluster/testdata/run_template_cluster_capa.golden b/cmd/template/cluster/testdata/run_template_cluster_capa.golden
@@ -81,6 +81,7 @@ kind: App
 metadata:
   labels:
     app-operator.giantswarm.io/version: 0.0.0
+    giantswarm.io/cluster: test1
   name: test1-default-apps
   namespace: org-test
 spec:

diff --git a/cmd/template/cluster/testdata/run_template_cluster_gcp.golden b/cmd/template/cluster/testdata/run_template_cluster_gcp.golden
@@ -81,6 +81,7 @@ kind: App
 metadata:
   labels:
     app-operator.giantswarm.io/version: 0.0.0
+    giantswarm.io/cluster: test1
   name: test1-default-apps
   namespace: org-test
 spec: