fix: correct tls secret data name

radondb · Jun 8, 2022 · 8b76fb8 · 8b76fb8
1 parent 956e280
commit 8b76fb8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/api/v1alpha1/mysqlcluster_types.go b/api/v1alpha1/mysqlcluster_types.go
@@ -85,7 +85,7 @@ type MysqlClusterSpec struct {
 	// Represents NFS ip address where cluster restore from.
 	// +optional
 	NFSServerAddress string `json:"nfsServerAddress,omitempty"`
-	//containing CA (ca.pem) and optional CRL (crl.pem) ,server certificate and private key for SSL
+	//containing CA (ca.crt) and server cert (tls.crt) ,server private key (tls.key) for SSL
 	//+optional
 	TlsSecretName string `json:"tlsSecretName,omitempty"`
 }

diff --git a/charts/mysql-operator/crds/mysql.radondb.com_mysqlclusters.yaml b/charts/mysql-operator/crds/mysql.radondb.com_mysqlclusters.yaml
@@ -1256,6 +1256,10 @@ spec:
                 description: Represents the name of the cluster restore from backup
                   path.
                 type: string
+              tlsSecretName:
+                description: containing CA (ca.crt) and server cert (tls.crt) ,server
+                  private key (tls.key) for SSL
+                type: string
               xenonOpts:
                 default:
                   admitDefeatHearbeatCount: 5

diff --git a/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml b/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml
@@ -1257,8 +1257,8 @@ spec:
                   path.
                 type: string
               tlsSecretName:
-                description: containing CA (ca.pem) and optional CRL (crl.pem) ,server
-                  certificate and private key for SSL
+                description: containing CA (ca.crt) and server cert (tls.crt) ,server
+                  private key (tls.key) for SSL
                 type: string
               xenonOpts:
                 default:

diff --git a/sidecar/util.go b/sidecar/util.go
@@ -72,8 +72,6 @@ var (
 
 	// clone restore init data directory.
 	backupInitDirectory = "initbackup"
-	// tlsConfPath is the tls path for tls
-	tlsConfPath = utils.TlsMountPath
 )
 
 // copyFile the src file to dst.