Skip to content

Commit 76c3728

Browse files
Upgrade OCI GO SDK to latest version (#40)
1 parent 1db3672 commit 76c3728

File tree

1,950 files changed

+78000
-41275
lines changed

Some content is hidden

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

1,950 files changed

+78000
-41275
lines changed

THIRD_PARTY_LICENSES.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ github.com/modern-go/reflect2
634634
(no copyright notices found)
635635

636636
-------- Dependency
637-
github.com/oracle/oci-go-sdk/v53
637+
github.com/oracle/oci-go-sdk/v63
638638
-------- Copyrights
639639
Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates. All rights reserved.
640640
Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -921,7 +921,7 @@ github.com/googleapis/gnostic
921921
github.com/matttproud/golang_protobuf_extensions
922922
github.com/modern-go/concurrent
923923
github.com/modern-go/reflect2
924-
github.com/oracle/oci-go-sdk/v53
924+
github.com/oracle/oci-go-sdk/v63
925925
github.com/prometheus/client_golang
926926
github.com/prometheus/client_model
927927
github.com/prometheus/common

cloud/config/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"os"
2121
"strconv"
2222

23-
"github.com/oracle/oci-go-sdk/v53/common"
24-
"github.com/oracle/oci-go-sdk/v53/common/auth"
23+
"github.com/oracle/oci-go-sdk/v63/common"
24+
"github.com/oracle/oci-go-sdk/v63/common/auth"
2525
"github.com/pkg/errors"
2626
"gopkg.in/yaml.v2"
2727
)

cloud/ociutil/ociutil.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"net/http"
2424
"time"
2525

26-
"github.com/oracle/oci-go-sdk/v53/common"
27-
"github.com/oracle/oci-go-sdk/v53/core"
28-
"github.com/oracle/oci-go-sdk/v53/networkloadbalancer"
26+
"github.com/oracle/oci-go-sdk/v63/common"
27+
"github.com/oracle/oci-go-sdk/v63/core"
28+
"github.com/oracle/oci-go-sdk/v63/networkloadbalancer"
2929
"github.com/pkg/errors"
3030
"k8s.io/apimachinery/pkg/util/wait"
3131
)

cloud/ociutil/ociutil_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"reflect"
2222
"testing"
2323

24-
"github.com/oracle/oci-go-sdk/v53/core"
24+
"github.com/oracle/oci-go-sdk/v63/core"
2525
)
2626

2727
func TestGetCloudProviderConfig(t *testing.T) {

cloud/scope/cluster.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
identityClent "github.com/oracle/cluster-api-provider-oci/cloud/services/identity"
2929
nlb "github.com/oracle/cluster-api-provider-oci/cloud/services/networkloadbalancer"
3030
"github.com/oracle/cluster-api-provider-oci/cloud/services/vcn"
31-
"github.com/oracle/oci-go-sdk/v53/common"
32-
"github.com/oracle/oci-go-sdk/v53/identity"
31+
"github.com/oracle/oci-go-sdk/v63/common"
32+
"github.com/oracle/oci-go-sdk/v63/identity"
3333
"github.com/pkg/errors"
3434
"k8s.io/klog/v2/klogr"
3535
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

cloud/scope/cluster_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/golang/mock/gomock"
2424
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2525
"github.com/oracle/cluster-api-provider-oci/cloud/services/identity/mock_identity"
26-
"github.com/oracle/oci-go-sdk/v53/common"
27-
"github.com/oracle/oci-go-sdk/v53/identity"
26+
"github.com/oracle/oci-go-sdk/v63/common"
27+
"github.com/oracle/oci-go-sdk/v63/identity"
2828
"github.com/pkg/errors"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"sigs.k8s.io/controller-runtime/pkg/log"

cloud/scope/defaults.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package scope
1818

19-
import "github.com/oracle/oci-go-sdk/v53/networkloadbalancer"
19+
import "github.com/oracle/oci-go-sdk/v63/networkloadbalancer"
2020

2121
const (
2222
VcnDefaultCidr = "10.0.0.0/16"

cloud/scope/internet_gateway_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"context"
2121

2222
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
23-
"github.com/oracle/oci-go-sdk/v53/common"
24-
"github.com/oracle/oci-go-sdk/v53/core"
23+
"github.com/oracle/oci-go-sdk/v63/common"
24+
"github.com/oracle/oci-go-sdk/v63/core"
2525
"github.com/pkg/errors"
2626
)
2727

cloud/scope/internet_gateway_reconciler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/golang/mock/gomock"
2424
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2525
"github.com/oracle/cluster-api-provider-oci/cloud/services/vcn/mock_vcn"
26-
"github.com/oracle/oci-go-sdk/v53/common"
27-
"github.com/oracle/oci-go-sdk/v53/core"
26+
"github.com/oracle/oci-go-sdk/v63/common"
27+
"github.com/oracle/oci-go-sdk/v63/core"
2828
"github.com/pkg/errors"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

cloud/scope/load_balancer_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2424
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
25-
"github.com/oracle/oci-go-sdk/v53/common"
26-
"github.com/oracle/oci-go-sdk/v53/networkloadbalancer"
25+
"github.com/oracle/oci-go-sdk/v63/common"
26+
"github.com/oracle/oci-go-sdk/v63/networkloadbalancer"
2727
"github.com/pkg/errors"
2828
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2929
)

