[shardingsphere-on-cloud] branch main updated: chore(config): fix overwrite config in operator code

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shardingsphere-on-cloud.git


The following commit(s) were added to refs/heads/main by this push:
     new bffaf2c  chore(config): fix overwrite config in operator code
     new 88a6790  Merge pull request #89 from windghoul/config
bffaf2c is described below

commit bffaf2c16cd6d1bbf5321d94f362f2d5687f13a6
Author: windghoul <wi...@gmail.com>
AuthorDate: Tue Oct 11 14:58:14 2022 +0800

    chore(config): fix overwrite config in operator code
    
    Signed-off-by: windghoul <wi...@gmail.com>
---
 ...shardingsphere.apache.org_shardingsphereproxyserverconfigs.yaml | 7 -------
 shardingsphere-operator/api/v1alpha1/serverconfig.go               | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/charts/shardingsphere-operator/crds/shardingsphere.apache.org_shardingsphereproxyserverconfigs.yaml b/charts/shardingsphere-operator/crds/shardingsphere.apache.org_shardingsphereproxyserverconfigs.yaml
index d759908..1b18874 100644
--- a/charts/shardingsphere-operator/crds/shardingsphere.apache.org_shardingsphereproxyserverconfigs.yaml
+++ b/charts/shardingsphere-operator/crds/shardingsphere.apache.org_shardingsphereproxyserverconfigs.yaml
@@ -93,12 +93,6 @@ spec:
                 description: ClusterConfig needs to fill in the relevant configuration
                   required by Cluster mode
                 properties:
-                  overwrite:
-                    description: Whether overwrite persistent configuration with local
-                      configuration If it is false, it will not upload the local configuration
-                      to ZooKeeper. If it is true, it will upload the local configuration
-                      to ZooKeeper and overwrite the original configuration of ZooKeeper.
-                    type: boolean
                   repository:
                     description: Persist repository configuration
                     properties:
@@ -150,7 +144,6 @@ spec:
                     - Cluster
                     type: string
                 required:
-                - overwrite
                 - repository
                 - type
                 type: object
diff --git a/shardingsphere-operator/api/v1alpha1/serverconfig.go b/shardingsphere-operator/api/v1alpha1/serverconfig.go
index 73ca887..cd1187f 100644
--- a/shardingsphere-operator/api/v1alpha1/serverconfig.go
+++ b/shardingsphere-operator/api/v1alpha1/serverconfig.go
@@ -105,8 +105,4 @@ type ClusterConfig struct {
 	Type string `json:"type" yaml:"type"`
 	// Persist repository configuration
 	Repository RepositoryConfig `json:"repository" yaml:"repository"`
-	// Whether overwrite persistent configuration with local configuration
-	// If it is false, it will not upload the local configuration to ZooKeeper.
-	// If it is true, it will upload the local configuration to ZooKeeper and overwrite the original configuration of ZooKeeper.
-	Overwrite bool `json:"overwrite" yaml:"overwrite"`
 }