[patch] Remove namespace name from release name (#131)

* remove namesapce name from release name * fis test
agoda-com · Apr 29, 2022 · 0f5bfaa · 0f5bfaa
1 parent fa939bf
commit 0f5bfaa
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 18 deletions.
diff --git a/internal/deploy.go b/internal/deploy.go
@@ -47,11 +47,10 @@ const (
 )
 
 // GenReleaseName returns the release name for deploying components
-func GenReleaseName(namespace, compName string) string {
-	refName := namespace + "-" + compName
-	if len(refName) > MaxReleaseNameLength {
+func GenReleaseName(compName string) string {
+	if len(compName) > MaxReleaseNameLength {
 		// component name is more important than team name
-		return refName[len(refName)-MaxReleaseNameLength:]
+		return compName[len(compName)-MaxReleaseNameLength:]
 	}
-	return refName
+	return compName
 }
diff --git a/internal/samsahai/activepromotion/environment_cleanup.go b/internal/samsahai/activepromotion/environment_cleanup.go
@@ -164,7 +164,7 @@ func (c *controller) deleteAllComponentsInNamespace(teamName, ns string, started
 	}
 
 	for compName := range parentComps {
-		refName := internal.GenReleaseName(ns, compName)
+		refName := internal.GenReleaseName(compName)
 		if err := deployEngine.Delete(refName); err != nil {
 			logger.Error(err, "cannot delete release",
 				"refName", refName,

diff --git a/internal/samsahai/controller.go b/internal/samsahai/controller.go
@@ -1345,7 +1345,7 @@ func (c *controller) DeleteTeamActiveEnvironment(teamName, namespace, deletedBy
 	}
 
 	for compName := range parentComps {
-		refName := internal.GenReleaseName(namespace, compName)
+		refName := internal.GenReleaseName(compName)
 		if err := deployEngine.Delete(refName); err != nil &&
 			!k8serrors.IsNotFound(err) {
 			logger.Error(err, "cannot delete release",

diff --git a/internal/samsahai/rpc.go b/internal/samsahai/rpc.go
@@ -832,10 +832,7 @@ func (c *controller) getDifferentServices(prSvcList, activeSvcList *corev1.Servi
 }
 
 func (c *controller) replaceServiceFromReleaseName(svcName, prNamespace, activeNamespace string) string {
-	prReleaseName := s2h.GenReleaseName(prNamespace, "")
-	activeReleaseName := s2h.GenReleaseName(activeNamespace, "")
-
-	return strings.ReplaceAll(svcName, activeReleaseName, prReleaseName)
+	return strings.ReplaceAll(svcName, activeNamespace, prNamespace)
 }
 
 func (c *controller) ensureTeamPullRequestNamespaceUpdated(teamName, targetNs string) error {

diff --git a/internal/staging/collect_result.go b/internal/staging/collect_result.go
@@ -422,7 +422,7 @@ func (c *controller) setDeploymentIssues(queue *s2hv1.Queue) error {
 	deploymentIssuesMaps := make(map[s2hv1.DeploymentIssueType][]s2hv1.FailureComponent)
 	for parentComp := range parentComps {
 		ns := c.namespace
-		refName := internal.GenReleaseName(ns, parentComp)
+		refName := internal.GenReleaseName(parentComp)
 		selectors := deployEngine.GetLabelSelectors(refName)
 		if len(selectors) == 0 {
 			continue

diff --git a/internal/staging/controller.go b/internal/staging/controller.go
@@ -352,7 +352,7 @@ func (c *controller) cleanBefore(queue *s2hv1.Queue) error {
 
 	if !queue.Status.IsConditionTrue(s2hv1.QueueCleanedBefore) {
 		for compName := range parentComps {
-			refName := internal.GenReleaseName(c.namespace, compName)
+			refName := internal.GenReleaseName(compName)
 			if err := deployEngine.Delete(refName); err != nil {
 				logger.Error(err, "cannot delete release",
 					"refName", refName,
@@ -402,7 +402,7 @@ func (c *controller) cleanAfter(queue *s2hv1.Queue) error {
 
 	if !queue.Status.IsConditionTrue(s2hv1.QueueCleanedAfter) {
 		for compName := range parentComps {
-			refName := internal.GenReleaseName(c.namespace, compName)
+			refName := internal.GenReleaseName(compName)
 			if err := deployEngine.Delete(refName); err != nil {
 				logger.Error(err, "cannot delete release",
 					"refName", refName,
@@ -475,7 +475,7 @@ func WaitForComponentsCleaned(
 	}
 
 	for compName := range parentComps {
-		refName := internal.GenReleaseName(namespace, compName)
+		refName := internal.GenReleaseName(compName)
 		selectors := deployEngine.GetLabelSelectors(refName)
 		listOpt := &client.ListOptions{Namespace: namespace, LabelSelector: labels.SelectorFromSet(selectors)}
 		log := logger.WithValues(

diff --git a/internal/staging/util.go b/internal/staging/util.go
@@ -228,7 +228,7 @@ func (c *controller) updateQueueWithState(q *s2hv1.Queue, state s2hv1.QueueState
 }
 
 func (c *controller) genReleaseName(comp *s2hv1.Component) string {
-	return internal.GenReleaseName(c.namespace, comp.Name)
+	return internal.GenReleaseName(comp.Name)
 }
 
 func (c *controller) updateQueueHistory(q *s2hv1.Queue) error {

diff --git a/test/e2e/staging/ctrl.go b/test/e2e/staging/ctrl.go
@@ -92,7 +92,7 @@ var _ = Describe("[e2e] Staging controller", func() {
 	}
 
 	nginxReplicas := int32(1)
-	nginxLabels := map[string]string{"app": "nginx", "release": "samsahai-system-redis"}
+	nginxLabels := map[string]string{"app": "nginx", "release": "redis"}
 	deployNginx := appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "nginx",
@@ -561,7 +561,7 @@ var _ = Describe("[e2e] Staging controller", func() {
 		Expect(client.Update(ctx, &config)).To(BeNil())
 
 		By("Ensure Pre Active Components")
-		redisServiceName := fmt.Sprintf("%s-redis-master", namespace)
+		redisServiceName := fmt.Sprintf("%s-master", redisCompName)
 
 		err = wait.PollImmediate(2*time.Second, deployTimeout, func() (ok bool, err error) {
 			queue, err := queue.EnsurePreActiveComponents(client, teamName, namespace, true)