Skip to content

Commit fec481a

Browse files
author
Akshay Kumar
committed
Bumping oci-go-sdk to v65 for SKE node controller changes
1 parent af9f006 commit fec481a

File tree

3,468 files changed

+188663
-101909
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,468 files changed

+188663
-101909
lines changed

controllers/nativepodnetwork_controller.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
"github.com/oracle/oci-cloud-controller-manager/pkg/metrics"
4141
ociclient "github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
4242
"github.com/oracle/oci-cloud-controller-manager/pkg/util"
43-
"github.com/oracle/oci-go-sdk/v49/core"
43+
"github.com/oracle/oci-go-sdk/v65/core"
4444
)
4545

4646
const (
@@ -544,10 +544,6 @@ func filterPrivateIp(privateIps []core.PrivateIp) []core.PrivateIp {
544544
if *ip.IsPrimary {
545545
continue
546546
}
547-
// ignore IPs which are terminating or terminated
548-
if ip.LifecycleState == core.PrivateIpLifecycleStateTerminating || ip.LifecycleState == core.PrivateIpLifecycleStateTerminated {
549-
continue
550-
}
551547
secondaryIps = append(secondaryIps, ip)
552548
}
553549
return secondaryIps

controllers/nativepodnetwork_controller_test.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/oracle/oci-cloud-controller-manager/api/v1beta1"
2525
"github.com/oracle/oci-cloud-controller-manager/pkg/util"
26-
"github.com/oracle/oci-go-sdk/v49/core"
26+
"github.com/oracle/oci-go-sdk/v65/core"
2727
)
2828

