Updating KubeConfig secret (#250)

* Updating KubeConfig secret

* Adding support for cluster id

CHANGELOG.md

@@ -9,9 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add support for Cluster ID selector.
+
 ### Changed
 
 - PSP CR installation put under global scope
+- Place KubeConfig under the `value` key in the secret in addition.
 
 ## [1.3.0] - 2023-11-10
 

apptest.go

@@ -394,14 +394,22 @@ func (a *AppSetup) createApps(ctx context.Context, apps []App) error {
 				return microerror.Mask(err)
 			}
 		}
+
+		labels := map[string]string{
+			label.AppKubernetesName: app.Name,
+		}
+
+		if app.ClusterID != "" {
+			labels[label.Cluster] = app.ClusterID
+		} else {
+			labels[label.AppOperatorVersion] = appOperatorVersion
+		}
+
 		appCR := &v1alpha1.App{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      appCRName,
 				Namespace: appCRNamespace,
-				Labels: map[string]string{
-					label.AppOperatorVersion: appOperatorVersion,
-					label.AppKubernetesName:  app.Name,
-				},
+				Labels:    labels,
 			},
 			Spec: v1alpha1.AppSpec{
 				Catalog:    app.CatalogName,
@@ -482,6 +490,7 @@ func (a *AppSetup) createKubeConfigSecret(ctx context.Context, name, namespace,
 
 	data := map[string][]byte{
 		"kubeConfig": []byte(kubeConfig),
+		"value":      []byte(kubeConfig),
 	}
 	desired := &corev1.Secret{
 		Data: data,

spec.go

@@ -41,6 +41,7 @@ type App struct {
 	AppOperatorVersion string
 	CatalogName        string
 	CatalogURL         string
+	ClusterID          string
 	KubeConfig         string
 	Name               string
 	Namespace          string