cloud/scope/load_balancer_reconciler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2626
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
2727
"github.com/oracle/cluster-api-provider-oci/cloud/services/networkloadbalancer/mock_nlb"
28-
"github.com/oracle/oci-go-sdk/v53/common"
29-
"github.com/oracle/oci-go-sdk/v53/networkloadbalancer"
28+
"github.com/oracle/oci-go-sdk/v63/common"
29+
"github.com/oracle/oci-go-sdk/v63/networkloadbalancer"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3232
"sigs.k8s.io/controller-runtime/pkg/client"

cloud/scope/machine.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import (
3131
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
3232
"github.com/oracle/cluster-api-provider-oci/cloud/services/compute"
3333
nlb "github.com/oracle/cluster-api-provider-oci/cloud/services/networkloadbalancer"
34-
"github.com/oracle/oci-go-sdk/v53/common"
35-
"github.com/oracle/oci-go-sdk/v53/core"
36-
"github.com/oracle/oci-go-sdk/v53/networkloadbalancer"
34+
"github.com/oracle/oci-go-sdk/v63/common"
35+
"github.com/oracle/oci-go-sdk/v63/core"
36+
"github.com/oracle/oci-go-sdk/v63/networkloadbalancer"
3737
"github.com/pkg/errors"
3838
corev1 "k8s.io/api/core/v1"
3939
"k8s.io/apimachinery/pkg/types"

cloud/scope/machine_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"encoding/base64"
2222
"fmt"
2323
"github.com/oracle/cluster-api-provider-oci/cloud/services/networkloadbalancer/mock_nlb"
24-
"github.com/oracle/oci-go-sdk/v53/networkloadbalancer"
24+
"github.com/oracle/oci-go-sdk/v63/networkloadbalancer"
2525
"sigs.k8s.io/controller-runtime/pkg/client"
2626
"testing"
2727

@@ -30,8 +30,8 @@ import (
3030
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
3131
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
3232
"github.com/oracle/cluster-api-provider-oci/cloud/services/compute/mock_compute"
33-
"github.com/oracle/oci-go-sdk/v53/common"
34-
"github.com/oracle/oci-go-sdk/v53/core"
33+
"github.com/oracle/oci-go-sdk/v63/common"
34+
"github.com/oracle/oci-go-sdk/v63/core"
3535
"github.com/pkg/errors"
3636
corev1 "k8s.io/api/core/v1"
3737
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

cloud/scope/nat_gateway_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"context"
2121

2222
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
23-
"github.com/oracle/oci-go-sdk/v53/common"
24-
"github.com/oracle/oci-go-sdk/v53/core"
23+
"github.com/oracle/oci-go-sdk/v63/common"
24+
"github.com/oracle/oci-go-sdk/v63/core"
2525
"github.com/pkg/errors"
2626
)
2727

cloud/scope/nat_gateway_reconciler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/golang/mock/gomock"
2424
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2525
"github.com/oracle/cluster-api-provider-oci/cloud/services/vcn/mock_vcn"
26-
"github.com/oracle/oci-go-sdk/v53/common"
27-
"github.com/oracle/oci-go-sdk/v53/core"
26+
"github.com/oracle/oci-go-sdk/v63/common"
27+
"github.com/oracle/oci-go-sdk/v63/core"
2828
"github.com/pkg/errors"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

cloud/scope/nsg_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2424
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
25-
"github.com/oracle/oci-go-sdk/v53/common"
26-
"github.com/oracle/oci-go-sdk/v53/core"
25+
"github.com/oracle/oci-go-sdk/v63/common"
26+
"github.com/oracle/oci-go-sdk/v63/core"
2727
"github.com/pkg/errors"
2828
)
2929

