fix: some bugs found in testings

oceanbase · Oct 26, 2023 · 2959a64 · 2959a64
1 parent 1142588
commit 2959a64
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/charts/oceanbase-cluster/values.yaml b/charts/oceanbase-cluster/values.yaml
@@ -6,20 +6,20 @@ storageClass: local-path
 observerConfig:
   resource:
     cpu: 2
-    memory: 12Gi
+    memory: 10Gi
   storages:
     dataStorage: 50Gi
     redoLogStorage: 50Gi
     logStorage: 20Gi
 
 monitorEnabled: true
 monitorResource:
-  cpu: 1
+  cpu: 500m
   memory: 2Gi
 
 parameters:
   - name: system_memory
-    value: 3G
+    value: 2G
 
 nfsBackupEnabled: false # set true and config volume if you want to enable backup with NFS
 nfsBackup:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: oceanbase/ob-operator
-  newTag: 2.0.0
+  newName: oceanbasedev/ob-operator
+  newTag: 2.0.1
diff --git a/distribution/oceanbase/Dockerfile b/distribution/oceanbase/Dockerfile
@@ -1,5 +1,5 @@
 FROM golang:1.20.4 as builder
-ARG GOPROXY
+ARG GOPROXY=https://goproxy.io,direct
 WORKDIR /workspace
 COPY ./oceanbase-helper .
 RUN GO11MODULE=ON CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o oceanbase-helper main.go

diff --git a/distribution/oceanbase/build.sh b/distribution/oceanbase/build.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build -t $1 --build-arg GOPROXY=${GOPROXY} --build-arg VERSION=$2 .
+docker build -t $1:$2 --build-arg GOPROXY=${GOPROXY} --build-arg VERSION=$2 .
diff --git a/pkg/resource/obtenantrestore_task.go b/pkg/resource/obtenantrestore_task.go
@@ -187,12 +187,12 @@ func (m *ObTenantRestoreManager) StartRestoreJobInOB() error {
 		}
 	} else {
 		if restoreSpec.Until.Timestamp != nil {
-			err = con.StartRestoreWithLimit(m.Resource.Spec.TargetTenant, sourceUri, m.Resource.Spec.Option, "timestamp", *restoreSpec.Until.Timestamp)
+			err = con.StartRestoreWithLimit(m.Resource.Spec.TargetTenant, sourceUri, m.Resource.Spec.Option, "TIME", *restoreSpec.Until.Timestamp)
 			if err != nil {
 				return err
 			}
 		} else if restoreSpec.Until.Scn != nil {
-			err = con.StartRestoreWithLimit(m.Resource.Spec.TargetTenant, sourceUri, m.Resource.Spec.Option, "scn", *restoreSpec.Until.Scn)
+			err = con.StartRestoreWithLimit(m.Resource.Spec.TargetTenant, sourceUri, m.Resource.Spec.Option, "SCN", *restoreSpec.Until.Scn)
 			if err != nil {
 				return err
 			}