From e952ee40c1730f5a0069c3e3935c75aa8ef229c0 Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Wed, 1 May 2024 12:09:32 +0200
Subject: [PATCH] Revert "Move email and uuid to labels"

This reverts commit 89dbe6120af77f099406cc63de81f29eb29bde6e.
---
 internal/controllers/accounts.go     | 8 +++-----
 internal/controllers/environments.go | 5 +----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/internal/controllers/accounts.go b/internal/controllers/accounts.go
index 507854c..e8c40ac 100644
--- a/internal/controllers/accounts.go
+++ b/internal/controllers/accounts.go
@@ -72,12 +72,10 @@ func (acc *Account) Create(ctx context.Context) error {
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      acc.Data.Username,
 			Namespace: "softplayer-accounts",
-			Labels: map[string]string{
-				"softplayer.net/email": acc.Data.Email,
-				"softplayer.net/uuid":  acc.Data.UUID,
-			},
 		},
 		StringData: map[string]string{
+			"uuid":     acc.Data.UUID,
+			"email":    acc.Data.Email,
 			"password": passwordHash,
 		},
 	}
@@ -189,7 +187,7 @@ func (acc *Account) Login(ctx context.Context) error {
 		return err
 	}
 
-	acc.Data.UUID = string(sec.ObjectMeta.Labels["uuid"])
+	acc.Data.UUID = string(sec.Data["uuid"])
 	tokenName := fmt.Sprintf("sa-%s", acc.Data.UUID)
 	saSec := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
diff --git a/internal/controllers/environments.go b/internal/controllers/environments.go
index 2d7c329..0c0a5d0 100644
--- a/internal/controllers/environments.go
+++ b/internal/controllers/environments.go
@@ -26,7 +26,6 @@ type Environemnt struct {
 
 type EnvironemntData struct {
 	Name        string
-	FmtName     string
 	Description string
 	Provider    string
 	Kubernetes  string
@@ -40,14 +39,12 @@ SP_PROVIDER=%s
 SP_KUBERNETES=%s
 SP_SERVER_TYPE=%s
 SP_SERVER_LOCATION=%s
-SP_DESCRIPTION=%s
-SP_NAME=%s`,
+SP_DESCRIPTION=%s`,
 		e.Provider,
 		e.Kubernetes,
 		e.ServerType,
 		e.Location,
 		e.Description,
-		e.Name,
 	)
 
 	return vars, nil