Skip to content

Commit 8da6183

Browse files
tatarutytataruty
committed
Remove all k8sClient changes
1 parent b217951 commit 8da6183

File tree

11 files changed

+79
-80
lines changed

11 files changed

+79
-80
lines changed

‎tests/framework/prometheus.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,11 +541,13 @@ func CreateEndTimeFinder(
541541

542542
// CreateResponseChecker returns a function that checks if there is a successful response from a url.
543543
func CreateResponseChecker(url, address string, requestTimeout time.Duration, opts ...Option) func() error {
544-
GinkgoWriter.Printf("Starting checking response for url %q and address %q\n", url, address)
545544
options := &Options{logEnabled: true}
546545
for _, opt := range opts {
547546
opt(options)
548547
}
548+
if options.logEnabled {
549+
GinkgoWriter.Printf("Starting checking response for url %q and address %q\n", url, address)
550+
}
549551

550552
return func() error {
551553
status, _, err := Get(url, address, requestTimeout, nil, nil, opts...)

‎tests/framework/request.go‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"time"
1414

1515
. "github.com/onsi/ginkgo/v2"
16-
k8sClient "sigs.k8s.io/controller-runtime/pkg/client"
1716
)
1817

1918
// Get sends a GET request to the specified url.
@@ -149,49 +148,3 @@ func makeRequest(
149148

150149
return resp, nil
151150
}
152-
153-
func K8sGet(
154-
ctx context.Context,
155-
client k8sClient.Client,
156-
key k8sClient.ObjectKey,
157-
obj k8sClient.Object,
158-
opts ...Option,
159-
) error {
160-
options := &Options{logEnabled: true}
161-
for _, opt := range opts {
162-
opt(options)
163-
}
164-
165-
err := client.Get(ctx, key, obj)
166-
if err != nil && options.logEnabled {
167-
return fmt.Errorf("ERROR getting resource %q: %w", obj.GetName(), err)
168-
}
169-
170-
return err
171-
}
172-
173-
func K8sList(
174-
ctx context.Context,
175-
client k8sClient.Client,
176-
list k8sClient.ObjectList,
177-
) error {
178-
err := client.List(ctx, list)
179-
if err != nil {
180-
return fmt.Errorf("ERROR listing resource %q: %w", list.GetObjectKind(), err)
181-
}
182-
183-
return err
184-
}
185-
186-
func K8sCreate(
187-
ctx context.Context,
188-
client k8sClient.Client,
189-
obj k8sClient.Object,
190-
) error {
191-
err := client.Create(ctx, obj)
192-
if err != nil {
193-
return fmt.Errorf("ERROR creating resource %q: %w", obj.GetName(), err)
194-
}
195-
196-
return err
197-
}

‎tests/framework/resourcemanager.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,12 @@ func (rm *ResourceManager) Apply(resources []client.Object, opts ...Option) erro
139139
resource.SetResourceVersion(obj.GetResourceVersion())
140140
updateErr := rm.K8sClient.Update(ctx, resource)
141141
if updateErr != nil {
142-
GinkgoWriter.Printf(
143-
"ERROR occurred during updating Kubernetes resources on retries: %s\n",
144-
updateErr,
145-
)
142+
if options.logEnabled {
143+
GinkgoWriter.Printf(
144+
"ERROR occurred during updating Kubernetes resources on retries: %s\n",
145+
updateErr,
146+
)
147+
}
146148
}
147149

148150
return updateErr
@@ -154,7 +156,9 @@ func (rm *ResourceManager) Apply(resources []client.Object, opts ...Option) erro
154156
return retryErr
155157
}
156158
}
157-
GinkgoWriter.Printf("Resources defined as Go objects applied successfully\n")
159+
if options.logEnabled {
160+
GinkgoWriter.Printf("Resources defined as Go objects applied successfully\n")
161+
}
158162

159163
return nil
160164
}

