Skip to content

Commit 05a491e

Browse files
committed
Merge branch 'temporal-worker-owned-resource' of https://github.com/temporalio/temporal-worker-controller into temporal-worker-owned-resource
2 parents f4ea14e + b50f021 commit 05a491e

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

internal/controller/worker_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ func (r *TemporalWorkerDeploymentReconciler) markWRTsTWDNotFound(ctx context.Con
316316
client.InNamespace(twd.Namespace),
317317
client.MatchingFields{wrtWorkerRefKey: twd.Name},
318318
); err != nil {
319-
return fmt.Errorf("list WRTs referencing missing TWD %q: %w", twd.Name, err)
319+
return fmt.Errorf("list WorkerResourceTemplates referencing missing TemporalWorkerDeployment %q: %w", twd.Name, err)
320320
}
321321
var errs []error
322322
for i := range wrtList.Items {
@@ -329,8 +329,8 @@ func (r *TemporalWorkerDeploymentReconciler) markWRTsTWDNotFound(ctx context.Con
329329
ObservedGeneration: wrt.Generation,
330330
})
331331
if err := r.Status().Update(ctx, wrt); err != nil {
332-
l.Error(err, "unable to update WRT status for missing TWD", "wrt", wrt.Name, "twd", twd.Name)
333-
errs = append(errs, fmt.Errorf("update status for WRT %s/%s: %w", wrt.Namespace, wrt.Name, err))
332+
l.Error(err, "unable to update WorkerResourceTemplate status for missing TemporalWorkerDeployment", "wrt", wrt.Name, "twd", twd.Name)
333+
errs = append(errs, fmt.Errorf("update status for WorkerResourceTemplate %s/%s: %w", wrt.Namespace, wrt.Name, err))
334334
}
335335
}
336336
return errors.Join(errs...)

internal/demo/helloworld/helm/helloworld/templates/deployment.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ spec:
3131
scaledownDelay: 30s
3232
deleteDelay: 5m
3333
# Desired number of worker replicas
34-
#replicas:
3534
# Desired specification for worker pods
3635
template:
3736
spec:

0 commit comments

Comments
 (0)