feat: [TKC-2684] docker image meta (#5936)

* fix: remove docker example Signed-off-by: Vladislav Sukhin <[email protected]> * feat: pass docker image version to cloud Signed-off-by: Vladislav Sukhin <[email protected]> --------- Signed-off-by: Vladislav Sukhin <[email protected]>
kubeshop · Oct 16, 2024 · c0d0afd · c0d0afd
1 parent 451fb22
commit c0d0afd
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 259 deletions.
diff --git a/build/kind/entrypoint.sh b/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
diff --git a/build/kind/k6.yaml b/build/kind/k6.yaml
diff --git a/build/kind/kind.Dockerfile b/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

diff --git a/cmd/api-server/main.go b/cmd/api-server/main.go
@@ -668,6 +668,7 @@ func main() {
  envs,
  features,
  proContext,
+ cfg.TestkubeDockerImageVersion,
  )
  if err != nil {
  exitOnError("Starting agent", err)

diff --git a/pkg/agent/agent.go b/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.

diff --git a/pkg/agent/agent_test.go b/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)
  }

diff --git a/pkg/agent/events_test.go b/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()

diff --git a/pkg/agent/logs_test.go b/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)
  }