‎tests/suite/client_settings_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,9 @@ func waitForClientSettingsAncestorStatus(
393393
func(ctx context.Context) (bool, error) {
394394
var pol ngfAPI.ClientSettingsPolicy
395395

396-
if err := framework.K8sGet(ctx, k8sClient, policyNsname, &pol); err != nil {
396+
if err := k8sClient.Get(ctx, policyNsname, &pol); err != nil {
397+
GinkgoWriter.Printf("ERROR: Failed to get ClientSettingsPolicy %q: %s", policyNsname, err.Error())
398+
397399
return false, err
398400
}
399401

‎tests/suite/graceful_recovery_test.go‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,15 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
7474
defer cancel()
7575

7676
var pod core.Pod
77-
if err := framework.K8sGet(
78-
ctx, k8sClient,
77+
if err := k8sClient.Get(
78+
ctx,
7979
types.NamespacedName{Namespace: namespace, Name: podName},
8080
&pod,
8181
); err != nil {
82-
return 0, fmt.Errorf("error retrieving Pod: %w", err)
82+
podErr := fmt.Errorf("error retrieving Pod: %w", err)
83+
GinkgoWriter.Printf("%s\n", podErr)
84+
85+
return 0, podErr
8386
}
8487

8588
var restartCount int
@@ -135,13 +138,15 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
135138
defer cancel()
136139

137140
var nginxPod core.Pod
138-
if err := framework.K8sGet(
141+
if err := k8sClient.Get(
139142
ctx,
140-
k8sClient,
141143
types.NamespacedName{Namespace: ns.Name, Name: nginxPodName},
142144
&nginxPod,
143145
); err != nil {
144-
return nil, fmt.Errorf("error retrieving nginx Pod: %w", err)
146+
podErr := fmt.Errorf("error retrieving nginx Pod: %w", err)
147+
GinkgoWriter.Printf("%s\n", podErr)
148+
149+
return nil, podErr
145150
}
146151

147152
b, err := resourceManager.GetFileContents("graceful-recovery/node-debugger-job.yaml")
@@ -313,6 +318,7 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
313318
ngfNamespace,
314319
releaseName,
315320
timeoutConfig.GetStatusTimeout,
321+
framework.WithLoggingDisabled(),
316322
)
317323
return len(podNames) == 1 && err == nil
318324
}).
@@ -379,8 +385,11 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
379385
var lease coordination.Lease
380386
key := types.NamespacedName{Name: "ngf-test-nginx-gateway-fabric-leader-election", Namespace: ngfNamespace}
381387

382-
if err := framework.K8sGet(ctx, k8sClient, key, &lease); err != nil {
383-
return "", errors.New("could not retrieve leader election lease")
388+
if err := k8sClient.Get(ctx, key, &lease); err != nil {
389+
leaseErr := errors.New("could not retrieve leader election lease")
390+
GinkgoWriter.Printf("ERROR: %s\n", leaseErr)
391+
392+
return "", leaseErr
384393
}
385394

386395
if *lease.Spec.HolderIdentity == "" {
@@ -411,7 +420,13 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
411420
}
412421

413422
BeforeAll(func() {
414-
podNames, err := framework.GetReadyNGFPodNames(k8sClient, ngfNamespace, releaseName, timeoutConfig.GetStatusTimeout)
423+
podNames, err := framework.GetReadyNGFPodNames(
424+
k8sClient,
425+
ngfNamespace,
426+
releaseName,
427+
timeoutConfig.GetStatusTimeout,
428+
framework.WithLoggingDisabled(),
429+
)
415430
Expect(err).ToNot(HaveOccurred())
416431
Expect(podNames).To(HaveLen(1))
417432

@@ -500,6 +515,7 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
500515
ngfNamespace,
501516
releaseName,
502517
timeoutConfig.GetStatusTimeout,
518+
framework.WithLoggingDisabled(),
503519
)
504520
return len(newNGFPodNames) == 1 && err == nil
505521
}).

‎tests/suite/nginxgateway_test.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ var _ = Describe("NginxGateway", Ordered, Label("functional", "nginxGateway"), f
3434

3535
var nginxGateway ngfAPI.NginxGateway
3636

37-
if err := framework.K8sGet(ctx, k8sClient, nsname, &nginxGateway); err != nil {
38-
return nginxGateway, fmt.Errorf("failed to get nginxGateway: %w", err)
37+
if err := k8sClient.Get(ctx, nsname, &nginxGateway); err != nil {
38+
gatewayErr := fmt.Errorf("failed to get nginxGateway: %w", err)
39+
GinkgoWriter.Printf("ERROR: %v\n", gatewayErr)
40+
41+
return nginxGateway, gatewayErr
3942
}
4043

4144
return nginxGateway, nil

‎tests/suite/reconfig_test.go‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
136136
Name: "namespace" + strconv.Itoa(i),
137137
},
138138
}
139-
Expect(framework.K8sCreate(ctx, k8sClient, &ns)).To(Succeed())
139+
Expect(k8sClient.Create(ctx, &ns)).To(Succeed())
140140
}
141141

142142
Expect(resourceManager.Apply([]client.Object{&reconfigNamespace})).To(Succeed())
@@ -168,22 +168,31 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
168168
defer cancel()
169169

170170
var namespaces core.NamespaceList
171-
if err := framework.K8sList(ctx, k8sClient, &namespaces); err != nil {
172-
return fmt.Errorf("error getting namespaces: %w", err)
171+
if err := k8sClient.List(ctx, &namespaces); err != nil {
172+
nsErr := fmt.Errorf("error getting namespaces: %w", err)
173+
GinkgoWriter.Printf("%s\n", nsErr)
174+
175+
return nsErr
173176
}
174177
GinkgoWriter.Printf("Found %d namespaces, expected at least%d\n", len(namespaces.Items), resourceCount)
175178
Expect(len(namespaces.Items)).To(BeNumerically(">=", resourceCount))
176179

177180
var routes v1.HTTPRouteList
178-
if err := framework.K8sList(ctx, k8sClient, &routes); err != nil {
179-
return fmt.Errorf("error getting HTTPRoutes: %w", err)
181+
if err := k8sClient.List(ctx, &routes); err != nil {
182+
routesErr := fmt.Errorf("error getting HTTPRoutes: %w", err)
183+
GinkgoWriter.Printf("%s\n", routesErr)
184+
185+
return routesErr
180186
}
181187
GinkgoWriter.Printf("Found %d HTTPRoutes, expected %d\n", len(routes.Items), resourceCount*3)
182188
Expect(routes.Items).To(HaveLen(resourceCount * 3))
183189

184190
var pods core.PodList
185-
if err := framework.K8sList(ctx, k8sClient, &pods); err != nil {
186-
return fmt.Errorf("error getting Pods: %w", err)
191+
if err := k8sClient.List(ctx, &pods); err != nil {
192+
podsErr := fmt.Errorf("error getting Pods: %w", err)
193+
GinkgoWriter.Printf("%s\n", podsErr)
194+
195+
return podsErr
187196
}
188197
GinkgoWriter.Printf("Found %d Pods, expected at least %d\n", len(pods.Items), resourceCount*2)
189198
Expect(len(pods.Items)).To(BeNumerically(">=", resourceCount*2))

‎tests/suite/snippets_filter_test.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,9 @@ func checkHTTPRouteToHaveGatewayNotProgrammedCond(httpRouteNsName types.Namespac
270270
var hr v1.HTTPRoute
271271
var err error
272272

273-
if err = framework.K8sGet(ctx, k8sClient, httpRouteNsName, &hr); err != nil {
273+
if err = k8sClient.Get(ctx, httpRouteNsName, &hr); err != nil {
274+
GinkgoWriter.Printf("ERROR: %v\n", err)
275+
274276
return err
275277
}
276278

@@ -326,7 +328,9 @@ func checkForSnippetsFilterToBeAccepted(snippetsFilterNsNames types.NamespacedNa
326328
var sf ngfAPI.SnippetsFilter
327329
var err error
328330

329-
if err = framework.K8sGet(ctx, k8sClient, snippetsFilterNsNames, &sf); err != nil {
331+
if err = k8sClient.Get(ctx, snippetsFilterNsNames, &sf); err != nil {
332+
GinkgoWriter.Printf("ERROR: %v\n", err)
333+
330334
return err
331335
}
332336

‎tests/suite/system_suite_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,9 @@ func teardown(relName string) {
293293
true, /* poll immediately */
294294
func(ctx context.Context) (bool, error) {
295295
key := k8sTypes.NamespacedName{Name: ngfNamespace}
296-
if err := framework.K8sGet(ctx, k8sClient, key, &core.Namespace{}); err != nil && apierrors.IsNotFound(err) {
296+
if err := k8sClient.Get(ctx, key, &core.Namespace{}); err != nil && apierrors.IsNotFound(err) {
297+
GinkgoWriter.Printf("Namespace %q successfully deleted\n", ngfNamespace)
298+
297299
return true, nil
298300
}
299301

‎tests/suite/tracing_test.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ var _ = Describe("Tracing", FlakeAttempts(2), Ordered, Label("functional", "trac
5252

5353
key := types.NamespacedName{Name: "ngf-test-proxy-config", Namespace: "nginx-gateway"}
5454
var nginxProxy ngfAPIv1alpha2.NginxProxy
55-
Expect(framework.K8sGet(ctx, k8sClient, key, &nginxProxy)).To(Succeed())
55+
Expect(k8sClient.Get(ctx, key, &nginxProxy)).To(Succeed())
5656

5757
nginxProxy.Spec.Telemetry = &telemetry
5858

@@ -240,7 +240,9 @@ func verifyGatewayClassResolvedRefs() error {
240240
defer cancel()
241241

242242
var gc gatewayv1.GatewayClass
243-
if err := framework.K8sGet(ctx, k8sClient, types.NamespacedName{Name: gatewayClassName}, &gc); err != nil {
243+
if err := k8sClient.Get(ctx, types.NamespacedName{Name: gatewayClassName}, &gc); err != nil {
244+
GinkgoWriter.Printf("ERROR: %v\n", err)
245+
244246
return err
245247
}
246248

@@ -270,7 +272,9 @@ func verifyPolicyStatus() error {
270272

271273
var pol ngfAPIv1alpha2.ObservabilityPolicy
272274
key := types.NamespacedName{Name: "test-observability-policy", Namespace: "helloworld"}
273-
if err := framework.K8sGet(ctx, k8sClient, key, &pol); err != nil {
275+
if err := k8sClient.Get(ctx, key, &pol); err != nil {
276+
GinkgoWriter.Printf("ERROR: %v\n", err)
277+
274278
return err
275279
}
276280

0 commit comments

Comments
 (0)