From 5cdba0d5b396c2c51d96b4d8b524495b104674f2 Mon Sep 17 00:00:00 2001 From: Burak Sekili Date: Wed, 25 Oct 2023 11:05:59 +0300 Subject: [PATCH 1/2] Remove constants to parse release naming environment variable Signed-off-by: Burak Sekili --- constants/constants.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/constants/constants.go b/constants/constants.go index ebe2a05..a64fa74 100644 --- a/constants/constants.go +++ b/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" ) From 186be975751f256343f0685e8993a205f5d6fd0e Mon Sep 17 00:00:00 2001 From: Burak Sekili Date: Wed, 25 Oct 2023 11:06:26 +0300 Subject: [PATCH 2/2] Remove release namings while listing k8s resources to find dashboard deploy and svc Signed-off-by: Burak Sekili --- data/app.go | 5 ----- helpers/portal.go | 4 ---- 2 files changed, 9 deletions(-) diff --git a/data/app.go b/data/app.go index b21ab94..653d7de 100644 --- a/data/app.go +++ b/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() diff --git a/helpers/portal.go b/helpers/portal.go index 42cad11..3dda944 100644 --- 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).