Merge branch 'tinglwan-update-libs' into 'master'

ting-lan-wang · ting-lan-wang · commit acd471efca9d · 2023-01-20T00:19:14.000Z
Tinglwan update libs

See merge request rac-docker-dev/oracle-database-operator!238
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,9 +1,10 @@
-build-operator:
+build-operator: 
   stage: build
   variables:
     IMAGE: "$DOCKER_REPO:$CI_COMMIT_BRANCH"
     OP_YAML: oracle-database-operator.yaml
   script:
+    - go version
     - echo $CI_COMMIT_TAG
     - make docker-build IMG="$IMAGE"
     - docker push "$IMAGE"
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 #
 
 # Build the manager binary
-FROM golang:1.17 as builder
+FROM golang:1.19 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
diff --git a/apis/database/v1alpha1/adbfamily_common_utils.go b/apis/database/v1alpha1/adbfamily_common_utils.go
@@ -46,9 +46,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/database"
-	"github.com/oracle/oci-go-sdk/v64/workrequests"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/database"
+	"github.com/oracle/oci-go-sdk/v65/workrequests"
 )
 
 // LastSuccessfulSpec is an annotation key which maps to the value of last successful spec
diff --git a/apis/database/v1alpha1/autonomouscontainerdatabase_types.go b/apis/database/v1alpha1/autonomouscontainerdatabase_types.go
@@ -42,7 +42,7 @@ import (
 	"encoding/json"
 	"reflect"
 
-	"github.com/oracle/oci-go-sdk/v64/database"
+	"github.com/oracle/oci-go-sdk/v65/database"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/apis/database/v1alpha1/autonomouscontainerdatabase_webhook_test.go b/apis/database/v1alpha1/autonomouscontainerdatabase_webhook_test.go
@@ -42,8 +42,8 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/database"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/database"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	// +kubebuilder:scaffold:imports
diff --git a/apis/database/v1alpha1/autonomousdatabase_types.go b/apis/database/v1alpha1/autonomousdatabase_types.go
@@ -42,7 +42,7 @@ import (
 	"encoding/json"
 	"reflect"
 
-	"github.com/oracle/oci-go-sdk/v64/database"
+	"github.com/oracle/oci-go-sdk/v65/database"
 	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/apis/database/v1alpha1/autonomousdatabase_webhook.go b/apis/database/v1alpha1/autonomousdatabase_webhook.go
@@ -41,8 +41,8 @@ package v1alpha1
 import (
 	"fmt"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/database"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/database"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/apis/database/v1alpha1/autonomousdatabase_webhook_test.go b/apis/database/v1alpha1/autonomousdatabase_webhook_test.go
@@ -42,8 +42,8 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/database"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/database"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	// +kubebuilder:scaffold:imports
diff --git a/apis/database/v1alpha1/autonomousdatabasebackup_types.go b/apis/database/v1alpha1/autonomousdatabasebackup_types.go
@@ -41,8 +41,8 @@ package v1alpha1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/database"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/database"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
diff --git a/apis/database/v1alpha1/autonomousdatabasebackup_webhook_test.go b/apis/database/v1alpha1/autonomousdatabasebackup_webhook_test.go
@@ -41,7 +41,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
+	"github.com/oracle/oci-go-sdk/v65/common"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	// +kubebuilder:scaffold:imports
diff --git a/apis/database/v1alpha1/autonomousdatabaserestore_types.go b/apis/database/v1alpha1/autonomousdatabaserestore_types.go
@@ -43,9 +43,9 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/database"
-	"github.com/oracle/oci-go-sdk/v64/workrequests"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/database"
+	"github.com/oracle/oci-go-sdk/v65/workrequests"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
diff --git a/apis/database/v1alpha1/autonomousdatabaserestore_webhook_test.go b/apis/database/v1alpha1/autonomousdatabaserestore_webhook_test.go
@@ -38,7 +38,7 @@
 package v1alpha1
 
 import (
-	"github.com/oracle/oci-go-sdk/v64/common"
+	"github.com/oracle/oci-go-sdk/v65/common"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	// +kubebuilder:scaffold:imports
 )
diff --git a/commons/dbcssystem/dbcs_reconciler.go b/commons/dbcssystem/dbcs_reconciler.go
@@ -46,10 +46,10 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/core"
-	"github.com/oracle/oci-go-sdk/v64/database"
-	"github.com/oracle/oci-go-sdk/v64/workrequests"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/core"
+	"github.com/oracle/oci-go-sdk/v65/database"
+	"github.com/oracle/oci-go-sdk/v65/workrequests"
 
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/retry"
diff --git a/commons/dbcssystem/dcommon.go b/commons/dbcssystem/dcommon.go
@@ -44,9 +44,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/database"
-	"github.com/oracle/oci-go-sdk/v64/workrequests"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/database"
+	"github.com/oracle/oci-go-sdk/v65/workrequests"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	databasev1alpha1 "github.com/oracle/oracle-database-operator/apis/database/v1alpha1"
diff --git a/commons/k8s/create.go b/commons/k8s/create.go
@@ -43,8 +43,8 @@ import (
 
 	dbv1alpha1 "github.com/oracle/oracle-database-operator/apis/database/v1alpha1"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/database"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/database"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/commons/oci/containerdatabase.go b/commons/oci/containerdatabase.go
@@ -41,8 +41,8 @@ package oci
 import (
 	"context"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/database"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/database"
 
 	dbv1alpha1 "github.com/oracle/oracle-database-operator/apis/database/v1alpha1"
 )
diff --git a/commons/oci/database.go b/commons/oci/database.go
@@ -43,8 +43,8 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/database"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/database"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	dbv1alpha1 "github.com/oracle/oracle-database-operator/apis/database/v1alpha1"
diff --git a/commons/oci/provider.go b/commons/oci/provider.go
@@ -41,8 +41,8 @@ package oci
 import (
 	"errors"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/common/auth"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/common/auth"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
diff --git a/commons/oci/vault.go b/commons/oci/vault.go
@@ -43,8 +43,8 @@ import (
 	"encoding/base64"
 
 	"github.com/go-logr/logr"
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/secrets"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/secrets"
 )
 
 type VaultService interface {
diff --git a/commons/oci/workrequest.go b/commons/oci/workrequest.go
@@ -44,8 +44,8 @@ import (
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/workrequests"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/workrequests"
 )
 
 type WorkRequestService interface {
diff --git a/commons/sharding/scommon.go b/commons/sharding/scommon.go
@@ -49,8 +49,8 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/ons"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/ons"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
diff --git a/controllers/database/autonomouscontainerdatabase_controller.go b/controllers/database/autonomouscontainerdatabase_controller.go
@@ -45,7 +45,7 @@ import (
 	"reflect"
 
 	"github.com/go-logr/logr"
-	"github.com/oracle/oci-go-sdk/v64/database"
+	"github.com/oracle/oci-go-sdk/v65/database"
 
 	corev1 "k8s.io/api/core/v1"
 	apiErrors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/controllers/database/autonomousdatabase_controller.go b/controllers/database/autonomousdatabase_controller.go
@@ -49,8 +49,8 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/database"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/database"
 
 	corev1 "k8s.io/api/core/v1"
 	apiErrors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/controllers/database/autonomousdatabaserestore_controller.go b/controllers/database/autonomousdatabaserestore_controller.go
@@ -53,7 +53,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
-	"github.com/oracle/oci-go-sdk/v64/common"
+	"github.com/oracle/oci-go-sdk/v65/common"
 	dbv1alpha1 "github.com/oracle/oracle-database-operator/apis/database/v1alpha1"
 	"github.com/oracle/oracle-database-operator/commons/adb_family"
 	"github.com/oracle/oracle-database-operator/commons/k8s"
diff --git a/controllers/database/dbcssystem_controller.go b/controllers/database/dbcssystem_controller.go
@@ -48,9 +48,9 @@ import (
 	"github.com/oracle/oracle-database-operator/commons/oci"
 
 	"github.com/go-logr/logr"
-	"github.com/oracle/oci-go-sdk/v64/core"
-	"github.com/oracle/oci-go-sdk/v64/database"
-	"github.com/oracle/oci-go-sdk/v64/workrequests"
+	"github.com/oracle/oci-go-sdk/v65/core"
+	"github.com/oracle/oci-go-sdk/v65/database"
+	"github.com/oracle/oci-go-sdk/v65/workrequests"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
diff --git a/controllers/database/shardingdatabase_controller.go b/controllers/database/shardingdatabase_controller.go
@@ -47,8 +47,8 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/oracle/oci-go-sdk/v64/common"
-	"github.com/oracle/oci-go-sdk/v64/ons"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/ons"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/test/e2e/autonomouscontainerdatabase_test.go b/test/e2e/autonomouscontainerdatabase_test.go
diff --git a/test/e2e/autonomousdatabase_controller_bind_test.go b/test/e2e/autonomousdatabase_controller_bind_test.go
diff --git a/test/e2e/autonomousdatabase_controller_create_test.go b/test/e2e/autonomousdatabase_controller_create_test.go
diff --git a/test/e2e/behavior/shared_behaviors.go b/test/e2e/behavior/shared_behaviors.go
diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
diff --git a/test/e2e/util/oci_acd_request.go b/test/e2e/util/oci_acd_request.go
diff --git a/test/e2e/util/oci_config_util.go b/test/e2e/util/oci_config_util.go
diff --git a/test/e2e/util/oci_db_request.go b/test/e2e/util/oci_db_request.go
diff --git a/test/e2e/util/oci_work_request.go b/test/e2e/util/oci_work_request.go

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`# Build the manager binary`
`6`		`-FROM golang:1.17 as builder`
	`6`	`+FROM golang:1.19 as builder`
`7`	`7`
`8`	`8`	`WORKDIR /workspace`
`9`	`9`	`# Copy the Go Modules manifests`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ import (`
`42`	`42`	`"encoding/json"`
`43`	`43`	`"reflect"`
`44`	`44`
`45`		`- "github.com/oracle/oci-go-sdk/v64/database"`
	`45`	`+ "github.com/oracle/oci-go-sdk/v65/database"`
`46`	`46`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`47`	`47`	`)`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ package v1alpha1`
`41`	`41`	`import (`
`42`	`42`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`43`	`43`
`44`		`- "github.com/oracle/oci-go-sdk/v64/common"`
`45`		`- "github.com/oracle/oci-go-sdk/v64/database"`
	`44`	`+ "github.com/oracle/oci-go-sdk/v65/common"`
	`45`	`+ "github.com/oracle/oci-go-sdk/v65/database"`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!`