Merge pull request #20 from TykTechnologies/fix/fix-bootstrapping-com…

…ponent-charts

(fix): bootstrapping in component charts

constants/constants.go

@@ -20,11 +20,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"
 )

data/app.go

@@ -38,7 +38,6 @@ type AppArguments struct {
 	EnterprisePortalSecretName    string
 	BootstrapPortal               bool
 	DashboardDeploymentName       string
-	ReleaseName                   string
 }
 
 var AppConfig = AppArguments{
@@ -71,7 +70,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
 
@@ -152,9 +150,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()
 

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).