Merge branch 'master' of https://github.com/agoda-com/samsahai into e…

…xporter

README.md

@@ -111,7 +111,11 @@ Find more configuration information in [samsahai-example](https://www.github.com
     http://<minikube_ip>:<node_port>/version (e.g. http://192.168.64.14:32501/version)
     http://<minikube_ip>:<node_port>/swagger/index.html# (e.g. http://192.168.64.14:32501/swagger/index.html#)
     ```
-10. Apply team
+10. Apply configuration
+    ```
+    kubectl apply -f https://raw.githubusercontent.com/agoda-com/samsahai-example/master/configs/crds/config-example.yaml
+    ```
+11. Apply team
     ```
     kubectl apply -f https://raw.githubusercontent.com/agoda-com/samsahai-example/master/configs/crds/team-example.yaml
     ```
@@ -198,9 +202,10 @@ To save the cluster resources once every upgrade component verification has fini
 2. Clone project in the directory above
 3. Prepare environment and export KUBECONFIG
     ```
-    make install-init
+    make init
     make prepare-env-e2e-k3d
     export KUBECONFIG=/tmp/s2h/k3s-kubeconfig
+    make install-crds
     ```
 4. Run `samsahai controller` by using go build with following configurations:
     ```
@@ -212,7 +217,11 @@ To save the cluster resources once every upgrade component verification has fini
     ```
     http://localhost:8080/swagger/index.html#
     ```
-6. Apply team
+6. Apply configuration
+    ```
+    kubectl apply -f https://raw.githubusercontent.com/agoda-com/samsahai-example/master/configs/crds/config-example.yaml
+    ```
+7. Apply team
     ```
     kubectl apply -f https://raw.githubusercontent.com/agoda-com/samsahai-example/master/configs/crds/team-example-local.yaml
     ```

cmd/samsahai/main.go

@@ -221,10 +221,12 @@ func startCtrlCmd() *cobra.Command {
 			}
 		},
 	}
+
 	defaultImage := "quay.io/samsahai/samsahai:latest"
 	if s2h.Version != "" {
-		defaultImage = "quay.io/samsahai/samsahai:" + s2h.Version
+		defaultImage = "quay.io/samsahai/samsahai:v" + s2h.Version
 	}
+
 	cmd.Flags().String(s2h.VKPodNamespace, "default", "Namespace that the controller works on.")
 	cmd.Flags().String(s2h.VKS2HConfigPath, "samsahai.yaml", "Samsahai configuration file path.")
 	cmd.Flags().String(s2h.VKClusterDomain, "cluster.local", "Internal domain of the cluster.")

internal/queue/controller.go

