Skip to content

Commit f8b2ea7

Browse files
nrchakradharnrchakradhar
committed
Incorporate newer review comments
1 parent dca34de commit f8b2ea7

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- Added support for override values with environment variable expansion in the `watches.yaml` file for Helm-based operators. ([#2325](https://github.com/operator-framework/operator-sdk/pull/2325))
1111

1212
### Changed
13-
- Changes in `errors` wrapped to handle them according to the Go version 1.13+. More info: https://blog.golang.org/go1.13-errors. ([#2355](https://github.com/operator-framework/operator-sdk/pull/2355))
13+
- Changed error wrapping according to Go version 1.13+ [error handling](https://blog.golang.org/go1.13-errors). ([#2355](https://github.com/operator-framework/operator-sdk/pull/2355))
1414
- Replace usage of `github.com/operator-framework/operator-sdk/pkg/restmapper.DynamicRESTMapper` with `sigs.k8s.io/controller-runtime/pkg/client/apiutil.DynamicRESTMapper`. ([#2309](https://github.com/operator-framework/operator-sdk/pull/2309))
1515
- Upgraded Helm operator packages and base image from Helm v2 to Helm v3. Cluster state for pre-existing CRs using Helm v2-based operators will be automatically migrated to Helm v3's new release storage format, and existing releases may be upgraded due to changes in Helm v3's label injection. ([#2080](https://github.com/operator-framework/operator-sdk/pull/2080))
1616
- Fail `operator-sdk olm-catalog gen-csv` if it is not run from a project's root, which the command already assumes is the case. ([#2322](https://github.com/operator-framework/operator-sdk/pull/2322))

‎test/e2e/_incluster-test-code/memcached_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func verifyLeader(t *testing.T, namespace string, f *framework.Framework, labels
126126
return true, nil
127127
})
128128
if err != nil {
129-
return nil, fmt.Errorf("error getting leader lock configmap: %w", err)
129+
return nil, fmt.Errorf("error getting leader lock configmap: %v", err)
130130
}
131131
t.Logf("Found leader lock configmap %s\n", lockName)
132132

@@ -164,7 +164,7 @@ func memcachedScaleTest(t *testing.T, f *framework.Framework, ctx *framework.Tes
164164
name := "example-memcached"
165165
namespace, err := ctx.GetNamespace()
166166
if err != nil {
167-
return fmt.Errorf("could not get namespace: %w", err)
167+
return fmt.Errorf("could not get namespace: %v", err)
168168
}
169169
key := types.NamespacedName{Name: name, Namespace: namespace}
170170
// create memcached custom resource
@@ -180,31 +180,31 @@ func memcachedScaleTest(t *testing.T, f *framework.Framework, ctx *framework.Tes
180180
// use TestCtx's create helper to create the object and add a cleanup function for the new object
181181
err = f.Client.Create(goctx.TODO(), exampleMemcached, &framework.CleanupOptions{TestContext: ctx, Timeout: cleanupTimeout, RetryInterval: cleanupRetryInterval})
182182
if err != nil {
183-
return fmt.Errorf("could no create CR: %w", err)
183+
return fmt.Errorf("could no create CR: %v", err)
184184
}
185185
// wait for example-memcached to reach `fromReplicas` replicas
186186
err = e2eutil.WaitForDeployment(t, f.KubeClient, key.Namespace, key.Name, fromReplicas, retryInterval, timeout)
187187
if err != nil {
188-
return fmt.Errorf("failed waiting for %d deployment/%s replicas: %w", fromReplicas, key.Name, err)
188+
return fmt.Errorf("failed waiting for %d deployment/%s replicas: %v", fromReplicas, key.Name, err)
189189
}
190190

191191
err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
192192
err = f.Client.Get(goctx.TODO(), key, exampleMemcached)
193193
if err != nil {
194-
return fmt.Errorf("could not get memcached CR %q: %w", key, err)
194+
return fmt.Errorf("could not get memcached CR %q: %v", key, err)
195195
}
196196
// update memcached CR size to `toReplicas` replicas
197197
exampleMemcached.Spec.Size = int32(toReplicas)
198198
t.Logf("Attempting memcached CR %q update, resourceVersion: %s", key, exampleMemcached.GetResourceVersion())
199199
return f.Client.Update(goctx.TODO(), exampleMemcached)
200200
})
201201
if err != nil {
202-
return fmt.Errorf("could not update memcached CR %q: %w", key, err)
202+
return fmt.Errorf("could not update memcached CR %q: %v", key, err)
203203
}
204204

205205
// wait for example-memcached to reach `toReplicas` replicas
206206
if err := e2eutil.WaitForDeployment(t, f.KubeClient, key.Namespace, key.Name, toReplicas, retryInterval, timeout); err != nil {
207-
return fmt.Errorf("failed waiting for %d deployment/%s replicas: %w", toReplicas, key.Name, err)
207+
return fmt.Errorf("failed waiting for %d deployment/%s replicas: %v", toReplicas, key.Name, err)
208208
}
209209
return nil
210210
}
@@ -313,7 +313,7 @@ func memcachedMetricsTest(t *testing.T, f *framework.Framework, ctx *framework.T
313313
s := v1.Service{}
314314
err = f.Client.Get(goctx.TODO(), types.NamespacedName{Name: fmt.Sprintf("%s-metrics", operatorName), Namespace: namespace}, &s)
315315
if err != nil {
316-
return fmt.Errorf("could not get metrics Service: %w", err)
316+
return fmt.Errorf("could not get metrics Service: %v", err)
317317
}
318318
if len(s.Spec.Selector) == 0 {
319319
return fmt.Errorf("no labels found in metrics Service")
@@ -322,7 +322,7 @@ func memcachedMetricsTest(t *testing.T, f *framework.Framework, ctx *framework.T
322322
// TODO(lili): Make port a constant in internal/scaffold/cmd.go.
323323
response, err := getMetrics(t, f, s.Spec.Selector, namespace, "8383")
324324
if err != nil {
325-
return fmt.Errorf("failed to get metrics: %w", err)
325+
return fmt.Errorf("failed to get metrics: %v", err)
326326
}
327327
// Make sure metrics are present
328328
if len(response) == 0 {
@@ -333,7 +333,7 @@ func memcachedMetricsTest(t *testing.T, f *framework.Framework, ctx *framework.T
333333
l := promlint.New(bytes.NewReader(response))
334334
problems, err := l.Lint()
335335
if err != nil {
336-
return fmt.Errorf("failed to lint metrics: %w", err)
336+
return fmt.Errorf("failed to lint metrics: %v", err)
337337
}
338338

339339
// TODO(joelanford): Change to 0, when we upgrade from kubernetes-1.15.
@@ -354,7 +354,7 @@ func memcachedOperatorMetricsTest(t *testing.T, f *framework.Framework, ctx *fra
354354
// TODO(lili): Make port a constant in internal/scaffold/cmd.go.
355355
response, err := getMetrics(t, f, map[string]string{"name": operatorName}, namespace, "8686")
356356
if err != nil {
357-
return fmt.Errorf("failed to get metrics: %w", err)
357+
return fmt.Errorf("failed to get metrics: %v", err)
358358
}
359359
// Make sure metrics are present
360360
if len(response) == 0 {
@@ -365,7 +365,7 @@ func memcachedOperatorMetricsTest(t *testing.T, f *framework.Framework, ctx *fra
365365
l := promlint.New(bytes.NewReader(response))
366366
problems, err := l.Lint()
367367
if err != nil {
368-
return fmt.Errorf("failed to lint metrics: %w", err)
368+
return fmt.Errorf("failed to lint metrics: %v", err)
369369
}
370370
if len(problems) > 0 {
371371
return fmt.Errorf("found problems with metrics: %#+v", problems)
@@ -428,7 +428,7 @@ func getMetrics(t *testing.T, f *framework.Framework, labels map[string]string,
428428
}
429429
err := f.Client.List(goctx.TODO(), pods, opts...)
430430
if err != nil {
431-
return nil, fmt.Errorf("failed to get pods: %w", err)
431+
return nil, fmt.Errorf("failed to get pods: %v", err)
432432
}
433433

434434
podName := ""
@@ -455,7 +455,7 @@ func getMetrics(t *testing.T, f *framework.Framework, labels map[string]string,
455455
request := proxyViaPod(f.KubeClient, ns, podName, port, "/metrics")
456456
response, err := request.DoRaw()
457457
if err != nil {
458-
return nil, fmt.Errorf("failed to get response from metrics: %w", err)
458+
return nil, fmt.Errorf("failed to get response from metrics: %v", err)
459459
}
460460

461461
return response, nil

‎test/test-framework/test/e2e/memcached_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func TestMemcached(t *testing.T) {
5353
func memcachedScaleTest(t *testing.T, f *framework.Framework, ctx *framework.TestCtx, fromReplicas, toReplicas int) error {
5454
namespace, err := ctx.GetNamespace()
5555
if err != nil {
56-
return fmt.Errorf("could not get namespace: %w", err)
56+
return fmt.Errorf("could not get namespace: %v", err)
5757
}
5858
// create memcached custom resource
5959
exampleMemcached := &operator.Memcached{
@@ -69,31 +69,31 @@ func memcachedScaleTest(t *testing.T, f *framework.Framework, ctx *framework.Tes
6969
// use TestCtx's create helper to create the object and add a cleanup function for the new object
7070
err = f.Client.Create(goctx.TODO(), exampleMemcached, &framework.CleanupOptions{TestContext: ctx, Timeout: cleanupTimeout, RetryInterval: cleanupRetryInterval})
7171
if err != nil {
72-
return fmt.Errorf("could not create %q: %w", key, err)
72+
return fmt.Errorf("could not create %q: %v", key, err)
7373
}
7474
// wait for example-memcached to reach `fromReplicas` replicas
7575
err = e2eutil.WaitForDeployment(t, f.KubeClient, namespace, "example-memcached", fromReplicas, retryInterval, timeout)
7676
if err != nil {
77-
return fmt.Errorf("failed waiting for %d deployment/%s replicas: %w", fromReplicas, key.Name, err)
77+
return fmt.Errorf("failed waiting for %d deployment/%s replicas: %v", fromReplicas, key.Name, err)
7878
}
7979

8080
err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
8181
err = f.Client.Get(goctx.TODO(), key, exampleMemcached)
8282
if err != nil {
83-
return fmt.Errorf("could not get memcached CR %q: %w", key, err)
83+
return fmt.Errorf("could not get memcached CR %q: %v", key, err)
8484
}
8585

8686
exampleMemcached.Spec.Size = int32(toReplicas)
8787
t.Logf("Attempting memcached %q update, resourceVersion: %s", key, exampleMemcached.GetResourceVersion())
8888
return f.Client.Update(goctx.TODO(), exampleMemcached)
8989
})
9090
if err != nil {
91-
return fmt.Errorf("could not update memcached CR %q: %w", key, err)
91+
return fmt.Errorf("could not update memcached CR %q: %v", key, err)
9292
}
9393

9494
// wait for example-memcached to reach `toReplicas` replicas
9595
if err := e2eutil.WaitForDeployment(t, f.KubeClient, key.Namespace, key.Name, toReplicas, retryInterval, timeout); err != nil {
96-
return fmt.Errorf("failed waiting for %d deployment/%s replicas: %w", toReplicas, key.Name, err)
96+
return fmt.Errorf("failed waiting for %d deployment/%s replicas: %v", toReplicas, key.Name, err)
9797
}
9898
return nil
9999
}

0 commit comments

Comments
 (0)