Skip to content

Commit 34c705f

Browse files
authored
Update dep (#348)
* fix go fmt * update the go.mod
1 parent 5574fce commit 34c705f

File tree

7 files changed

+147
-73
lines changed

7 files changed

+147
-73
lines changed

cloud/scope/clients.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scope
22

33
import (
4-
"github.com/IBM/go-sdk-core/core"
4+
"github.com/IBM/go-sdk-core/v5/core"
55
"github.com/IBM/vpc-go-sdk/vpcv1"
66
)
77

cloud/scope/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package scope
33
import (
44
"context"
55

6-
"github.com/IBM/go-sdk-core/core"
6+
"github.com/IBM/go-sdk-core/v5/core"
77
"github.com/IBM/vpc-go-sdk/vpcv1"
88
"github.com/go-logr/logr"
99
infrav1 "github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/api/v1alpha3"

controllers/ibmpowervscluster_controller_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828

2929
. "github.com/onsi/ginkgo"
3030
. "github.com/onsi/gomega"
31-
3231
)
3332

3433
var _ = Describe("IBMPowerVSClusterReconciler", func() {

controllers/ibmpowervsmachine_controller_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828

2929
. "github.com/onsi/ginkgo"
3030
. "github.com/onsi/gomega"
31-
3231
)
3332

3433
var _ = Describe("IBMPowerVSMachineReconciler", func() {

go.mod

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,27 @@ go 1.16
44

55
require (
66
github.com/IBM-Cloud/bluemix-go v0.0.0-20200921095234-26d1d0148c62
7-
github.com/IBM-Cloud/power-go-client v1.0.55
8-
github.com/IBM/go-sdk-core v1.1.0
9-
github.com/IBM/go-sdk-core/v4 v4.5.1 // indirect
7+
github.com/IBM-Cloud/power-go-client v1.0.75
8+
github.com/IBM/go-sdk-core/v5 v5.7.0
109
github.com/IBM/vpc-go-sdk v0.1.1
11-
github.com/dgrijalva/jwt-go v3.2.0+incompatible
1210
github.com/go-logr/logr v0.4.0
11+
github.com/golang-jwt/jwt v3.2.2+incompatible
1312
github.com/onsi/ginkgo v1.16.4
14-
github.com/onsi/gomega v1.13.0
13+
github.com/onsi/gomega v1.15.0
1514
github.com/pkg/errors v0.9.1
1615
github.com/ppc64le-cloud/powervs-utils v0.0.0-20210106101518-5d3f965b0344
1716
github.com/prometheus/common v0.26.0
18-
k8s.io/api v0.21.2
19-
k8s.io/apimachinery v0.21.2
20-
k8s.io/client-go v0.21.2
17+
k8s.io/api v0.21.4
18+
k8s.io/apimachinery v0.21.4
19+
k8s.io/client-go v0.21.4
2120
k8s.io/klog/v2 v2.9.0
22-
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
21+
k8s.io/utils v0.0.0-20210802155522-efc7438f0176
2322
sigs.k8s.io/cluster-api v0.0.0-20210526191338-0e1629b75111
24-
sigs.k8s.io/controller-runtime v0.9.3
23+
sigs.k8s.io/controller-runtime v0.9.7
2524
)
2625

27-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.0
26+
replace (
27+
//TODO(mkumatag): remove this when github.com/IBM-Cloud/power-go-client adopts the recent version of github.com/go-openapi/errors package
28+
github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.3
29+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.4
30+
)

go.sum

Lines changed: 128 additions & 56 deletions
Large diffs are not rendered by default.

pkg/client.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package pkg
22

33
import (
4-
//"gopkg.in/square/go-jose.v2/jwt"
54
gohttp "net/http"
65
"strings"
76

7+
"github.com/golang-jwt/jwt"
8+
89
"github.com/IBM-Cloud/bluemix-go/api/resource/resourcev2/controllerv2"
910
"github.com/IBM-Cloud/bluemix-go/authentication"
1011
"github.com/IBM-Cloud/bluemix-go/http"
1112
"github.com/IBM-Cloud/bluemix-go/rest"
1213
bxsession "github.com/IBM-Cloud/bluemix-go/session"
13-
"github.com/dgrijalva/jwt-go"
14+
1415
"k8s.io/klog/v2"
1516
)
1617

0 commit comments

Comments
 (0)