chore: back port agent changes to develop

kubeshop · Jun 8, 2023 · 8c07bb8 · 8c07bb8
1 parent 938da8f
commit 8c07bb8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/cmd/kubectl-testkube/commands/common/helper.go b/cmd/kubectl-testkube/commands/common/helper.go
@@ -77,6 +77,7 @@ func HelmUpgradeOrInstallTestkubeCloud(options HelmOptions, cfg config.Data) err
 		"--namespace", options.Namespace,
 		"--set", "testkube-api.cloud.url=" + options.CloudUris.Agent,
 		"--set", "testkube-api.cloud.key=" + options.CloudAgentToken,
+		"--set", "testkube-api.cloud.migrate=true",
 	}
 
 	args = append(args, "--set", fmt.Sprintf("testkube-dashboard.enabled=%t", !options.NoDashboard))

diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"math"
+	"os"
 	"time"
 
 	"github.com/kubeshop/testkube/pkg/executor/output"
@@ -27,6 +28,7 @@ import (
 const (
 	apiKeyMeta         = "api-key"
 	clusterIDMeta      = "cluster-id"
+	cloudMigrate       = "migrate"
 	healthcheckCommand = "healthcheck"
 )
 
@@ -200,6 +202,7 @@ func (ag *Agent) runCommandLoop(ctx context.Context) error {
 	ctx = AddAPIKeyMeta(ctx, ag.apiKey)
 
 	ctx = metadata.AppendToOutgoingContext(ctx, clusterIDMeta, ag.clusterID)
+	ctx = metadata.AppendToOutgoingContext(ctx, cloudMigrate, os.Getenv("TESTKUBE_CLOUD_MIGRATE"))
 
 	ag.logger.Infow("initiating streaming connection with Cloud API")
 	// creates a new Stream from the client side. ctx is used for the lifetime of the stream.