Skip to content

Commit e401cf0

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#9776 from mcbenjemaa/remove-context-todo
🌱 replace context.TODO() from clusterctl proxy.go
2 parents 550204a + 0a1ecc2 commit e401cf0

30 files changed

+90
-90
lines changed

‎cmd/clusterctl/client/alpha/kubeadmcontrolplane.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
// getKubeadmControlPlane retrieves the KubeadmControlPlane object corresponding to the name and namespace specified.
3333
func getKubeadmControlPlane(ctx context.Context, proxy cluster.Proxy, name, namespace string) (*controlplanev1.KubeadmControlPlane, error) {
3434
kcpObj := &controlplanev1.KubeadmControlPlane{}
35-
c, err := proxy.NewClient()
35+
c, err := proxy.NewClient(ctx)
3636
if err != nil {
3737
return nil, err
3838
}
@@ -55,7 +55,7 @@ func setRolloutAfterOnKCP(ctx context.Context, proxy cluster.Proxy, name, namesp
5555

5656
// patchKubeadmControlPlane applies a patch to a KubeadmControlPlane.
5757
func patchKubeadmControlPlane(ctx context.Context, proxy cluster.Proxy, name, namespace string, patch client.Patch) error {
58-
cFrom, err := proxy.NewClient()
58+
cFrom, err := proxy.NewClient(ctx)
5959
if err != nil {
6060
return err
6161
}

‎cmd/clusterctl/client/alpha/machinedeployment.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
// getMachineDeployment retrieves the MachineDeployment object corresponding to the name and namespace specified.
3939
func getMachineDeployment(ctx context.Context, proxy cluster.Proxy, name, namespace string) (*clusterv1.MachineDeployment, error) {
4040
mdObj := &clusterv1.MachineDeployment{}
41-
c, err := proxy.NewClient()
41+
c, err := proxy.NewClient(ctx)
4242
if err != nil {
4343
return nil, err
4444
}
@@ -61,7 +61,7 @@ func setRolloutAfterOnMachineDeployment(ctx context.Context, proxy cluster.Proxy
6161

6262
// patchMachineDeployment applies a patch to a machinedeployment.
6363
func patchMachineDeployment(ctx context.Context, proxy cluster.Proxy, name, namespace string, patch client.Patch) error {
64-
cFrom, err := proxy.NewClient()
64+
cFrom, err := proxy.NewClient(ctx)
6565
if err != nil {
6666
return err
6767
}
@@ -121,7 +121,7 @@ func findMachineDeploymentRevision(toRevision int64, allMSs []*clusterv1.Machine
121121
// getMachineSetsForDeployment returns a list of MachineSets associated with a MachineDeployment.
122122
func getMachineSetsForDeployment(ctx context.Context, proxy cluster.Proxy, md *clusterv1.MachineDeployment) ([]*clusterv1.MachineSet, error) {
123123
log := logf.Log
124-
c, err := proxy.NewClient()
124+
c, err := proxy.NewClient(ctx)
125125
if err != nil {
126126
return nil, err
127127
}

‎cmd/clusterctl/client/alpha/rollout_pauser_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func Test_ObjectPauser(t *testing.T) {
153153
}
154154
g.Expect(err).ToNot(HaveOccurred())
155155
for _, obj := range tt.fields.objs {
156-
cl, err := proxy.NewClient()
156+
cl, err := proxy.NewClient(context.Background())
157157
g.Expect(err).ToNot(HaveOccurred())
158158
key := client.ObjectKeyFromObject(obj)
159159
switch obj.(type) {

‎cmd/clusterctl/client/alpha/rollout_restarter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func Test_ObjectRestarter(t *testing.T) {
211211
}
212212
g.Expect(err).ToNot(HaveOccurred())
213213
for _, obj := range tt.fields.objs {
214-
cl, err := proxy.NewClient()
214+
cl, err := proxy.NewClient(context.Background())
215215
g.Expect(err).ToNot(HaveOccurred())
216216
key := client.ObjectKeyFromObject(obj)
217217
switch obj.(type) {

‎cmd/clusterctl/client/alpha/rollout_resumer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func Test_ObjectResumer(t *testing.T) {
156156
}
157157
g.Expect(err).ToNot(HaveOccurred())
158158
for _, obj := range tt.fields.objs {
159-
cl, err := proxy.NewClient()
159+
cl, err := proxy.NewClient(context.Background())
160160
g.Expect(err).ToNot(HaveOccurred())
161161
key := client.ObjectKeyFromObject(obj)
162162
switch obj.(type) {

‎cmd/clusterctl/client/alpha/rollout_rollbacker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (r *rollout) ObjectRollbacker(ctx context.Context, proxy cluster.Proxy, ref
5151
// rollbackMachineDeployment will rollback to a previous MachineSet revision used by this MachineDeployment.
5252
func rollbackMachineDeployment(ctx context.Context, proxy cluster.Proxy, md *clusterv1.MachineDeployment, toRevision int64) error {
5353
log := logf.Log
54-
c, err := proxy.NewClient()
54+
c, err := proxy.NewClient(ctx)
5555
if err != nil {
5656
return err
5757
}

‎cmd/clusterctl/client/alpha/rollout_rollbacker_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func Test_ObjectRollbacker(t *testing.T) {
247247
return
248248
}
249249
g.Expect(err).ToNot(HaveOccurred())
250-
cl, err := proxy.NewClient()
250+
cl, err := proxy.NewClient(context.Background())
251251
g.Expect(err).ToNot(HaveOccurred())
252252
key := client.ObjectKeyFromObject(deployment)
253253
md := &clusterv1.MachineDeployment{}

‎cmd/clusterctl/client/cluster/cert_manager.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func (cm *certManagerClient) Images(ctx context.Context) ([]string, error) {
134134
func (cm *certManagerClient) certManagerNamespaceExists(ctx context.Context) (bool, error) {
135135
ns := &corev1.Namespace{}
136136
key := client.ObjectKey{Name: certManagerNamespace}
137-
c, err := cm.proxy.NewClient()
137+
c, err := cm.proxy.NewClient(ctx)
138138
if err != nil {
139139
return false, err
140140
}
@@ -284,7 +284,7 @@ func (cm *certManagerClient) migrateCRDs(ctx context.Context) error {
284284
return err
285285
}
286286

287-
c, err := cm.proxy.NewClient()
287+
c, err := cm.proxy.NewClient(ctx)
288288
if err != nil {
289289
return err
290290
}
@@ -471,7 +471,7 @@ func getTestResourcesManifestObjs() ([]unstructured.Unstructured, error) {
471471
func (cm *certManagerClient) createObj(ctx context.Context, obj unstructured.Unstructured) error {
472472
log := logf.Log
473473

474-
c, err := cm.proxy.NewClient()
474+
c, err := cm.proxy.NewClient(ctx)
475475
if err != nil {
476476
return err
477477
}
@@ -512,7 +512,7 @@ func (cm *certManagerClient) deleteObj(ctx context.Context, obj unstructured.Uns
512512
log := logf.Log
513513
log.V(5).Info("Deleting", logf.UnstructuredToValues(obj)...)
514514

515-
cl, err := cm.proxy.NewClient()
515+
cl, err := cm.proxy.NewClient(ctx)
516516
if err != nil {
517517
return err
518518
}

‎cmd/clusterctl/client/cluster/cert_manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ func Test_certManagerClient_deleteObjs(t *testing.T) {
594594
}
595595
}
596596

597-
cl, err := proxy.NewClient()
597+
cl, err := proxy.NewClient(ctx)
598598
g.Expect(err).ToNot(HaveOccurred())
599599

600600
err = cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)

‎cmd/clusterctl/client/cluster/components.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func (p *providerComponents) Create(ctx context.Context, objs []unstructured.Uns
9292

9393
func (p *providerComponents) createObj(ctx context.Context, obj unstructured.Unstructured) error {
9494
log := logf.Log
95-
c, err := p.proxy.NewClient()
95+
c, err := p.proxy.NewClient(ctx)
9696
if err != nil {
9797
return err
9898
}
@@ -199,7 +199,7 @@ func (p *providerComponents) Delete(ctx context.Context, options DeleteOptions)
199199
}
200200

201201
// Delete all the provider components.
202-
cs, err := p.proxy.NewClient()
202+
cs, err := p.proxy.NewClient(ctx)
203203
if err != nil {
204204
return err
205205
}
@@ -241,7 +241,7 @@ func (p *providerComponents) DeleteWebhookNamespace(ctx context.Context) error {
241241
log := logf.Log
242242
log.V(5).Info("Deleting", "namespace", webhookNamespaceName)
243243

244-
c, err := p.proxy.NewClient()
244+
c, err := p.proxy.NewClient(ctx)
245245
if err != nil {
246246
return err
247247
}

0 commit comments

Comments
 (0)