cloud/scope/nsg_reconciler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/golang/mock/gomock"
2525
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2626
"github.com/oracle/cluster-api-provider-oci/cloud/services/vcn/mock_vcn"
27-
"github.com/oracle/oci-go-sdk/v53/common"
28-
"github.com/oracle/oci-go-sdk/v53/core"
27+
"github.com/oracle/oci-go-sdk/v63/common"
28+
"github.com/oracle/oci-go-sdk/v63/core"
2929
"github.com/pkg/errors"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

cloud/scope/route_table_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2525
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
26-
"github.com/oracle/oci-go-sdk/v53/common"
27-
"github.com/oracle/oci-go-sdk/v53/core"
26+
"github.com/oracle/oci-go-sdk/v63/common"
27+
"github.com/oracle/oci-go-sdk/v63/core"
2828
"github.com/pkg/errors"
2929
)
3030

cloud/scope/route_table_reconciler_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2525
"github.com/oracle/cluster-api-provider-oci/cloud/services/identity/mock_identity"
2626
"github.com/oracle/cluster-api-provider-oci/cloud/services/vcn/mock_vcn"
27-
"github.com/oracle/oci-go-sdk/v53/common"
28-
"github.com/oracle/oci-go-sdk/v53/core"
29-
"github.com/oracle/oci-go-sdk/v53/identity"
27+
"github.com/oracle/oci-go-sdk/v63/common"
28+
"github.com/oracle/oci-go-sdk/v63/core"
29+
"github.com/oracle/oci-go-sdk/v63/identity"
3030
"github.com/pkg/errors"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

cloud/scope/security_list_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
2424

2525
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
26-
"github.com/oracle/oci-go-sdk/v53/common"
27-
"github.com/oracle/oci-go-sdk/v53/core"
26+
"github.com/oracle/oci-go-sdk/v63/common"
27+
"github.com/oracle/oci-go-sdk/v63/core"
2828
"github.com/pkg/errors"
2929
)
3030

cloud/scope/security_list_reconciler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"github.com/golang/mock/gomock"
2424
"github.com/oracle/cluster-api-provider-oci/cloud/services/vcn/mock_vcn"
25-
"github.com/oracle/oci-go-sdk/v53/common"
26-
"github.com/oracle/oci-go-sdk/v53/core"
25+
"github.com/oracle/oci-go-sdk/v63/common"
26+
"github.com/oracle/oci-go-sdk/v63/core"
2727
"github.com/pkg/errors"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"sigs.k8s.io/controller-runtime/pkg/log"

cloud/scope/service_gateway_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"strings"
2222

2323
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
24-
"github.com/oracle/oci-go-sdk/v53/common"
25-
"github.com/oracle/oci-go-sdk/v53/core"
24+
"github.com/oracle/oci-go-sdk/v63/common"
25+
"github.com/oracle/oci-go-sdk/v63/core"
2626
"github.com/pkg/errors"
2727
)
2828

