Merge branch 'main' into TT-10195-rename-tyk-enterprise-portal-to-tyk…

…-dev-portal
TykTechnologies · Oct 25, 2023 · 4ad9b2a · 4ad9b2a
2 parents aa9551e + 76b329a
commit 4ad9b2a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 11 deletions.
diff --git a/constants/constants.go b/constants/constants.go
@@ -22,11 +22,9 @@ const (
 	DashboardEnabledEnvVar              = "DASHBOARD_ENABLED"
 	TykOrgNameEnvVar                    = "TYK_ORG_NAME"
 	TykOrgCnameEnvVar                   = "TYK_ORG_CNAME"
-	ReleaseNameEnvVar                   = "RELEASE_NAME"
 
 	TykBootstrapLabel                = "tyk.tyk.io/k8s-bootstrap"
 	TykBootstrapPreDeleteLabel       = "tyk-k8s-bootstrap-pre-delete"
 	TykBootstrapDashboardDeployLabel = "tyk-dashboard"
 	TykBootstrapDashboardSvcLabel    = "tyk-dashboard"
-	TykBootstrapReleaseLabel         = "release"
 )
diff --git a/data/app.go b/data/app.go
@@ -40,7 +40,6 @@ type AppArguments struct {
 	DeveloperPortalSecretName     string
 	BootstrapPortal               bool
 	DashboardDeploymentName       string
-	ReleaseName                   string
 }
 
 var AppConfig = AppArguments{
@@ -74,7 +73,6 @@ func InitAppDataPostInstall() error {
 	AppConfig.TykAdminSecret = os.Getenv(constants.TykAdminSecretEnvVar)
 	AppConfig.CurrentOrgName = os.Getenv(constants.TykOrgNameEnvVar)
 	AppConfig.Cname = os.Getenv(constants.TykOrgCnameEnvVar)
-	AppConfig.ReleaseName = os.Getenv(constants.ReleaseNameEnvVar)
 
 	var err error
 
@@ -164,9 +162,6 @@ func discoverDashboardSvc() error {
 	ls := metav1.LabelSelector{MatchLabels: map[string]string{
 		constants.TykBootstrapLabel: constants.TykBootstrapDashboardSvcLabel,
 	}}
-	if AppConfig.ReleaseName != "" {
-		ls.MatchLabels[constants.TykBootstrapReleaseLabel] = AppConfig.ReleaseName
-	}
 
 	l := labels.Set(ls.MatchLabels).String()
 

diff --git a/helpers/portal.go b/helpers/portal.go
@@ -242,10 +242,6 @@ func RestartDashboard() error {
 			constants.TykBootstrapLabel: constants.TykBootstrapDashboardDeployLabel,
 		}}
 
-		if data.AppConfig.ReleaseName != "" {
-			ls.MatchLabels[constants.TykBootstrapReleaseLabel] = data.AppConfig.ReleaseName
-		}
-
 		deployments, err := clientset.
 			AppsV1().
 			Deployments(data.AppConfig.TykPodNamespace).