🐛 [patch] Fix pr values override (#88)

agoda-com · Mar 9, 2021 · b8d7ca3 · b8d7ca3
1 parent 97aec8b
commit b8d7ca3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/internal/staging/deploy.go b/internal/staging/deploy.go
@@ -612,18 +612,18 @@ func (c *controller) deployQueueComponent(
 			)
 
 			if queue.IsComponentUpgradeQueue() || queue.IsPullRequestQueue() {
-				// merge stable only matched component or dependencies
-				for _, comp := range queueComps {
-					if queue.IsPullRequestQueue() {
-						bundleName := queue.Spec.Name
-						envValues, err := configctrl.GetEnvComponentValues(cfg, bundleName, c.teamName, envType)
-						if err != nil {
-							errCh <- err
-							return
-						}
-						values = valuesutil.MergeValues(values, envValues)
+				if queue.IsPullRequestQueue() {
+					bundleName := queue.Spec.Name
+					envValues, err := configctrl.GetEnvComponentValues(cfg, bundleName, c.teamName, envType)
+					if err != nil {
+						errCh <- err
+						return
 					}
+					values = valuesutil.MergeValues(values, envValues)
+				}
 
+				// merge stable only matched component or dependencies
+				for _, comp := range queueComps {
 					v := genCompValueFromQueue(comp.Name, queue.Spec.Components)
 					if comp.Name == parentComp.Name {
 						// queue is parent

diff --git a/test/e2e/pullrequest/ctrl.go b/test/e2e/pullrequest/ctrl.go
@@ -292,6 +292,12 @@ var _ = Describe("[e2e] Pull request controller", func() {
 		jsonPRData, _ := json.Marshal(map[string]interface{}{
 			"bundleName": bundledCompPRBundleName,
 			"prNumber":   prNumber,
+			"components": []map[string]interface{}{
+				{
+					"name": mariaDBCompName,
+					"tag":  mariaDBImageTag,
+				},
+			},
 		})
 		apiURL := fmt.Sprintf("%s/teams/%s/pullrequest/trigger", server.URL, teamName)
 		_, _, err = utilhttp.Post(apiURL, jsonPRData)
@@ -1127,6 +1133,11 @@ var (
 	bundledPRTriggerName = internal.GenPullRequestBundleName(bundledCompPRBundleName, prNumber)
 
 	configSpec = s2hv1.ConfigSpec{
+		Envs: map[s2hv1.EnvType]s2hv1.ChartValuesURLs{
+			"pull-request": map[string][]string{
+				bundledPRTriggerName: {"https://raw.githubusercontent.com/agoda-com/samsahai-example/master/envs/pull-request/wordpress-missing-mariadb-image.yaml"},
+			},
+		},
 		Staging: &s2hv1.ConfigStaging{
 			Deployment: &s2hv1.ConfigDeploy{},
 		},