cloud/scope/service_gateway_reconciler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/golang/mock/gomock"
2424
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2525
"github.com/oracle/cluster-api-provider-oci/cloud/services/vcn/mock_vcn"
26-
"github.com/oracle/oci-go-sdk/v53/common"
27-
"github.com/oracle/oci-go-sdk/v53/core"
26+
"github.com/oracle/oci-go-sdk/v63/common"
27+
"github.com/oracle/oci-go-sdk/v63/core"
2828
"github.com/pkg/errors"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

cloud/scope/subnet_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121

2222
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2323
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
24-
"github.com/oracle/oci-go-sdk/v53/common"
25-
"github.com/oracle/oci-go-sdk/v53/core"
24+
"github.com/oracle/oci-go-sdk/v63/common"
25+
"github.com/oracle/oci-go-sdk/v63/core"
2626
"github.com/pkg/errors"
2727
)
2828

cloud/scope/subnet_reconciler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/golang/mock/gomock"
2525
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2626
"github.com/oracle/cluster-api-provider-oci/cloud/services/vcn/mock_vcn"
27-
"github.com/oracle/oci-go-sdk/v53/common"
28-
"github.com/oracle/oci-go-sdk/v53/core"
27+
"github.com/oracle/oci-go-sdk/v63/common"
28+
"github.com/oracle/oci-go-sdk/v63/core"
2929
"github.com/pkg/errors"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

cloud/scope/vcn_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
2424
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
25-
"github.com/oracle/oci-go-sdk/v53/common"
26-
"github.com/oracle/oci-go-sdk/v53/core"
25+
"github.com/oracle/oci-go-sdk/v63/common"
26+
"github.com/oracle/oci-go-sdk/v63/core"
2727
"github.com/pkg/errors"
2828
)
2929

cloud/scope/vcn_reconciler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"github.com/golang/mock/gomock"
2929
infrastructurev1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
3030
"github.com/oracle/cluster-api-provider-oci/cloud/services/vcn/mock_vcn"
31-
"github.com/oracle/oci-go-sdk/v53/common"
32-
"github.com/oracle/oci-go-sdk/v53/core"
31+
"github.com/oracle/oci-go-sdk/v63/common"
32+
"github.com/oracle/oci-go-sdk/v63/core"
3333
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3434
)
3535

cloud/services/compute/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package compute
1919
import (
2020
"context"
2121

22-
"github.com/oracle/oci-go-sdk/v53/core"
22+
"github.com/oracle/oci-go-sdk/v63/core"
2323
)
2424

2525
type ComputeClient interface {

cloud/services/compute/mock_compute/client_mock.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cloud/services/identity/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package identity
1818

1919
import (
2020
"context"
21-
"github.com/oracle/oci-go-sdk/v53/identity"
21+
"github.com/oracle/oci-go-sdk/v63/identity"
2222
)
2323

2424
type Client interface {

cloud/services/identity/mock_identity/client_mock.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cloud/services/networkloadbalancer/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package nlb
1818

1919
import (
2020
"context"
21-
"github.com/oracle/oci-go-sdk/v53/networkloadbalancer"
21+
"github.com/oracle/oci-go-sdk/v63/networkloadbalancer"
2222
)
2323

2424
type NetworkLoadBalancerClient interface {

cloud/services/networkloadbalancer/mock_nlb/client_mock.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cloud/services/vcn/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package vcn
1818

1919
import (
2020
"context"
21-
"github.com/oracle/oci-go-sdk/v53/core"
21+
"github.com/oracle/oci-go-sdk/v63/core"
2222
)
2323

2424
type Client interface {

cloud/services/vcn/mock_vcn/client_mock.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/default/manager_image_patch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ spec:
88
spec:
99
containers:
1010
# Change the value of image field below to your controller image URL
11-
- image: iad.ocir.io/oracle/cluster-api-oci-controller:main
11+
- image: iad.ocir.io/odx-mockcustomer/cluster-api-oci-controller-amd64:20220323041846
1212
name: manager

0 commit comments

Comments
 (0)