Skip to content

Commit 621b6a3

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #20364 from mfojtik/fix-govet-errors
fix govet errors
2 parents f370159 + d6e21a4 commit 621b6a3

File tree

6 files changed

+51
-51
lines changed

6 files changed

+51
-51
lines changed

‎pkg/image/trigger/buildconfigs/buildconfigs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func (r *buildConfigReactor) ImageChanged(obj runtime.Object, tagRetriever trigg
145145
continue
146146
}
147147
if p.Paused {
148-
glog.V(5).Infof("Skipping paused build on bc: %s/%s for trigger: %s", bc.Namespace, bc.Name, t)
148+
glog.V(5).Infof("Skipping paused build on bc: %s/%s for trigger: %+v", bc.Namespace, bc.Name, t)
149149
continue
150150
}
151151
var from *kapi.ObjectReference

‎pkg/oc/cli/admin/migrate/legacyhpa/hpa.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ import (
2222
var (
2323
defaultMigrations = map[metav1.TypeMeta]metav1.TypeMeta{
2424
// legacy oapi group
25-
{"DeploymentConfig", "v1"}: {"DeploymentConfig", "apps.openshift.io/v1"},
25+
{Kind: "DeploymentConfig", APIVersion: "v1"}: {Kind: "DeploymentConfig", APIVersion: "apps.openshift.io/v1"},
2626
// legacy oapi group, for the lazy
27-
{"DeploymentConfig", ""}: {"DeploymentConfig", "apps.openshift.io/v1"},
27+
{Kind: "DeploymentConfig"}: {Kind: "DeploymentConfig", APIVersion: "apps.openshift.io/v1"},
2828

2929
// webconsole shenaniganry
30-
{"DeploymentConfig", "extensions/v1beta1"}: {"DeploymentConfig", "apps.openshift.io/v1"},
31-
{"Deployment", "extensions/v1beta1"}: {"Deployment", "apps/v1"},
32-
{"ReplicaSet", "extensions/v1beta1"}: {"ReplicaSet", "apps/v1"},
33-
{"ReplicationController", "extensions/v1beta1"}: {"ReplicationController", "v1"},
30+
{Kind: "DeploymentConfig", APIVersion: "extensions/v1beta1"}: {Kind: "DeploymentConfig", APIVersion: "apps.openshift.io/v1"},
31+
{Kind: "Deployment", APIVersion: "extensions/v1beta1"}: {Kind: "Deployment", APIVersion: "apps/v1"},
32+
{Kind: "ReplicaSet", APIVersion: "extensions/v1beta1"}: {Kind: "ReplicaSet", APIVersion: "apps/v1"},
33+
{Kind: "ReplicationController", APIVersion: "extensions/v1beta1"}: {Kind: "ReplicationController", APIVersion: "v1"},
3434
}
3535

3636
internalMigrateLegacyHPALong = templates.LongDesc(fmt.Sprintf(`

‎pkg/oc/cli/admin/migrate/legacyhpa/hpa_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,38 @@ func TestDefaultMigrations(t *testing.T) {
1515
}{
1616
{
1717
name: "legacy-dc",
18-
input: metav1.TypeMeta{"DeploymentConfig", "v1"},
19-
output: metav1.TypeMeta{"DeploymentConfig", "apps.openshift.io/v1"},
18+
input: metav1.TypeMeta{Kind: "DeploymentConfig", APIVersion: "v1"},
19+
output: metav1.TypeMeta{Kind: "DeploymentConfig", APIVersion: "apps.openshift.io/v1"},
2020
},
2121
{
2222
name: "console-dc",
23-
input: metav1.TypeMeta{"DeploymentConfig", "extensions/v1beta1"},
24-
output: metav1.TypeMeta{"DeploymentConfig", "apps.openshift.io/v1"},
23+
input: metav1.TypeMeta{Kind: "DeploymentConfig", APIVersion: "extensions/v1beta1"},
24+
output: metav1.TypeMeta{Kind: "DeploymentConfig", APIVersion: "apps.openshift.io/v1"},
2525
},
2626
{
2727
name: "console-rc",
28-
input: metav1.TypeMeta{"ReplicationController", "extensions/v1beta1"},
29-
output: metav1.TypeMeta{"ReplicationController", "v1"},
28+
input: metav1.TypeMeta{Kind: "ReplicationController", APIVersion: "extensions/v1beta1"},
29+
output: metav1.TypeMeta{Kind: "ReplicationController", APIVersion: "v1"},
3030
},
3131
{
3232
name: "console-deploy",
33-
input: metav1.TypeMeta{"Deployment", "extensions/v1beta1"},
34-
output: metav1.TypeMeta{"Deployment", "apps/v1"},
33+
input: metav1.TypeMeta{Kind: "Deployment", APIVersion: "extensions/v1beta1"},
34+
output: metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1"},
3535
},
3636
{
3737
name: "console-rs",
38-
input: metav1.TypeMeta{"ReplicaSet", "extensions/v1beta1"},
39-
output: metav1.TypeMeta{"ReplicaSet", "apps/v1"},
38+
input: metav1.TypeMeta{Kind: "ReplicaSet", APIVersion: "extensions/v1beta1"},
39+
output: metav1.TypeMeta{Kind: "ReplicaSet", APIVersion: "apps/v1"},
4040
},
4141
{
4242
name: "ok-dc",
43-
input: metav1.TypeMeta{"DeploymentConfig", "apps.openshift.io/v1"},
44-
output: metav1.TypeMeta{"DeploymentConfig", "apps.openshift.io/v1"},
43+
input: metav1.TypeMeta{Kind: "DeploymentConfig", APIVersion: "apps.openshift.io/v1"},
44+
output: metav1.TypeMeta{Kind: "DeploymentConfig", APIVersion: "apps.openshift.io/v1"},
4545
},
4646
{
4747
name: "other",
48-
input: metav1.TypeMeta{"Cheddar", "cheese/v1alpha1"},
49-
output: metav1.TypeMeta{"Cheddar", "cheese/v1alpha1"},
48+
input: metav1.TypeMeta{Kind: "Cheddar", APIVersion: "cheese/v1alpha1"},
49+
output: metav1.TypeMeta{Kind: "Cheddar", APIVersion: "cheese/v1alpha1"},
5050
},
5151
}
5252

‎pkg/oc/cli/admin/migrate/storage/storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ func (t *tokenLimiter) getDuration(n int) time.Duration {
362362
reservation := t.rateLimiter.ReserveN(now, n)
363363
if !reservation.OK() {
364364
// this should never happen but we do not want to hang a worker forever
365-
glog.Errorf("unable to get rate limited reservation, burst=%d n=%d limiter=%#v", t.burst, n, *t.rateLimiter)
365+
glog.Errorf("unable to get rate limited reservation, burst=%d n=%d", t.burst, n)
366366
return time.Minute
367367
}
368368
return reservation.DelayFrom(now)

‎pkg/oc/cli/admin/migrate/templateinstances/templateinstances_test.go

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,73 +17,73 @@ func TestDefaultMigrations(t *testing.T) {
1717
}{
1818
{
1919
name: "legacy-dc",
20-
input: metav1.TypeMeta{"DeploymentConfig", "v1"},
21-
output: metav1.TypeMeta{"DeploymentConfig", "apps.openshift.io/v1"},
20+
input: metav1.TypeMeta{Kind: "DeploymentConfig", APIVersion: "v1"},
21+
output: metav1.TypeMeta{Kind: "DeploymentConfig", APIVersion: "apps.openshift.io/v1"},
2222
},
2323
{
2424
name: "lazy-dc",
25-
input: metav1.TypeMeta{"DeploymentConfig", ""},
26-
output: metav1.TypeMeta{"DeploymentConfig", "apps.openshift.io/v1"},
25+
input: metav1.TypeMeta{Kind: "DeploymentConfig"},
26+
output: metav1.TypeMeta{Kind: "DeploymentConfig", APIVersion: "apps.openshift.io/v1"},
2727
},
2828
{
2929
name: "ok-dc",
30-
input: metav1.TypeMeta{"DeploymentConfig", "apps.openshift.io/v1"},
31-
output: metav1.TypeMeta{"DeploymentConfig", "apps.openshift.io/v1"},
30+
input: metav1.TypeMeta{Kind: "DeploymentConfig", APIVersion: "apps.openshift.io/v1"},
31+
output: metav1.TypeMeta{Kind: "DeploymentConfig", APIVersion: "apps.openshift.io/v1"},
3232
},
3333
{
3434
name: "legacy-bc",
35-
input: metav1.TypeMeta{"BuildConfig", "v1"},
36-
output: metav1.TypeMeta{"BuildConfig", "build.openshift.io/v1"},
35+
input: metav1.TypeMeta{Kind: "BuildConfig", APIVersion: "v1"},
36+
output: metav1.TypeMeta{Kind: "BuildConfig", APIVersion: "build.openshift.io/v1"},
3737
},
3838
{
3939
name: "lazy-bc",
40-
input: metav1.TypeMeta{"BuildConfig", ""},
41-
output: metav1.TypeMeta{"BuildConfig", "build.openshift.io/v1"},
40+
input: metav1.TypeMeta{Kind: "BuildConfig"},
41+
output: metav1.TypeMeta{Kind: "BuildConfig", APIVersion: "build.openshift.io/v1"},
4242
},
4343
{
4444
name: "ok-bc",
45-
input: metav1.TypeMeta{"BuildConfig", "build.openshift.io/v1"},
46-
output: metav1.TypeMeta{"BuildConfig", "build.openshift.io/v1"},
45+
input: metav1.TypeMeta{Kind: "BuildConfig", APIVersion: "build.openshift.io/v1"},
46+
output: metav1.TypeMeta{Kind: "BuildConfig", APIVersion: "build.openshift.io/v1"},
4747
},
4848
{
4949
name: "legacy-build",
50-
input: metav1.TypeMeta{"Build", "v1"},
51-
output: metav1.TypeMeta{"Build", "build.openshift.io/v1"},
50+
input: metav1.TypeMeta{Kind: "Build", APIVersion: "v1"},
51+
output: metav1.TypeMeta{Kind: "Build", APIVersion: "build.openshift.io/v1"},
5252
},
5353
{
5454
name: "lazy-build",
55-
input: metav1.TypeMeta{"Build", ""},
56-
output: metav1.TypeMeta{"Build", "build.openshift.io/v1"},
55+
input: metav1.TypeMeta{Kind: "Build"},
56+
output: metav1.TypeMeta{Kind: "Build", APIVersion: "build.openshift.io/v1"},
5757
},
5858
{
5959
name: "ok-build",
60-
input: metav1.TypeMeta{"Build", "build.openshift.io/v1"},
61-
output: metav1.TypeMeta{"Build", "build.openshift.io/v1"},
60+
input: metav1.TypeMeta{Kind: "Build", APIVersion: "build.openshift.io/v1"},
61+
output: metav1.TypeMeta{Kind: "Build", APIVersion: "build.openshift.io/v1"},
6262
},
6363
{
6464
name: "legacy-route",
65-
input: metav1.TypeMeta{"Route", "v1"},
66-
output: metav1.TypeMeta{"Route", "route.openshift.io/v1"},
65+
input: metav1.TypeMeta{Kind: "Route", APIVersion: "v1"},
66+
output: metav1.TypeMeta{Kind: "Route", APIVersion: "route.openshift.io/v1"},
6767
},
6868
{
6969
name: "lazy-route",
70-
input: metav1.TypeMeta{"Route", ""},
71-
output: metav1.TypeMeta{"Route", "route.openshift.io/v1"},
70+
input: metav1.TypeMeta{Kind: "Route"},
71+
output: metav1.TypeMeta{Kind: "Route", APIVersion: "route.openshift.io/v1"},
7272
},
7373
{
7474
name: "ok-route",
75-
input: metav1.TypeMeta{"Route", "route.openshift.io/v1"},
76-
output: metav1.TypeMeta{"Route", "route.openshift.io/v1"},
75+
input: metav1.TypeMeta{Kind: "Route", APIVersion: "route.openshift.io/v1"},
76+
output: metav1.TypeMeta{Kind: "Route", APIVersion: "route.openshift.io/v1"},
7777
},
7878
{
7979
name: "legacy-other",
80-
input: metav1.TypeMeta{"Cheddar", "v1"},
81-
output: metav1.TypeMeta{"Cheddar", "v1"},
80+
input: metav1.TypeMeta{Kind: "Cheddar", APIVersion: "v1"},
81+
output: metav1.TypeMeta{Kind: "Cheddar", APIVersion: "v1"},
8282
},
8383
{
8484
name: "ok-other",
85-
input: metav1.TypeMeta{"Cheddar", "cheese/v1alpha1"},
86-
output: metav1.TypeMeta{"Cheddar", "cheese/v1alpha1"},
85+
input: metav1.TypeMeta{Kind: "Cheddar", APIVersion: "cheese/v1alpha1"},
86+
output: metav1.TypeMeta{Kind: "Cheddar", APIVersion: "cheese/v1alpha1"},
8787
},
8888
}
8989

‎pkg/oc/cli/admin/prune/imageprune/prune.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ func (p *pruner) handleImageEvent(event watch.Event) {
891891
return
892892
}
893893
if imgNode != nil {
894-
glog.V(4).Infof("Ignoring added Image %s that is already present in the graph", img)
894+
glog.V(4).Infof("Ignoring added Image %s that is already present in the graph", img.Name)
895895
return
896896
}
897897
glog.V(4).Infof("Adding new Image %s to the graph", img.Name)

0 commit comments

Comments
 (0)