Explorar o código

add ctx (#3177)

* add ctx

* add ctx

---------

Co-authored-by: David Townley <davidtownley@Davids-MacBook-Air.local>
d-g-town %!s(int64=2) %!d(string=hai) anos
pai
achega
62195a916f

+ 2 - 2
workers/jobs/helm_revisions_count_tracker.go

@@ -167,7 +167,7 @@ func (t *helmRevisionsCountTracker) Run(ctx context.Context) error {
 					return
 				}
 
-				k8sAgent, err := kubernetes.GetAgentOutOfClusterConfig(&kubernetes.OutOfClusterConfig{
+				k8sAgent, err := kubernetes.GetAgentOutOfClusterConfig(ctx, &kubernetes.OutOfClusterConfig{
 					Cluster:                   cluster,
 					Repo:                      t.repo,
 					DigitalOceanOAuth:         t.doConf,
@@ -188,7 +188,7 @@ func (t *helmRevisionsCountTracker) Run(ctx context.Context) error {
 				log.Printf("fetched %d namespaces for cluster ID %d", len(namespaces.Items), cluster.ID)
 
 				for _, ns := range namespaces.Items {
-					agent, err := utils.NewRetryHelmAgent(&helm.Form{
+					agent, err := utils.NewRetryHelmAgent(ctx, &helm.Form{
 						Cluster:                   cluster,
 						Namespace:                 ns.Name,
 						Repo:                      t.repo,

+ 1 - 1
workers/jobs/preview_deployments_ttl_deleter.go

@@ -158,7 +158,7 @@ func (n *previewDeploymentsTTLDeleter) Run(ctx context.Context) error {
 					log.Printf("deleting preview deployments based on TTL %s for %s/%s",
 						n.previewDeploymentsTTL, env.GitRepoOwner, env.GitRepoName)
 
-					k8sAgent, err := kubernetes.GetAgentOutOfClusterConfig(&kubernetes.OutOfClusterConfig{
+					k8sAgent, err := kubernetes.GetAgentOutOfClusterConfig(ctx, &kubernetes.OutOfClusterConfig{
 						Cluster:                   cluster,
 						Repo:                      n.repo,
 						DigitalOceanOAuth:         n.doConf,

+ 1 - 1
workers/jobs/recommender.go

@@ -195,7 +195,7 @@ func (n *recommender) Run(ctx context.Context) error {
 			continue
 		}
 
-		k8sAgent, err := kubernetes.GetAgentOutOfClusterConfig(&kubernetes.OutOfClusterConfig{
+		k8sAgent, err := kubernetes.GetAgentOutOfClusterConfig(ctx, &kubernetes.OutOfClusterConfig{
 			Cluster:                   cluster,
 			Repo:                      n.repo,
 			DigitalOceanOAuth:         n.doConf,

+ 5 - 4
workers/utils/retry_helm_agent.go

@@ -24,6 +24,7 @@ type RetryHelmAgent struct {
 }
 
 func NewRetryHelmAgent(
+	ctx context.Context,
 	form *helm.Form,
 	l *logger.Logger,
 	retryCount uint,
@@ -33,7 +34,7 @@ func NewRetryHelmAgent(
 		l = logger.New(true, os.Stdout)
 	}
 
-	helmAgent, err := helm.GetAgentOutOfClusterConfig(form, l)
+	helmAgent, err := helm.GetAgentOutOfClusterConfig(ctx, form, l)
 	if err != nil {
 		return nil, err
 	}
@@ -56,7 +57,7 @@ func (a *RetryHelmAgent) ListReleases(
 		} else {
 			log.Printf("recreating helm agent for retrying ListReleases. Error: %v", err)
 
-			a.agent, err = helm.GetAgentOutOfClusterConfig(a.form, a.l)
+			a.agent, err = helm.GetAgentOutOfClusterConfig(ctx, a.form, a.l)
 
 			if err != nil {
 				return nil, fmt.Errorf("error recreating helm agent for retrying ListReleases: %w", err)
@@ -81,7 +82,7 @@ func (a *RetryHelmAgent) GetReleaseHistory(
 		} else {
 			log.Printf("recreating helm agent for retrying GetReleaseHistory. Error: %v", err)
 
-			a.agent, err = helm.GetAgentOutOfClusterConfig(a.form, a.l)
+			a.agent, err = helm.GetAgentOutOfClusterConfig(ctx, a.form, a.l)
 
 			if err != nil {
 				return nil, fmt.Errorf("error recreating helm agent for retrying GetReleaseHistory: %w", err)
@@ -107,7 +108,7 @@ func (a *RetryHelmAgent) DeleteReleaseRevision(
 		} else {
 			log.Printf("recreating helm agent for retrying DeleteReleaseRevision. Error: %v", err)
 
-			a.agent, err = helm.GetAgentOutOfClusterConfig(a.form, a.l)
+			a.agent, err = helm.GetAgentOutOfClusterConfig(ctx, a.form, a.l)
 
 			if err != nil {
 				return fmt.Errorf("error recreating helm agent for retrying DeleteReleaseRevision: %w", err)