Sandbox/docker commands

build/kind/entrypoint.sh

@@ -313,14 +313,10 @@ else
   fi
   log "Testkube is up and running."
 
-  # Step 9: Create Testkube k6 Test Workflow 
-  log "Creating and running Testkube k6 Test Workflow..."
-  kubectl apply -f /examples/k6.yaml -n testkube
-
   log "Testkube installation succeed!"
   log "You can now use Testkube in your Kind Kubernetes cluster."
   send_telenetry "docker_installation_succeed"
 fi
 
-# Step 10: Bring docker service back to foreground
+# Step 9: Bring docker service back to foreground
 fg %1

build/kind/kind.Dockerfile

@@ -26,7 +26,6 @@ RUN chmod +x /usr/local/bin/entrypoint.sh
 
 # Step 7: Example K6 Test Workflow CRD and preload Kind images
 COPY ./images /images
-COPY k6.yaml /examples/k6.yaml
 
 ARG segmentio_key
 ENV SEGMENTIO_KEY=$segmentio_key

cmd/api-server/main.go

@@ -668,6 +668,7 @@ func main() {
 			envs,
 			features,
 			proContext,
+			cfg.TestkubeDockerImageVersion,
 		)
 		if err != nil {
 			exitOnError("Starting agent", err)

internal/config/config.go

@@ -116,7 +116,7 @@ type Config struct {
 	TestkubeDefaultStorageClassName  string        `envconfig:"TESTKUBE_DEFAULT_STORAGE_CLASS_NAME" default:""`
 	GlobalWorkflowTemplateName       string        `envconfig:"TESTKUBE_GLOBAL_WORKFLOW_TEMPLATE_NAME" default:""`
 	EnableK8sEvents                  bool          `envconfig:"ENABLE_K8S_EVENTS" default:"true"`
-	TestkubeDockerImageVersion       string        `envconfig:"TESTKUBE_DOCKER_IMAGE_VERSION" default:""`
+	TestkubeDockerImageVersion       string        `envconfig:"TESTKUBE_DOCKER_IMAGE_VERSION" default:"1.2.3"`
 
 	// DEPRECATED: Use TestkubeProAPIKey instead
 	TestkubeCloudAPIKey string `envconfig:"TESTKUBE_CLOUD_API_KEY" default:""`

pkg/agent/agent.go

@@ -31,13 +31,14 @@ import (
 )
 
 const (
-	timeout            = 10 * time.Second
-	apiKeyMeta         = "api-key"
-	clusterIDMeta      = "cluster-id"
-	cloudMigrateMeta   = "migrate"
-	orgIdMeta          = "environment-id"
-	envIdMeta          = "organization-id"
-	healthcheckCommand = "healthcheck"
+	timeout                = 10 * time.Second
+	apiKeyMeta             = "api-key"
+	clusterIDMeta          = "cluster-id"
+	cloudMigrateMeta       = "migrate"
+	orgIdMeta              = "environment-id"
+	envIdMeta              = "organization-id"
+	healthcheckCommand     = "healthcheck"
+	dockerImageVersionMeta = "docker-image-version"
 )
 
 // buffer up to five messages per worker
@@ -150,10 +151,11 @@ type Agent struct {
 	receiveTimeout      time.Duration
 	healthcheckInterval time.Duration
 
-	clusterID   string
-	clusterName string
-	envs        map[string]string
-	features    featureflags.FeatureFlags
+	clusterID          string
+	clusterName        string
+	envs               map[string]string
+	features           featureflags.FeatureFlags
+	dockerImageVersion string
 
 	proContext config.ProContext
 }
@@ -168,6 +170,7 @@ func NewAgent(logger *zap.SugaredLogger,
 	envs map[string]string,
 	features featureflags.FeatureFlags,
 	proContext config.ProContext,
+	dockerImageVersion string,
 ) (*Agent, error) {
 	return &Agent{
 		handler:                                 handler,
@@ -194,6 +197,7 @@ func NewAgent(logger *zap.SugaredLogger,
 		envs:                                    envs,
 		features:                                features,
 		proContext:                              proContext,
+		dockerImageVersion:                      dockerImageVersion,
 	}, nil
 }
 
@@ -313,6 +317,7 @@ func (ag *Agent) runCommandLoop(ctx context.Context) error {
 	ctx = metadata.AppendToOutgoingContext(ctx, cloudMigrateMeta, ag.proContext.Migrate)
 	ctx = metadata.AppendToOutgoingContext(ctx, envIdMeta, ag.proContext.EnvID)
 	ctx = metadata.AppendToOutgoingContext(ctx, orgIdMeta, ag.proContext.OrgID)
+	ctx = metadata.AppendToOutgoingContext(ctx, dockerImageVersionMeta, ag.dockerImageVersion)
 
 	ag.logger.Infow("initiating streaming connection with control plane")
 	// creates a new Stream from the client side. ctx is used for the lifetime of the stream.

pkg/agent/agent_test.go

@@ -61,7 +61,7 @@ func TestCommandExecution(t *testing.T) {
 
 	logger, _ := zap.NewDevelopment()
 	proContext := config.ProContext{APIKey: "api-key", WorkerCount: 5, LogStreamWorkerCount: 5, WorkflowNotificationsWorkerCount: 5}
-	agent, err := agent.NewAgent(logger.Sugar(), m, grpcClient, logStreamFunc, workflowNotificationsStreamFunc, "", "", nil, featureflags.FeatureFlags{}, proContext)
+	agent, err := agent.NewAgent(logger.Sugar(), m, grpcClient, logStreamFunc, workflowNotificationsStreamFunc, "", "", nil, featureflags.FeatureFlags{}, proContext, "")
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/agent/events_test.go

@@ -57,7 +57,7 @@ func TestEventLoop(t *testing.T) {
 	var workflowNotificationsStreamFunc func(ctx context.Context, executionID string) (chan testkube.TestWorkflowExecutionNotification, error)
 
 	proContext := config.ProContext{APIKey: "api-key", WorkerCount: 5, LogStreamWorkerCount: 5, WorkflowNotificationsWorkerCount: 5}
-	agent, err := agent.NewAgent(logger.Sugar(), nil, grpcClient, logStreamFunc, workflowNotificationsStreamFunc, "", "", nil, featureflags.FeatureFlags{}, proContext)
+	agent, err := agent.NewAgent(logger.Sugar(), nil, grpcClient, logStreamFunc, workflowNotificationsStreamFunc, "", "", nil, featureflags.FeatureFlags{}, proContext, "")
 	assert.NoError(t, err)
 	go func() {
 		l, err := agent.Load()

pkg/agent/logs_test.go

@@ -68,7 +68,7 @@ func TestLogStream(t *testing.T) {
 
 	logger, _ := zap.NewDevelopment()
 	proContext := config.ProContext{APIKey: "api-key", WorkerCount: 5, LogStreamWorkerCount: 5, WorkflowNotificationsWorkerCount: 5}
-	agent, err := agent.NewAgent(logger.Sugar(), m, grpcClient, logStreamFunc, workflowNotificationsStreamFunc, "", "", nil, featureflags.FeatureFlags{}, proContext)
+	agent, err := agent.NewAgent(logger.Sugar(), m, grpcClient, logStreamFunc, workflowNotificationsStreamFunc, "", "", nil, featureflags.FeatureFlags{}, proContext, "")
 	if err != nil {
 		t.Fatal(err)
 	}