🐛 [patch] Fix RPC unauthorized error (#2)

* 🐛 Fix RPC unauthorized error

* 🍱 Add logs permission

* 🐛 Fix licence badge

* 🐛 Fix links

README.md

@@ -1,6 +1,9 @@
 # Samsahai (S2H)
-[![CircleCI](https://circleci.com/gh/agoda-com/samsahai.svg?style=svg)](https://circleci.com/gh/agoda-com/samsahai) ![Samsahai](https://github.com/agoda-com/samsahai/workflows/Samsahai/badge.svg) [![codecov](https://codecov.io/gh/agoda-com/samsahai/branch/master/graph/badge.svg?token=mt0oLjFy0k)](https://codecov.io/gh/agoda-com/samsahai) [![Docker Repository on Quay](https://quay.io/repository/samsahai/samsahai/status "Docker Repository on Quay")](https://quay.io/repository/samsahai/samsahai) ![GitHub](https://img.shields.io/github/license/agoda-com/samsahai)
-
+[![CircleCI](https://circleci.com/gh/agoda-com/samsahai.svg?style=svg)](https://circleci.com/gh/agoda-com/samsahai)
+![Samsahai](https://github.com/agoda-com/samsahai/workflows/Samsahai/badge.svg)
+[![codecov](https://codecov.io/gh/agoda-com/samsahai/branch/master/graph/badge.svg?token=mt0oLjFy0k)](https://codecov.io/gh/agoda-com/samsahai)
+[![Docker Repository on Quay](https://quay.io/repository/samsahai/samsahai/status "Docker Repository on Quay")](https://quay.io/repository/samsahai/samsahai)
+[![License](https://img.shields.io/badge/Licence-Apache%202.0-blue.svg)](./LICENSE)
 
 Dependencies verification system with Kubernetes Operator
 
@@ -249,10 +252,10 @@ After this step, you can see the result following [minikube promote new active](
 ## Contribution Policy
 Samsahai is an open source project, and depends on its users to improve it. We are more than happy to find you are interested in taking the project forward.
 
-Kindly refer to the [Contribution Guidelines](https://github.com/agoda-com/samsahai/blob/master/CONTRIBUTING) for detailed information.
+Kindly refer to the [Contribution Guidelines](https://github.com/agoda-com/samsahai/blob/master/CONTRIBUTING.md) for detailed information.
 
 ## Code of Conduct
-Please refer to [Code of Conduct](https://github.com/agoda-com/samsahai/blob/master/CODE_OF_CONDUCT) document.
+Please refer to [Code of Conduct](https://github.com/agoda-com/samsahai/blob/master/CODE_OF_CONDUCT.md) document.
 
 ## License
 Samsahai is open source and available under the [Apache License, Version 2.0](https://github.com/agoda-com/samsahai/blob/master/LICENSE).

config/chart/samsahai/templates/clusterrole-rbac.yaml

@@ -29,6 +29,7 @@ rules:
       - bindings
       - configmaps
       - limitranges
+      - logs
       - persistentvolumeclaims
       - pods
       - namespaces

internal/samsahai/k8sobject/object.go

@@ -276,6 +276,7 @@ func GetRole(teamComp *s2hv1beta1.Team, namespaceName string) runtime.Object {
 					"",
 				},
 				Resources: []string{
+					"logs",
 					"pods",
 					"services",
 					"endpoints",

internal/staging/collect_result.go

@@ -282,9 +282,9 @@ func (c *controller) createDeploymentZipLogs(q *s2hv1beta1.Queue) (string, error
 		isPodStagingCtrl := strings.Contains(pod.Name, internal.StagingCtrlName)
 		if isPodStagingCtrl {
 			cmdLogStagingPod := "logs %s --tail=1000 --timestamps%s"
-			podLog := execCommand("kubectl",
+			podStagingCtrlLog := execCommand("kubectl",
 				strings.Split(fmt.Sprintf(cmdLogStagingPod, pod.Name, extraArg), " ")...)
-			appendFileToZip(zipw, fmt.Sprintf("pod.log.%s.txt", pod.Name), podLog)
+			appendFileToZip(zipw, fmt.Sprintf("pod.log.%s.txt", pod.Name), podStagingCtrlLog)
 			continue
 		}
 

internal/staging/util.go

@@ -3,9 +3,11 @@ package staging
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/twitchtv/twirp"
 
 	s2hv1beta1 "github.com/agoda-com/samsahai/api/v1beta1"
 	"github.com/agoda-com/samsahai/internal"
@@ -127,17 +129,27 @@ func (c *controller) deleteQueue(q *s2hv1beta1.Queue) error {
 }
 
 func (c *controller) updateQueueWithState(q *s2hv1beta1.Queue, state s2hv1beta1.QueueState) error {
+	headers := make(http.Header)
+	headers.Set(internal.SamsahaiAuthHeader, c.authToken)
+	ctx := context.TODO()
+	ctx, err := twirp.WithHTTPRequestHeaders(ctx, headers)
+	if err != nil {
+		return errors.Wrap(err, "cannot set request header")
+	}
+
 	q.SetState(state)
 	logger.Debug(fmt.Sprintf("queue %s/%s update to state: %s", q.GetNamespace(), q.GetName(), q.Status.State))
 	comp := &rpc.ComponentUpgrade{
 		Name:      q.Spec.Name,
 		Namespace: q.Namespace,
 	}
+
 	if c.s2hClient != nil {
-		if _, err := c.s2hClient.SendUpdateStateQueueMetric(context.TODO(), comp); err != nil {
+		if _, err := c.s2hClient.SendUpdateStateQueueMetric(ctx, comp); err != nil {
 			logger.Error(err, "cannot send updateQueueWithState queue metric")
 		}
 	}
+
 	return c.updateQueue(q)
 }