2929
func TestComputeAveragesByReturnCode(t *testing.T) {
@@ -144,17 +144,6 @@ func TestFilterPrivateIp(t *testing.T) {
144144
{IsPrimary: &falseVal, IpAddress: &testAddress1},
145145
},
146146
},
147-
{
148-
name: "only termiated/termiatinging ips",
149-
ips: []core.PrivateIp{
150-
{IsPrimary: &falseVal, IpAddress: &testAddress1, LifecycleState: core.PrivateIpLifecycleStateTerminating},
151-
{IsPrimary: &falseVal, IpAddress: &testAddress1, LifecycleState: core.PrivateIpLifecycleStateTerminated},
152-
{IsPrimary: &falseVal, IpAddress: &testAddress1},
153-
},
154-
expected: []core.PrivateIp{
155-
{IsPrimary: &falseVal, IpAddress: &testAddress1},
156-
},
157-
},
158147
}
159148
for _, tc := range testCases {
160149
t.Run(tc.name, func(t *testing.T) {

go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
replace (
66
github.com/docker/docker => github.com/docker/engine v0.0.0-20181106193140-f5749085e9cb
7-
github.com/oracle/oci-go-sdk/v49 => bitbucket.oci.oraclecorp.com/sdk/oci-go-sdk/v49 v49.2.0-p
7+
github.com/oracle/oci-go-sdk/v65 => bitbucket.oci.oraclecorp.com/sdk/oci-go-sdk/v65 v65.18.1-p.0.20220831194506-202dd70b5937
88
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.11.0
99
google.golang.org/grpc => google.golang.org/grpc v1.38.0
1010
k8s.io/api => k8s.io/api v0.24.1
@@ -44,7 +44,7 @@ replace (
4444
)
4545

4646
require (
47-
bitbucket.oci.oraclecorp.com/oke/oke-common v1.0.1-0.20211021080439-0f28edfc51d4
47+
bitbucket.oci.oraclecorp.com/oke/oke-common v1.0.1-0.20220429183118-f0129d710185
4848
github.com/container-storage-interface/spec v1.6.0
4949
github.com/go-logr/zapr v1.2.0
5050
github.com/golang/protobuf v1.5.2
@@ -55,7 +55,7 @@ require (
5555
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.0.1
5656
github.com/onsi/ginkgo v1.16.5
5757
github.com/onsi/gomega v1.17.0
58-
github.com/oracle/oci-go-sdk/v49 v49.0.0-00010101000000-000000000000
58+
github.com/oracle/oci-go-sdk/v65 v65.2.0
5959
github.com/pkg/errors v0.9.1
6060
github.com/prometheus/client_golang v1.12.1
6161
github.com/spf13/cobra v1.4.0
@@ -109,6 +109,7 @@ require (
109109
github.com/go-openapi/jsonpointer v0.19.5 // indirect
110110
github.com/go-openapi/jsonreference v0.19.6 // indirect
111111
github.com/go-openapi/swag v0.21.1 // indirect
112+
github.com/gofrs/flock v0.8.1 // indirect
112113
github.com/gogo/protobuf v1.3.2 // indirect
113114
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
114115
github.com/google/gnostic v0.6.8 // indirect
@@ -143,7 +144,7 @@ require (
143144
github.com/prometheus/common v0.33.0 // indirect
144145
github.com/prometheus/procfs v0.7.3 // indirect
145146
github.com/sirupsen/logrus v1.8.1 // indirect
146-
github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b // indirect
147+
github.com/sony/gobreaker v0.5.0 // indirect
147148
github.com/spf13/afero v1.6.0 // indirect
148149
github.com/spf13/cast v1.3.1 // indirect
149150
github.com/spf13/jwalterweatherman v1.1.0 // indirect

go.sum

Lines changed: 8 additions & 1131 deletions
Large diffs are not rendered by default.

pkg/cloudprovider/providers/oci/ccm.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ import (
4444
"github.com/oracle/oci-cloud-controller-manager/pkg/metrics"
4545
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
4646
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/instance/metadata"
47-
"github.com/oracle/oci-go-sdk/v49/common"
48-
"github.com/oracle/oci-go-sdk/v49/core"
47+
"github.com/oracle/oci-go-sdk/v65/common"
48+
"github.com/oracle/oci-go-sdk/v65/core"
4949
)
5050

5151
const (

pkg/cloudprovider/providers/oci/config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"bitbucket.oci.oraclecorp.com/oke/oke-common/resourceprincipals"
2323

2424
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/instance/metadata"
25-
"github.com/oracle/oci-go-sdk/v49/common"
26-
"github.com/oracle/oci-go-sdk/v49/common/auth"
25+
"github.com/oracle/oci-go-sdk/v65/common"
26+
"github.com/oracle/oci-go-sdk/v65/common/auth"
2727
"github.com/pkg/errors"
2828
"github.com/spf13/viper"
2929
"go.uber.org/zap"

pkg/cloudprovider/providers/oci/instances.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"fmt"
2020
"net"
2121

22-
"github.com/oracle/oci-go-sdk/v49/core"
22+
"github.com/oracle/oci-go-sdk/v65/core"
2323
"k8s.io/apimachinery/pkg/labels"
2424

2525
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"

pkg/cloudprovider/providers/oci/instances_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525

2626
providercfg "github.com/oracle/oci-cloud-controller-manager/pkg/cloudprovider/providers/oci/config"
2727
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
28-
"github.com/oracle/oci-go-sdk/v49/common"
29-
"github.com/oracle/oci-go-sdk/v49/core"
30-
"github.com/oracle/oci-go-sdk/v49/filestorage"
31-
"github.com/oracle/oci-go-sdk/v49/identity"
28+
"github.com/oracle/oci-go-sdk/v65/common"
29+
"github.com/oracle/oci-go-sdk/v65/core"
30+
"github.com/oracle/oci-go-sdk/v65/filestorage"
31+
"github.com/oracle/oci-go-sdk/v65/identity"
3232
"go.uber.org/zap"
3333
v1 "k8s.io/api/core/v1"
3434
v1discovery "k8s.io/api/discovery/v1"

pkg/cloudprovider/providers/oci/load_balancer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"github.com/oracle/oci-cloud-controller-manager/pkg/metrics"
3333
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
3434
"github.com/oracle/oci-cloud-controller-manager/pkg/util"
35-
"github.com/oracle/oci-go-sdk/v49/core"
35+
"github.com/oracle/oci-go-sdk/v65/core"
3636
"github.com/pkg/errors"
3737
)
3838

pkg/cloudprovider/providers/oci/load_balancer_security_lists.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"sort"
2222

2323
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
24-
"github.com/oracle/oci-go-sdk/v49/common"
25-
"github.com/oracle/oci-go-sdk/v49/core"
24+
"github.com/oracle/oci-go-sdk/v65/common"
25+
"github.com/oracle/oci-go-sdk/v65/core"
2626
"github.com/pkg/errors"
2727
"go.uber.org/zap"
2828
api "k8s.io/api/core/v1"

pkg/cloudprovider/providers/oci/load_balancer_security_lists_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"reflect"
1919
"testing"
2020

21-
"github.com/oracle/oci-go-sdk/v49/common"
22-
"github.com/oracle/oci-go-sdk/v49/core"
21+
"github.com/oracle/oci-go-sdk/v65/common"
22+
"github.com/oracle/oci-go-sdk/v65/core"
2323
"go.uber.org/zap"
2424

2525
v1 "k8s.io/api/core/v1"

pkg/cloudprovider/providers/oci/load_balancer_spec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
"github.com/oracle/oci-cloud-controller-manager/pkg/cloudprovider/providers/oci/config"
3131
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
32-
"github.com/oracle/oci-go-sdk/v49/common"
32+
"github.com/oracle/oci-go-sdk/v65/common"
3333
"github.com/pkg/errors"
3434
)
3535

pkg/cloudprovider/providers/oci/load_balancer_spec_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
providercfg "github.com/oracle/oci-cloud-controller-manager/pkg/cloudprovider/providers/oci/config"
3131
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
32-
"github.com/oracle/oci-go-sdk/v49/common"
32+
"github.com/oracle/oci-go-sdk/v65/common"
3333
)
3434

3535
var (

pkg/cloudprovider/providers/oci/load_balancer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727

2828
providercfg "github.com/oracle/oci-cloud-controller-manager/pkg/cloudprovider/providers/oci/config"
2929
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
30-
"github.com/oracle/oci-go-sdk/v49/common"
31-
"github.com/oracle/oci-go-sdk/v49/core"
30+
"github.com/oracle/oci-go-sdk/v65/common"
31+
"github.com/oracle/oci-go-sdk/v65/core"
3232
)
3333

3434
func newNodeObj(name string, labels map[string]string) *v1.Node {

pkg/cloudprovider/providers/oci/load_balancer_util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/util/sets"
3131

3232
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
33-
"github.com/oracle/oci-go-sdk/v49/loadbalancer"
33+
"github.com/oracle/oci-go-sdk/v65/loadbalancer"
3434
)
3535

3636
const (

pkg/cloudprovider/providers/oci/load_balancer_util_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727

2828
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
29-
"github.com/oracle/oci-go-sdk/v49/common"
29+
"github.com/oracle/oci-go-sdk/v65/common"
3030
)
3131

3232
func TestSortAndCombineActions(t *testing.T) {

pkg/cloudprovider/providers/oci/node_info_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"k8s.io/klog"
3737

3838
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
39-
"github.com/oracle/oci-go-sdk/v49/core"
39+
"github.com/oracle/oci-go-sdk/v65/core"
4040
)
4141

4242
// metadata labeling for placement info

pkg/cloudprovider/providers/oci/node_info_controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"reflect"
55
"testing"
66

7-
"github.com/oracle/oci-go-sdk/v49/common"
7+
"github.com/oracle/oci-go-sdk/v65/common"
88

99
"go.uber.org/zap"
1010

11-
"github.com/oracle/oci-go-sdk/v49/core"
11+
"github.com/oracle/oci-go-sdk/v65/core"
1212
v1 "k8s.io/api/core/v1"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
)

pkg/cloudprovider/providers/oci/zones.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"context"
1919
"strings"
2020

21-
"github.com/oracle/oci-go-sdk/v49/core"
21+
"github.com/oracle/oci-go-sdk/v65/core"
2222
"github.com/pkg/errors"
2323

2424
"k8s.io/apimachinery/pkg/types"

pkg/csi/driver/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
2222
"github.com/oracle/oci-cloud-controller-manager/pkg/util"
2323
"github.com/oracle/oci-cloud-controller-manager/pkg/util/disk"
24-
"github.com/oracle/oci-go-sdk/v49/core"
24+
"github.com/oracle/oci-go-sdk/v65/core"
2525
)
2626

2727
const (

pkg/csi/driver/controller_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import (
1515
providercfg "github.com/oracle/oci-cloud-controller-manager/pkg/cloudprovider/providers/oci/config"
1616
csi_util "github.com/oracle/oci-cloud-controller-manager/pkg/csi-util"
1717
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
18-
"github.com/oracle/oci-go-sdk/v49/common"
19-
"github.com/oracle/oci-go-sdk/v49/core"
20-
"github.com/oracle/oci-go-sdk/v49/filestorage"
21-
"github.com/oracle/oci-go-sdk/v49/identity"
22-
"github.com/oracle/oci-go-sdk/v49/loadbalancer"
18+
"github.com/oracle/oci-go-sdk/v65/common"
19+
"github.com/oracle/oci-go-sdk/v65/core"
20+
"github.com/oracle/oci-go-sdk/v65/filestorage"
21+
"github.com/oracle/oci-go-sdk/v65/identity"
22+
"github.com/oracle/oci-go-sdk/v65/loadbalancer"
2323
)
2424

2525
const (

pkg/flexvolume/block/driver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
3737
"github.com/oracle/oci-cloud-controller-manager/pkg/util"
3838
"github.com/oracle/oci-cloud-controller-manager/pkg/util/disk"
39-
"github.com/oracle/oci-go-sdk/v49/core"
39+
"github.com/oracle/oci-go-sdk/v65/core"
4040
)
4141

4242
const (

pkg/metrics/pusher.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/pkg/errors"
1010
"go.uber.org/zap"
1111

12-
"github.com/oracle/oci-go-sdk/v49/common"
13-
"github.com/oracle/oci-go-sdk/v49/common/auth"
14-
"github.com/oracle/oci-go-sdk/v49/monitoring"
12+
"github.com/oracle/oci-go-sdk/v65/common"
13+
"github.com/oracle/oci-go-sdk/v65/common/auth"
14+
"github.com/oracle/oci-go-sdk/v65/monitoring"
1515

1616
providercfg "github.com/oracle/oci-cloud-controller-manager/pkg/cloudprovider/providers/oci/config"
1717
ociclient "github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"

pkg/oci/client/block_storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"context"
1919
"time"
2020

21-
"github.com/oracle/oci-go-sdk/v49/core"
21+
"github.com/oracle/oci-go-sdk/v65/core"
2222
"github.com/pkg/errors"
2323
"k8s.io/apimachinery/pkg/util/wait"
2424
)

pkg/oci/client/client.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import (
1919
"net/http"
2020
"time"
2121

22-
"github.com/oracle/oci-go-sdk/v49/common"
23-
"github.com/oracle/oci-go-sdk/v49/core"
24-
"github.com/oracle/oci-go-sdk/v49/filestorage"
25-
"github.com/oracle/oci-go-sdk/v49/identity"
26-
"github.com/oracle/oci-go-sdk/v49/loadbalancer"
27-
"github.com/oracle/oci-go-sdk/v49/networkloadbalancer"
22+
"github.com/oracle/oci-go-sdk/v65/common"
23+
"github.com/oracle/oci-go-sdk/v65/core"
24+
"github.com/oracle/oci-go-sdk/v65/filestorage"
25+
"github.com/oracle/oci-go-sdk/v65/identity"
26+
"github.com/oracle/oci-go-sdk/v65/loadbalancer"
27+
"github.com/oracle/oci-go-sdk/v65/networkloadbalancer"
2828
"github.com/pkg/errors"
2929
"go.uber.org/zap"
3030
"k8s.io/client-go/tools/cache"

pkg/oci/client/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"reflect"
2020
"testing"
2121

22-
"github.com/oracle/oci-go-sdk/v49/core"
23-
"github.com/oracle/oci-go-sdk/v49/loadbalancer"
22+
"github.com/oracle/oci-go-sdk/v65/core"
23+
"github.com/oracle/oci-go-sdk/v65/loadbalancer"
2424
"k8s.io/client-go/util/flowcontrol"
2525
)
2626

pkg/oci/client/compute.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"context"
1919
"strings"
2020

21-
"github.com/oracle/oci-go-sdk/v49/core"
21+
"github.com/oracle/oci-go-sdk/v65/core"
2222
"github.com/pkg/errors"
2323
)
2424

pkg/oci/client/errors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"net/http"
2020
"time"
2121

22-
"github.com/oracle/oci-go-sdk/v49/common"
22+
"github.com/oracle/oci-go-sdk/v65/common"
2323
"github.com/pkg/errors"
2424
)
2525

pkg/oci/client/errors_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"net/http"
55
"testing"
66

7-
"github.com/oracle/oci-go-sdk/v49/common"
7+
"github.com/oracle/oci-go-sdk/v65/common"
88
)
99

1010
type mockServiceError struct {

pkg/oci/client/file_storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"fmt"
2020
"time"
2121

22-
fss "github.com/oracle/oci-go-sdk/v49/filestorage"
22+
fss "github.com/oracle/oci-go-sdk/v65/filestorage"
2323
"github.com/pkg/errors"
2424
"go.uber.org/zap"
2525
"k8s.io/apimachinery/pkg/util/wait"

pkg/oci/client/identity.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"fmt"
2020
"strings"
2121

22-
"github.com/oracle/oci-go-sdk/v49/identity"
22+
"github.com/oracle/oci-go-sdk/v65/identity"
2323
"github.com/pkg/errors"
2424
)
2525

pkg/oci/client/load_balancer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020

2121
"k8s.io/apimachinery/pkg/util/wait"
2222

23-
"github.com/oracle/oci-go-sdk/v49/common"
24-
"github.com/oracle/oci-go-sdk/v49/loadbalancer"
23+
"github.com/oracle/oci-go-sdk/v65/common"
24+
"github.com/oracle/oci-go-sdk/v65/loadbalancer"
2525
"github.com/pkg/errors"
2626
)
2727

pkg/oci/client/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package client
1717
import (
1818
"strconv"
1919

20-
"github.com/oracle/oci-go-sdk/v49/common"
20+
"github.com/oracle/oci-go-sdk/v65/common"
2121
"github.com/prometheus/client_golang/prometheus"
2222
)
2323

0 commit comments

Comments
 (0)