@@ -109,6 +109,7 @@ func (c *controller) RemoveAllQueues() error {
 func (c *controller) add(ctx context.Context, queue *v1beta1.Queue, atTop bool) error {
 	queueList, err := c.list(nil)
 	if err != nil {
+		logger.Error(err, "cannot list queue")
 		return err
 	}
 
@@ -213,14 +214,15 @@ func (c *controller) list(opts *client.ListOptions) (list *v1beta1.QueueList, er
 		opts = &client.ListOptions{Namespace: c.namespace}
 	}
 	if err = c.client.List(context.Background(), list, opts); err != nil {
-		return
+		return list, errors.Wrapf(err, "cannot list queue with options: %+v", opts)
 	}
 	return list, nil
 }
 
 func (c *controller) SetLastOrder(q *v1beta1.Queue) error {
 	queueList, err := c.list(nil)
 	if err != nil {
+		logger.Error(err, "cannot list queue")
 		return err
 	}
 
@@ -233,6 +235,7 @@ func (c *controller) SetLastOrder(q *v1beta1.Queue) error {
 func (c *controller) SetReverifyQueueAtFirst(q *v1beta1.Queue) error {
 	list, err := c.list(nil)
 	if err != nil {
+		logger.Error(err, "cannot list queue")
 		return err
 	}
 
@@ -250,6 +253,7 @@ func (c *controller) SetReverifyQueueAtFirst(q *v1beta1.Queue) error {
 func (c *controller) SetRetryQueue(q *v1beta1.Queue, noOfRetry int, nextAt time.Time) error {
 	list, err := c.list(nil)
 	if err != nil {
+		logger.Error(err, "cannot list queue")
 		return err
 	}
 
@@ -269,6 +273,7 @@ func (c *controller) SetRetryQueue(q *v1beta1.Queue, noOfRetry int, nextAt time.
 func (c *controller) updateQueueList(ql *v1beta1.QueueList) error {
 	for i := range ql.Items {
 		if err := c.client.Update(context.TODO(), &ql.Items[i]); err != nil {
+			logger.Error(err, "cannot update queue list", "queue", ql.Items[i].Name)
 			return errors.Wrapf(err, "cannot update queue %s in %s", ql.Items[i].Name, ql.Items[i].Namespace)
 		}
 	}

internal/staging/collect_result.go

@@ -46,8 +46,7 @@ func (c *controller) collectResult(queue *s2hv1beta1.Queue) error {
 	}
 
 	// Queue will finished if type are Active promotion related
-	switch queue.Spec.Type {
-	case s2hv1beta1.QueueTypePromoteToActive, s2hv1beta1.QueueTypeDemoteFromActive, s2hv1beta1.QueueTypePreActive:
+	if queue.IsActivePromotionQueue() {
 		return c.updateQueueWithState(queue, s2hv1beta1.Finished)
 	}
 
@@ -56,10 +55,8 @@ func (c *controller) collectResult(queue *s2hv1beta1.Queue) error {
 		return err
 	}
 
-	if !queue.IsActivePromotionQueue() {
-		if err := c.setStableAndSendReport(queue); err != nil {
-			return err
-		}
+	if err := c.setStableAndSendReport(queue); err != nil {
+		return err
 	}
 
 	queue.Status.SetCondition(s2hv1beta1.QueueCleaningAfterStarted, corev1.ConditionTrue,
@@ -124,14 +121,14 @@ func (c *controller) createQueueHistory(q *s2hv1beta1.Queue) error {
 	err := c.client.Get(ctx, types.NamespacedName{Name: history.Name, Namespace: history.Namespace}, fetched)
 	if err != nil {
 		if k8serrors.IsNotFound(err) {
-			if err := c.client.Create(context.TODO(), history); err != nil {
-				logger.Error(err, "cannot create history")
+			if err := c.client.Create(ctx, history); err != nil {
+				logger.Error(err, "cannot create queuehistory")
 				return err
 			}
 
 			return nil
 		}
-		logger.Error(err, "cannot get history")
+		logger.Error(err, "cannot get queuehistory")
 		return err
 	}
 
@@ -145,6 +142,7 @@ func (c *controller) deleteQueueHistoryOutOfRange(ctx context.Context, namespace
 			return nil
 		}
 
+		logger.Error(err, "cannot list queuehistories")
 		return errors.Wrapf(err, "cannot list queuehistories in %s", namespace)
 	}
 
@@ -153,6 +151,7 @@ func (c *controller) deleteQueueHistoryOutOfRange(ctx context.Context, namespace
 	// get configuration
 	cfg, err := c.getConfiguration()
 	if err != nil {
+		logger.Error(err, "cannot get configuration")
 		return err
 	}
 
@@ -176,6 +175,7 @@ func (c *controller) deleteQueueHistoryOutOfRange(ctx context.Context, namespace
 					continue
 				}
 
+				logger.Error(err, fmt.Sprintf("cannot delete queuehistories %s", queueHists.Items[i].Name))
 				return errors.Wrapf(err, "cannot delete queuehistories %s", queueHists.Items[i].Name)
 			}
 			continue
@@ -408,7 +408,8 @@ func (c *controller) sendComponentUpgradeReport(status rpc.ComponentUpgrade_Upgr
 	if c.s2hClient != nil {
 		_, err = c.s2hClient.RunPostComponentUpgrade(ctx, comp)
 		if err != nil {
-			return errors.Wrap(err, "cannot load send component upgrade report")
+			logger.Error(err, "cannot send component upgrade report", "queue", queue.Spec.Name)
+			return errors.Wrap(err, "cannot send component upgrade report")
 		}
 	}
 

internal/staging/controller.go

@@ -142,6 +142,7 @@ func (c *controller) process() bool {
 		c.mtQueue.Lock()
 		// pick new queue
 		if c.currentQueue, err = c.queueCtrl.First(); err != nil {
+			logger.Error(err, "cannot pick the first component of queue")
 			c.mtQueue.Unlock()
 			return false
 		}
@@ -350,7 +351,8 @@ func (c *controller) cleanBefore(queue *s2hv1beta1.Queue) error {
 	if err != nil {
 		return err
 	} else if !isCleaned {
-		logger.Warn("waiting for component cleaned", "queue", queue.Name)
+		logger.Warn("waiting for component cleaned",
+			"queue", queue.Name, "state", s2hv1beta1.CleaningBefore)
 		time.Sleep(2 * time.Second)
 		return nil
 	}
@@ -399,7 +401,8 @@ func (c *controller) cleanAfter(queue *s2hv1beta1.Queue) error {
 	if err != nil {
 		return err
 	} else if !isCleaned {
-		logger.Warn("waiting for component cleaned", "queue", queue.Name)
+		logger.Warn("waiting for component cleaned",
+			"queue", queue.Name, "state", s2hv1beta1.CleaningAfter)
 		time.Sleep(2 * time.Second)
 		return nil
 	}

internal/staging/deploy.go

@@ -53,7 +53,19 @@ func (c *controller) deployEnvironment(queue *s2hv1beta1.Queue) error {
 		if err != nil {
 			return err
 		}
-		comp = comps[queue.Spec.Name]
+
+		var ok bool
+		comp, ok = comps[queue.Spec.Name]
+		if !ok {
+			// delete queue if component does not exist in config
+			if err := c.client.Delete(context.TODO(), queue); err != nil {
+				logger.Error(err, "deleting queue error")
+				return err
+			}
+			c.clearCurrentQueue()
+			return nil
+		}
+
 		parentComp = comp
 
 		if comp.Parent != "" {

internal/staging/util.go

@@ -8,6 +8,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/twitchtv/twirp"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/types"
 
 	s2hv1beta1 "github.com/agoda-com/samsahai/api/v1beta1"
 	"github.com/agoda-com/samsahai/internal"
@@ -86,6 +88,11 @@ func (c *controller) updateQueue(queue *s2hv1beta1.Queue) error {
 }
 
 func (c *controller) deleteQueue(q *s2hv1beta1.Queue) error {
+	// update queue history before processing next queue
+	if err := c.updateQueueHistory(q); err != nil {
+		return errors.Wrap(err, "updating queuehistory error")
+	}
+
 	isDeploySuccess, isTestSuccess, isReverify := q.IsDeploySuccess(), q.IsTestSuccess(), q.IsReverify()
 
 	if isDeploySuccess && isTestSuccess && !isReverify {
@@ -165,3 +172,35 @@ func (c *controller) updateQueueWithState(q *s2hv1beta1.Queue, state s2hv1beta1.
 func (c *controller) genReleaseName(comp *s2hv1beta1.Component) string {
 	return internal.GenReleaseName(c.namespace, comp.Name)
 }
+
+func (c *controller) updateQueueHistory(q *s2hv1beta1.Queue) error {
+	ctx := context.TODO()
+
+	qHistName := q.Status.QueueHistoryName
+	fetched := &s2hv1beta1.QueueHistory{}
+	err := c.client.Get(ctx, types.NamespacedName{Name: qHistName, Namespace: c.namespace}, fetched)
+	if err != nil {
+		if k8serrors.IsNotFound(err) {
+			logger.Warnf("queuehistory %s not found, creating", qHistName)
+			if err := c.createQueueHistory(q); err != nil {
+				return err
+			}
+			return nil
+		}
+
+		logger.Error(err, fmt.Sprintf("cannot get queuehistory: %s", qHistName))
+		return err
+	}
+
+	fetched.Spec.Queue = &s2hv1beta1.Queue{
+		Spec:   q.Spec,
+		Status: q.Status,
+	}
+
+	if err := c.client.Update(ctx, fetched); err != nil {
+		logger.Error(err, fmt.Sprintf("cannot update queuehistory: %s", qHistName))
+		return err
+	}
+
+	return nil
+}