From b21f0716302343beb6fc0f7b6fd2bb8bbd49a6ab Mon Sep 17 00:00:00 2001 From: miampf Date: Thu, 22 Aug 2024 12:52:06 +0200 Subject: [PATCH] fix up rebase --- e2e/internal/kubeclient/deploy.go | 2 +- e2e/internal/kubeclient/kubeclient.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/internal/kubeclient/deploy.go b/e2e/internal/kubeclient/deploy.go index 84866b5bed..d8976d3d98 100644 --- a/e2e/internal/kubeclient/deploy.go +++ b/e2e/internal/kubeclient/deploy.go @@ -366,7 +366,7 @@ func (c *Kubeclient) Restart(ctx context.Context, resource ResourceWaiter, names // ScaleDeployment scales a deployment to the given number of replicas. func (c *Kubeclient) ScaleDeployment(ctx context.Context, namespace, name string, replicas int32) error { - _, err := c.client.AppsV1().Deployments(namespace).UpdateScale(ctx, name, &autoscalingv1.Scale{ + _, err := c.Client.AppsV1().Deployments(namespace).UpdateScale(ctx, name, &autoscalingv1.Scale{ ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace}, Spec: autoscalingv1.ScaleSpec{Replicas: replicas}, }, metav1.UpdateOptions{}) diff --git a/e2e/internal/kubeclient/kubeclient.go b/e2e/internal/kubeclient/kubeclient.go index dbfb06d9f2..0ecf675e69 100644 --- a/e2e/internal/kubeclient/kubeclient.go +++ b/e2e/internal/kubeclient/kubeclient.go @@ -89,7 +89,7 @@ func NewForTest(t *testing.T) *Kubeclient { // A pod is considered to belong to a deployment if it is owned by a ReplicaSet which is in turn // owned by the Deployment in question. func (c *Kubeclient) PodsFromDeployment(ctx context.Context, namespace, deployment string) ([]corev1.Pod, error) { - replicasets, err := c.client.AppsV1().ReplicaSets(namespace).List(ctx, metav1.ListOptions{}) + replicasets, err := c.Client.AppsV1().ReplicaSets(namespace).List(ctx, metav1.ListOptions{}) if err != nil { return nil, fmt.Errorf("listing replicasets: %w", err) } @@ -119,7 +119,7 @@ func (c *Kubeclient) PodsFromDeployment(ctx context.Context, namespace, deployme // PodsFromOwner returns the pods owned by an object in the namespace of the given kind. func (c *Kubeclient) PodsFromOwner(ctx context.Context, namespace, kind, name string) ([]corev1.Pod, error) { - pods, err := c.client.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{}) + pods, err := c.Client.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{}) if err != nil { return nil, fmt.Errorf("listing pods: %w", err) }