CR feedback

TykTechnologies · Oct 26, 2023 · 24f65f8 · 24f65f8
1 parent 4ad9b2a
commit 24f65f8
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 77 deletions.
diff --git a/cmd/bootstrap-post/main.go b/cmd/bootstrap-post/main.go
@@ -55,7 +55,7 @@ func main() {
 	fmt.Println("Finished bootstrapping operator secret")
 
 	fmt.Println("Started bootstrapping portal secret")
-	if data.AppConfig.EnterprisePortalSecretEnabled || data.AppConfig.DeveloperPortalSecretEnabled {
+	if data.AppConfig.DeveloperPortalSecretEnabled {
 		err = helpers.BootstrapTykPortalSecret()
 		if err != nil {
 			fmt.Println(err)

diff --git a/constants/constants.go b/constants/constants.go
@@ -1,27 +1,25 @@
 package constants
 
 const (
-	OperatorSecretEnabledEnvVar         = "OPERATOR_SECRET_ENABLED"
-	EnterprisePortalSecretEnabledEnvVar = "ENTERPRISE_PORTAL_SECRET_ENABLED"
-	DeveloperPortalSecretEnabledEnvVar  = "DEVELOPER_PORTAL_SECRET_ENABLED"
-	BootstrapPortalEnvVar               = "BOOTSTRAP_PORTAL"
-	TykDashboardDeployEnvVar            = "TYK_DASHBOARD_DEPLOY"
-	OperatorSecretNameEnvVar            = "OPERATOR_SECRET_NAME"
-	EnterprisePortalSecretNameEnvVar    = "ENTERPRISE_PORTAL_SECRET_NAME"
-	DeveloperPortalSecretNameEnvVar     = "DEVELOPER_PORTAL_SECRET_NAME"
-	TykAdminFirstNameEnvVar             = "TYK_ADMIN_FIRST_NAME"
-	TykAdminLastNameEnvVar              = "TYK_ADMIN_LAST_NAME"
-	TykAdminEmailEnvVar                 = "TYK_ADMIN_EMAIL"
-	TykAdminPasswordEnvVar              = "TYK_ADMIN_PASSWORD"
-	TykPodNamespaceEnvVar               = "TYK_POD_NAMESPACE"
-	TykDashboardProtoEnvVar             = "TYK_DASHBOARD_PROTO"
-	TykDashboardInsecureSkipVerify      = "TYK_DASHBOARD_INSECURE_SKIP_VERIFY"
-	TykDashboardLicenseEnvVarName       = "TYK_DB_LICENSEKEY"
-	TykDbLicensekeyEnvVar               = "TYK_DB_LICENSEKEY"
-	TykAdminSecretEnvVar                = "TYK_ADMIN_SECRET"
-	DashboardEnabledEnvVar              = "DASHBOARD_ENABLED"
-	TykOrgNameEnvVar                    = "TYK_ORG_NAME"
-	TykOrgCnameEnvVar                   = "TYK_ORG_CNAME"
+	OperatorSecretEnabledEnvVar        = "OPERATOR_SECRET_ENABLED"
+	DeveloperPortalSecretEnabledEnvVar = "DEVELOPER_PORTAL_SECRET_ENABLED"
+	BootstrapPortalEnvVar              = "BOOTSTRAP_PORTAL"
+	TykDashboardDeployEnvVar           = "TYK_DASHBOARD_DEPLOY"
+	OperatorSecretNameEnvVar           = "OPERATOR_SECRET_NAME"
+	DeveloperPortalSecretNameEnvVar    = "DEVELOPER_PORTAL_SECRET_NAME"
+	TykAdminFirstNameEnvVar            = "TYK_ADMIN_FIRST_NAME"
+	TykAdminLastNameEnvVar             = "TYK_ADMIN_LAST_NAME"
+	TykAdminEmailEnvVar                = "TYK_ADMIN_EMAIL"
+	TykAdminPasswordEnvVar             = "TYK_ADMIN_PASSWORD"
+	TykPodNamespaceEnvVar              = "TYK_POD_NAMESPACE"
+	TykDashboardProtoEnvVar            = "TYK_DASHBOARD_PROTO"
+	TykDashboardInsecureSkipVerify     = "TYK_DASHBOARD_INSECURE_SKIP_VERIFY"
+	TykDashboardLicenseEnvVarName      = "TYK_DB_LICENSEKEY"
+	TykDbLicensekeyEnvVar              = "TYK_DB_LICENSEKEY"
+	TykAdminSecretEnvVar               = "TYK_ADMIN_SECRET"
+	DashboardEnabledEnvVar             = "DASHBOARD_ENABLED"
+	TykOrgNameEnvVar                   = "TYK_ORG_NAME"
+	TykOrgCnameEnvVar                  = "TYK_ORG_CNAME"
 
 	TykBootstrapLabel                = "tyk.tyk.io/k8s-bootstrap"
 	TykBootstrapPreDeleteLabel       = "tyk-k8s-bootstrap-pre-delete"

diff --git a/data/app.go b/data/app.go
@@ -13,33 +13,31 @@ import (
 )
 
 type AppArguments struct {
-	DashboardHost                 string
-	DashboardPort                 int32
-	DashBoardLicense              string
-	TykAdminSecret                string
-	CurrentOrgName                string
-	TykAdminPassword              string
-	Cname                         string
-	TykAdminFirstName             string
-	TykAdminLastName              string
-	TykAdminEmailAddress          string
-	UserAuth                      string
-	OrgId                         string
-	CatalogId                     string
-	DashboardUrl                  string
-	DashboardProto                string
-	TykPodNamespace               string
-	DashboardSvc                  string
-	DashboardInsecureSkipVerify   bool
-	IsDashboardEnabled            bool
-	OperatorSecretEnabled         bool
-	OperatorSecretName            string
-	EnterprisePortalSecretEnabled bool
-	EnterprisePortalSecretName    string
-	DeveloperPortalSecretEnabled  bool
-	DeveloperPortalSecretName     string
-	BootstrapPortal               bool
-	DashboardDeploymentName       string
+	DashboardHost                string
+	DashboardPort                int32
+	DashBoardLicense             string
+	TykAdminSecret               string
+	CurrentOrgName               string
+	TykAdminPassword             string
+	Cname                        string
+	TykAdminFirstName            string
+	TykAdminLastName             string
+	TykAdminEmailAddress         string
+	UserAuth                     string
+	OrgId                        string
+	CatalogId                    string
+	DashboardUrl                 string
+	DashboardProto               string
+	TykPodNamespace              string
+	DashboardSvc                 string
+	DashboardInsecureSkipVerify  bool
+	IsDashboardEnabled           bool
+	OperatorSecretEnabled        bool
+	OperatorSecretName           string
+	DeveloperPortalSecretEnabled bool
+	DeveloperPortalSecretName    string
+	BootstrapPortal              bool
+	DashboardDeploymentName      string
 }
 
 var AppConfig = AppArguments{
@@ -55,7 +53,6 @@ var AppConfig = AppArguments{
 
 func InitAppDataPreDelete() error {
 	AppConfig.OperatorSecretName = os.Getenv(constants.OperatorSecretNameEnvVar)
-	AppConfig.EnterprisePortalSecretName = os.Getenv(constants.EnterprisePortalSecretNameEnvVar)
 	AppConfig.DeveloperPortalSecretName = os.Getenv(constants.DeveloperPortalSecretNameEnvVar)
 	AppConfig.TykPodNamespace = os.Getenv(constants.TykPodNamespaceEnvVar)
 	return nil
@@ -106,16 +103,6 @@ func InitAppDataPostInstall() error {
 
 	AppConfig.OperatorSecretName = os.Getenv(constants.OperatorSecretNameEnvVar)
 
-	enterprisePortalSecretEnabledRaw := os.Getenv(constants.EnterprisePortalSecretEnabledEnvVar)
-	if enterprisePortalSecretEnabledRaw != "" {
-		AppConfig.EnterprisePortalSecretEnabled, err = strconv.ParseBool(enterprisePortalSecretEnabledRaw)
-		if err != nil {
-			return fmt.Errorf("failed to parse %v, err: %v", constants.EnterprisePortalSecretEnabledEnvVar, err)
-		}
-	}
-
-	AppConfig.EnterprisePortalSecretName = os.Getenv(constants.EnterprisePortalSecretNameEnvVar)
-
 	developerPortalSecretEnabledRaw := os.Getenv(constants.DeveloperPortalSecretEnabledEnvVar)
 	if developerPortalSecretEnabledRaw != "" {
 		AppConfig.DeveloperPortalSecretEnabled, err = strconv.ParseBool(developerPortalSecretEnabledRaw)

diff --git a/hack/job.yaml b/hack/job.yaml
@@ -63,12 +63,6 @@ spec:
               value: "true"
             - name: OPERATOR_SECRET_NAME
               value: "tyk-operator-conf"
-            - name: ENTERPRISE_PORTAL_SECRET_ENABLED
-              value: "true"
-            - name: DEVELOPER_PORTAL_SECRET_ENABLED
-              value: "true"
-            - name: ENTERPRISE_PORTAL_SECRET_NAME
-              value: "tyk-enterprise-portal-conf"
             - name: DEVELOPER_PORTAL_SECRET_NAME
               value: "tyk-dev-portal-conf"
             - name: BOOTSTRAP_DASHBOARD

diff --git a/helpers/operator.go b/helpers/operator.go
@@ -88,8 +88,7 @@ func BootstrapTykPortalSecret() error {
 	}
 
 	for _, value := range secrets.Items {
-		if data.AppConfig.EnterprisePortalSecretName == value.Name ||
-			data.AppConfig.DeveloperPortalSecretName == value.Name {
+		if data.AppConfig.DeveloperPortalSecretName == value.Name {
 			err = clientset.CoreV1().Secrets(data.AppConfig.TykPodNamespace).
 				Delete(context.TODO(), value.Name, v1.DeleteOptions{})
 			if err != nil {
@@ -100,13 +99,6 @@ func BootstrapTykPortalSecret() error {
 		}
 	}
 
-	if data.AppConfig.EnterprisePortalSecretName != "" {
-		err = CreateTykPortalSecret(clientset, data.AppConfig.EnterprisePortalSecretName)
-		if err != nil {
-			return err
-		}
-	}
-
 	if data.AppConfig.DeveloperPortalSecretName != "" {
 		err = CreateTykPortalSecret(clientset, data.AppConfig.DeveloperPortalSecretName)
 		if err != nil {

diff --git a/predelete/predelete.go b/predelete/predelete.go
@@ -81,8 +81,7 @@ func PreDeletePortalSecret(clientset *kubernetes.Clientset) error {
 
 	notFound := true
 	for _, value := range secrets.Items {
-		if data.AppConfig.EnterprisePortalSecretName == value.Name ||
-			data.AppConfig.DeveloperPortalSecretName == value.Name {
+		if data.AppConfig.DeveloperPortalSecretName == value.Name {
 			err = clientset.CoreV1().Secrets(ns).
 				Delete(context.TODO(), value.Name, metav1.DeleteOptions{})