diff --git a/Makefile b/Makefile index c4916278d..4ec5393e9 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ endif include make/* -VERSION ?= 2.3.2 +VERSION ?= 2.3.3 # Image URL to use all building/pushing image targets IMG ?= quay.io/oceanbase/ob-operator:${VERSION} # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. diff --git a/charts/ob-operator/Chart.yaml b/charts/ob-operator/Chart.yaml index dc7d4c1d6..e9b8816c6 100644 --- a/charts/ob-operator/Chart.yaml +++ b/charts/ob-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: 2.3.2 +appVersion: 2.3.3 description: A Helm chart for OB-Operator name: ob-operator type: application -version: 2.3.2 +version: 2.3.3 diff --git a/charts/ob-operator/templates/operator.yaml b/charts/ob-operator/templates/operator.yaml index f29326d28..406b7684c 100644 --- a/charts/ob-operator/templates/operator.yaml +++ b/charts/ob-operator/templates/operator.yaml @@ -21851,7 +21851,7 @@ spec: env: - name: TELEMETRY_REPORTER value: {{ .Values.reporter }} - image: quay.io/oceanbase/ob-operator:2.3.2 + image: quay.io/oceanbase/ob-operator:2.3.3 livenessProbe: httpGet: path: /healthz diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 993968b6b..fff35bccb 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/oceanbase/ob-operator - newTag: 2.3.2 + newTag: 2.3.3 diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 387414a9d..09b6c1727 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -21864,7 +21864,7 @@ spec: env: - name: TELEMETRY_REPORTER value: ob-operator - image: quay.io/oceanbase/ob-operator:2.3.2 + image: quay.io/oceanbase/ob-operator:2.3.3 livenessProbe: httpGet: path: /healthz diff --git a/docsite/i18n/zh-Hans/docusaurus-plugin-content-pages/changelog.md b/docsite/i18n/zh-Hans/docusaurus-plugin-content-pages/changelog.md index 8a1414cfd..4340d9c23 100644 --- a/docsite/i18n/zh-Hans/docusaurus-plugin-content-pages/changelog.md +++ b/docsite/i18n/zh-Hans/docusaurus-plugin-content-pages/changelog.md @@ -1,5 +1,11 @@ # 变更日志 +## 2.3.3 (发布于 2025.09.08) + +### 新增特性 +1. 支持 S3_COMPATIBLE 类型备份存储配置 addressingModel +2. 支持创建租户时设置变量,用于设置一些无法在创建后修改的变量 + ## 2.3.2 (发布于 2025.06.12) ### 新增特性 diff --git a/docsite/src/pages/changelog.md b/docsite/src/pages/changelog.md index 14a559206..a84e5cb67 100644 --- a/docsite/src/pages/changelog.md +++ b/docsite/src/pages/changelog.md @@ -1,5 +1,10 @@ # Changelog +## 2.3.2 (Release on 2025.06.12) +### New Feature +1. Support setting addressingModel for S3_COMPATIBLE storage. +2. Support setting variables while creating tenant, for setting variables which are not able to be modifed after tenant creation. + ## 2.3.2 (Release on 2025.06.12) ### New Feature 1. Support to keep static IP address when using kube-ovn as network plugin diff --git a/internal/resource/obcluster/obcluster_taskname_gen.go b/internal/resource/obcluster/obcluster_taskname_gen.go index 1e97b21a1..19801ecf2 100644 --- a/internal/resource/obcluster/obcluster_taskname_gen.go +++ b/internal/resource/obcluster/obcluster_taskname_gen.go @@ -4,36 +4,36 @@ package obcluster import ttypes "github.com/oceanbase/ob-operator/pkg/task/types" const ( - tWaitOBZoneTopologyMatch ttypes.TaskName = "wait obzone topology match" - tWaitOBZoneDeleted ttypes.TaskName = "wait obzone deleted" - tModifyOBZoneReplica ttypes.TaskName = "modify obzone replica" - tDeleteOBZone ttypes.TaskName = "delete obzone" - tCreateOBZone ttypes.TaskName = "create obzone" - tBootstrap ttypes.TaskName = "bootstrap" - tCreateUsers ttypes.TaskName = "create users" - tMaintainOBParameter ttypes.TaskName = "maintain obparameter" - tValidateUpgradeInfo ttypes.TaskName = "validate upgrade info" - tUpgradeCheck ttypes.TaskName = "upgrade check" - tBackupEssentialParameters ttypes.TaskName = "backup essential parameters" - tBeginUpgrade ttypes.TaskName = "begin upgrade" - tRollingUpgradeByZone ttypes.TaskName = "rolling upgrade by zone" - tFinishUpgrade ttypes.TaskName = "finish upgrade" - tModifySysTenantReplica ttypes.TaskName = "modify sys tenant replica" + tWaitOBZoneTopologyMatch ttypes.TaskName = "wait obzone topology match" + tWaitOBZoneDeleted ttypes.TaskName = "wait obzone deleted" + tModifyOBZoneReplica ttypes.TaskName = "modify obzone replica" + tDeleteOBZone ttypes.TaskName = "delete obzone" + tCreateOBZone ttypes.TaskName = "create obzone" + tBootstrap ttypes.TaskName = "bootstrap" + tCreateUsers ttypes.TaskName = "create users" + tMaintainOBParameter ttypes.TaskName = "maintain obparameter" + tValidateUpgradeInfo ttypes.TaskName = "validate upgrade info" + tUpgradeCheck ttypes.TaskName = "upgrade check" + tBackupEssentialParameters ttypes.TaskName = "backup essential parameters" + tBeginUpgrade ttypes.TaskName = "begin upgrade" + tRollingUpgradeByZone ttypes.TaskName = "rolling upgrade by zone" + tFinishUpgrade ttypes.TaskName = "finish upgrade" + tModifySysTenantReplica ttypes.TaskName = "modify sys tenant replica" tRestoreEssentialParameters ttypes.TaskName = "restore essential parameters" - tCheckAndCreateUserSecrets ttypes.TaskName = "check and create user secrets" - tCreateOBClusterService ttypes.TaskName = "create obcluster service" - tCheckImageReady ttypes.TaskName = "check image ready" - tCheckClusterMode ttypes.TaskName = "check cluster mode" - tCheckMigration ttypes.TaskName = "check migration" - tScaleOBZonesVertically ttypes.TaskName = "scale obzones vertically" - tExpandPVC ttypes.TaskName = "expand pvc" - tModifyServerTemplate ttypes.TaskName = "modify server template" - tWaitOBZoneBootstrapReady ttypes.TaskName = "wait obzone bootstrap ready" - tWaitOBZoneRunning ttypes.TaskName = "wait obzone running" - tRollingUpdateOBZones ttypes.TaskName = "rolling update obzones" - tCheckEnvironment ttypes.TaskName = "check environment" - tAnnotateOBCluster ttypes.TaskName = "annotate obcluster" - tOptimizeClusterByScenario ttypes.TaskName = "optimize cluster by scenario" - tAdjustParameters ttypes.TaskName = "adjust parameters" - tCheckAndCreateNs ttypes.TaskName = "check and create ns" + tCheckAndCreateUserSecrets ttypes.TaskName = "check and create user secrets" + tCreateOBClusterService ttypes.TaskName = "create obcluster service" + tCheckImageReady ttypes.TaskName = "check image ready" + tCheckClusterMode ttypes.TaskName = "check cluster mode" + tCheckMigration ttypes.TaskName = "check migration" + tScaleOBZonesVertically ttypes.TaskName = "scale obzones vertically" + tExpandPVC ttypes.TaskName = "expand pvc" + tModifyServerTemplate ttypes.TaskName = "modify server template" + tWaitOBZoneBootstrapReady ttypes.TaskName = "wait obzone bootstrap ready" + tWaitOBZoneRunning ttypes.TaskName = "wait obzone running" + tRollingUpdateOBZones ttypes.TaskName = "rolling update obzones" + tCheckEnvironment ttypes.TaskName = "check environment" + tAnnotateOBCluster ttypes.TaskName = "annotate obcluster" + tOptimizeClusterByScenario ttypes.TaskName = "optimize cluster by scenario" + tAdjustParameters ttypes.TaskName = "adjust parameters" + tCheckAndCreateNs ttypes.TaskName = "check and create ns" ) diff --git a/internal/resource/obclusteroperation/obclusteroperation_taskname_gen.go b/internal/resource/obclusteroperation/obclusteroperation_taskname_gen.go index 7e4b4726e..fc1b83fad 100644 --- a/internal/resource/obclusteroperation/obclusteroperation_taskname_gen.go +++ b/internal/resource/obclusteroperation/obclusteroperation_taskname_gen.go @@ -4,8 +4,8 @@ package obclusteroperation import ttypes "github.com/oceanbase/ob-operator/pkg/task/types" const ( - tModifyClusterSpec ttypes.TaskName = "modify cluster spec" - tWaitForClusterReturnRunning ttypes.TaskName = "wait for cluster return running" + tModifyClusterSpec ttypes.TaskName = "modify cluster spec" + tWaitForClusterReturnRunning ttypes.TaskName = "wait for cluster return running" tAnnotateOBServersForDeletion ttypes.TaskName = "annotate observers for deletion" - tRestartOBServers ttypes.TaskName = "restart observers" + tRestartOBServers ttypes.TaskName = "restart observers" ) diff --git a/internal/resource/observer/observer_taskname_gen.go b/internal/resource/observer/observer_taskname_gen.go index 242505bc0..538a485ba 100644 --- a/internal/resource/observer/observer_taskname_gen.go +++ b/internal/resource/observer/observer_taskname_gen.go @@ -4,22 +4,22 @@ package observer import ttypes "github.com/oceanbase/ob-operator/pkg/task/types" const ( - tWaitOBServerReady ttypes.TaskName = "wait observer ready" - tAddServer ttypes.TaskName = "add server" - tWaitOBClusterBootstrapped ttypes.TaskName = "wait obcluster bootstrapped" - tCreateOBServerPod ttypes.TaskName = "create observer pod" - tCreateOBServerPVC ttypes.TaskName = "create observer pvc" - tDeleteOBServerInCluster ttypes.TaskName = "delete observer in cluster" - tAnnotateOBServerPod ttypes.TaskName = "annotate observer pod" - tUpgradeOBServerImage ttypes.TaskName = "upgrade observer image" - tWaitOBServerPodReady ttypes.TaskName = "wait observer pod ready" - tWaitOBServerActiveInCluster ttypes.TaskName = "wait observer active in cluster" + tWaitOBServerReady ttypes.TaskName = "wait observer ready" + tAddServer ttypes.TaskName = "add server" + tWaitOBClusterBootstrapped ttypes.TaskName = "wait obcluster bootstrapped" + tCreateOBServerPod ttypes.TaskName = "create observer pod" + tCreateOBServerPVC ttypes.TaskName = "create observer pvc" + tDeleteOBServerInCluster ttypes.TaskName = "delete observer in cluster" + tAnnotateOBServerPod ttypes.TaskName = "annotate observer pod" + tUpgradeOBServerImage ttypes.TaskName = "upgrade observer image" + tWaitOBServerPodReady ttypes.TaskName = "wait observer pod ready" + tWaitOBServerActiveInCluster ttypes.TaskName = "wait observer active in cluster" tWaitOBServerDeletedInCluster ttypes.TaskName = "wait observer deleted in cluster" - tDeletePod ttypes.TaskName = "delete pod" - tWaitForPodDeleted ttypes.TaskName = "wait for pod deleted" - tExpandPVC ttypes.TaskName = "expand pvc" - tWaitForPvcResized ttypes.TaskName = "wait for pvc resized" - tCreateOBServerSvc ttypes.TaskName = "create observer svc" - tCheckAndCreateNs ttypes.TaskName = "check and create ns" - tCleanOwnedResources ttypes.TaskName = "clean owned resources" + tDeletePod ttypes.TaskName = "delete pod" + tWaitForPodDeleted ttypes.TaskName = "wait for pod deleted" + tExpandPVC ttypes.TaskName = "expand pvc" + tWaitForPvcResized ttypes.TaskName = "wait for pvc resized" + tCreateOBServerSvc ttypes.TaskName = "create observer svc" + tCheckAndCreateNs ttypes.TaskName = "check and create ns" + tCleanOwnedResources ttypes.TaskName = "clean owned resources" ) diff --git a/internal/resource/obtenant/obtenant_taskname_gen.go b/internal/resource/obtenant/obtenant_taskname_gen.go index c77ca015c..0b210912b 100644 --- a/internal/resource/obtenant/obtenant_taskname_gen.go +++ b/internal/resource/obtenant/obtenant_taskname_gen.go @@ -4,27 +4,27 @@ package obtenant import ttypes "github.com/oceanbase/ob-operator/pkg/task/types" const ( - tCheckTenant ttypes.TaskName = "check tenant" - tCheckPoolAndConfig ttypes.TaskName = "check pool and config" - tCreateTenantWithClear ttypes.TaskName = "create tenant with clear" - tCreateResourcePoolAndConfig ttypes.TaskName = "create resource pool and config" - tAddPool ttypes.TaskName = "add pool" - tDeletePool ttypes.TaskName = "delete pool" - tMaintainUnitConfig ttypes.TaskName = "maintain unit config" - tDeleteTenant ttypes.TaskName = "delete tenant" - tCheckAndApplyCharset ttypes.TaskName = "check and apply charset" - tCreateEmptyStandbyTenant ttypes.TaskName = "create empty standby tenant" - tCheckPrimaryTenantLsIntegrity ttypes.TaskName = "check primary tenant ls integrity" - tCreateTenantRestoreJobCR ttypes.TaskName = "create tenant restore job cr" - tWatchRestoreJobToFinish ttypes.TaskName = "watch restore job to finish" - tCancelTenantRestoreJob ttypes.TaskName = "cancel tenant restore job" - tUpgradeTenantIfNeeded ttypes.TaskName = "upgrade tenant if needed" - tCheckAndApplyUnitNum ttypes.TaskName = "check and apply unit num" - tCheckAndApplyWhiteList ttypes.TaskName = "check and apply white list" - tCheckAndApplyPrimaryZone ttypes.TaskName = "check and apply primary zone" - tCheckAndApplyLocality ttypes.TaskName = "check and apply locality" - tOptimizeTenantByScenario ttypes.TaskName = "optimize tenant by scenario" + tCheckTenant ttypes.TaskName = "check tenant" + tCheckPoolAndConfig ttypes.TaskName = "check pool and config" + tCreateTenantWithClear ttypes.TaskName = "create tenant with clear" + tCreateResourcePoolAndConfig ttypes.TaskName = "create resource pool and config" + tAddPool ttypes.TaskName = "add pool" + tDeletePool ttypes.TaskName = "delete pool" + tMaintainUnitConfig ttypes.TaskName = "maintain unit config" + tDeleteTenant ttypes.TaskName = "delete tenant" + tCheckAndApplyCharset ttypes.TaskName = "check and apply charset" + tCreateEmptyStandbyTenant ttypes.TaskName = "create empty standby tenant" + tCheckPrimaryTenantLsIntegrity ttypes.TaskName = "check primary tenant ls integrity" + tCreateTenantRestoreJobCR ttypes.TaskName = "create tenant restore job cr" + tWatchRestoreJobToFinish ttypes.TaskName = "watch restore job to finish" + tCancelTenantRestoreJob ttypes.TaskName = "cancel tenant restore job" + tUpgradeTenantIfNeeded ttypes.TaskName = "upgrade tenant if needed" + tCheckAndApplyUnitNum ttypes.TaskName = "check and apply unit num" + tCheckAndApplyWhiteList ttypes.TaskName = "check and apply white list" + tCheckAndApplyPrimaryZone ttypes.TaskName = "check and apply primary zone" + tCheckAndApplyLocality ttypes.TaskName = "check and apply locality" + tOptimizeTenantByScenario ttypes.TaskName = "optimize tenant by scenario" tCreateUserWithCredentialSecrets ttypes.TaskName = "create user with credential secrets" - tMaintainTenantParameters ttypes.TaskName = "maintain tenant parameters" - tMaintainTenantVariables ttypes.TaskName = "maintain tenant variables" + tMaintainTenantParameters ttypes.TaskName = "maintain tenant parameters" + tMaintainTenantVariables ttypes.TaskName = "maintain tenant variables" ) diff --git a/internal/resource/obtenantbackuppolicy/obtenantbackuppolicy_taskname_gen.go b/internal/resource/obtenantbackuppolicy/obtenantbackuppolicy_taskname_gen.go index 90aa7c9c7..85474aa21 100644 --- a/internal/resource/obtenantbackuppolicy/obtenantbackuppolicy_taskname_gen.go +++ b/internal/resource/obtenantbackuppolicy/obtenantbackuppolicy_taskname_gen.go @@ -5,10 +5,10 @@ import ttypes "github.com/oceanbase/ob-operator/pkg/task/types" const ( tConfigureServerForBackup ttypes.TaskName = "configure server for backup" - tStartBackup ttypes.TaskName = "start backup" - tStopBackup ttypes.TaskName = "stop backup" - tCheckAndSpawnJobs ttypes.TaskName = "check and spawn jobs" - tCleanOldBackupJobs ttypes.TaskName = "clean old backup jobs" - tPauseBackup ttypes.TaskName = "pause backup" - tResumeBackup ttypes.TaskName = "resume backup" + tStartBackup ttypes.TaskName = "start backup" + tStopBackup ttypes.TaskName = "stop backup" + tCheckAndSpawnJobs ttypes.TaskName = "check and spawn jobs" + tCleanOldBackupJobs ttypes.TaskName = "clean old backup jobs" + tPauseBackup ttypes.TaskName = "pause backup" + tResumeBackup ttypes.TaskName = "resume backup" ) diff --git a/internal/resource/obtenantoperation/obtenantoperation_taskname_gen.go b/internal/resource/obtenantoperation/obtenantoperation_taskname_gen.go index f3bd0613d..2a27cecc6 100644 --- a/internal/resource/obtenantoperation/obtenantoperation_taskname_gen.go +++ b/internal/resource/obtenantoperation/obtenantoperation_taskname_gen.go @@ -4,13 +4,13 @@ package obtenantoperation import ttypes "github.com/oceanbase/ob-operator/pkg/task/types" const ( - tChangeTenantRootPassword ttypes.TaskName = "change tenant root password" - tActivateStandbyTenant ttypes.TaskName = "activate standby tenant" + tChangeTenantRootPassword ttypes.TaskName = "change tenant root password" + tActivateStandbyTenant ttypes.TaskName = "activate standby tenant" tCreateUsersForActivatedStandby ttypes.TaskName = "create users for activated standby" - tSwitchTenantsRole ttypes.TaskName = "switch tenants role" - tSetTenantLogRestoreSource ttypes.TaskName = "set tenant log restore source" - tUpgradeTenant ttypes.TaskName = "upgrade tenant" - tReplayLogOfStandby ttypes.TaskName = "replay log of standby" - tUpdateOBTenantResource ttypes.TaskName = "update obtenant resource" - tWaitForOBTenantReturnRunning ttypes.TaskName = "wait for obtenant return running" + tSwitchTenantsRole ttypes.TaskName = "switch tenants role" + tSetTenantLogRestoreSource ttypes.TaskName = "set tenant log restore source" + tUpgradeTenant ttypes.TaskName = "upgrade tenant" + tReplayLogOfStandby ttypes.TaskName = "replay log of standby" + tUpdateOBTenantResource ttypes.TaskName = "update obtenant resource" + tWaitForOBTenantReturnRunning ttypes.TaskName = "wait for obtenant return running" ) diff --git a/internal/resource/obtenantrestore/obtenantrestore_taskname_gen.go b/internal/resource/obtenantrestore/obtenantrestore_taskname_gen.go index a8da3588b..9f13c232b 100644 --- a/internal/resource/obtenantrestore/obtenantrestore_taskname_gen.go +++ b/internal/resource/obtenantrestore/obtenantrestore_taskname_gen.go @@ -5,6 +5,6 @@ import ttypes "github.com/oceanbase/ob-operator/pkg/task/types" const ( tStartRestoreJobInOB ttypes.TaskName = "start restore job in ob" - tStartLogReplay ttypes.TaskName = "start log replay" - tActivateStandby ttypes.TaskName = "activate standby" + tStartLogReplay ttypes.TaskName = "start log replay" + tActivateStandby ttypes.TaskName = "activate standby" ) diff --git a/internal/resource/obzone/obzone_taskname_gen.go b/internal/resource/obzone/obzone_taskname_gen.go index 3bbf07ff0..2cc02dd77 100644 --- a/internal/resource/obzone/obzone_taskname_gen.go +++ b/internal/resource/obzone/obzone_taskname_gen.go @@ -4,27 +4,27 @@ package obzone import ttypes "github.com/oceanbase/ob-operator/pkg/task/types" const ( - tAddZone ttypes.TaskName = "add zone" - tStartOBZone ttypes.TaskName = "start obzone" - tCreateOBServer ttypes.TaskName = "create observer" - tDeleteOBServer ttypes.TaskName = "delete observer" - tDeleteAllOBServer ttypes.TaskName = "delete all observer" - tWaitReplicaMatch ttypes.TaskName = "wait replica match" - tWaitOBServerDeleted ttypes.TaskName = "wait observer deleted" - tStopOBZone ttypes.TaskName = "stop obzone" - tOBClusterHealthCheck ttypes.TaskName = "obcluster health check" - tOBZoneHealthCheck ttypes.TaskName = "obzone health check" - tUpgradeOBServer ttypes.TaskName = "upgrade observer" - tWaitOBServerUpgraded ttypes.TaskName = "wait observer upgraded" - tDeleteOBZoneInCluster ttypes.TaskName = "delete obzone in cluster" - tScaleOBServersVertically ttypes.TaskName = "scale observers vertically" - tExpandPVC ttypes.TaskName = "expand pvc" - tModifyPodTemplate ttypes.TaskName = "modify pod template" - tDeleteLegacyOBServers ttypes.TaskName = "delete legacy observers" - tWaitOBServerBootstrapReady ttypes.TaskName = "wait observer bootstrap ready" - tWaitOBServerRunning ttypes.TaskName = "wait observer running" - tWaitForOBServerScalingUp ttypes.TaskName = "wait for observer scaling up" - tWaitForOBServerExpandingPVC ttypes.TaskName = "wait for observer expanding pvc" + tAddZone ttypes.TaskName = "add zone" + tStartOBZone ttypes.TaskName = "start obzone" + tCreateOBServer ttypes.TaskName = "create observer" + tDeleteOBServer ttypes.TaskName = "delete observer" + tDeleteAllOBServer ttypes.TaskName = "delete all observer" + tWaitReplicaMatch ttypes.TaskName = "wait replica match" + tWaitOBServerDeleted ttypes.TaskName = "wait observer deleted" + tStopOBZone ttypes.TaskName = "stop obzone" + tOBClusterHealthCheck ttypes.TaskName = "obcluster health check" + tOBZoneHealthCheck ttypes.TaskName = "obzone health check" + tUpgradeOBServer ttypes.TaskName = "upgrade observer" + tWaitOBServerUpgraded ttypes.TaskName = "wait observer upgraded" + tDeleteOBZoneInCluster ttypes.TaskName = "delete obzone in cluster" + tScaleOBServersVertically ttypes.TaskName = "scale observers vertically" + tExpandPVC ttypes.TaskName = "expand pvc" + tModifyPodTemplate ttypes.TaskName = "modify pod template" + tDeleteLegacyOBServers ttypes.TaskName = "delete legacy observers" + tWaitOBServerBootstrapReady ttypes.TaskName = "wait observer bootstrap ready" + tWaitOBServerRunning ttypes.TaskName = "wait observer running" + tWaitForOBServerScalingUp ttypes.TaskName = "wait for observer scaling up" + tWaitForOBServerExpandingPVC ttypes.TaskName = "wait for observer expanding pvc" tWaitForOBServerTemplateModifying ttypes.TaskName = "wait for observer template modifying" - tRollingReplaceOBServers ttypes.TaskName = "rolling replace observers" + tRollingReplaceOBServers ttypes.TaskName = "rolling replace observers" )