Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some tiny bugs #89

Merged
merged 1 commit into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/oceanbase-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion distribution/oceanbase/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion distribution/oceanbase/build.sh
Original file line number Diff line number Diff line change
@@ -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 .
4 changes: 2 additions & 2 deletions pkg/resource/obtenantrestore_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down