Skip to content

Commit 07b414d

Browse files
mattlordmattlord
committed
Revert flag changes. Make these changes in 2.17 instead.
Signed-off-by: Matt Lord <[email protected]>
1 parent bdd4357 commit 07b414d

File tree

13 files changed

+123
-123
lines changed

13 files changed

+123
-123
lines changed

‎pkg/operator/vitessbackup/storage_azblob.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626

2727
func azblobBackupFlags(azblob *planetscalev2.AzblobBackupLocation, clusterName string) vitess.Flags {
2828
return vitess.Flags{
29-
"backup-storage-implementation": azblobBackupStorageImplementationName,
30-
"azblob-backup-account-name": azblob.Account,
31-
"azblob-backup-account-key-file": secrets.Mount(&azblob.AuthSecret, azblobAuthDirName).FilePath(),
32-
"azblob-backup-container-name": azblob.Container,
33-
"azblob-backup-storage-root": rootKeyPrefix(azblob.KeyPrefix, clusterName),
29+
"backup_storage_implementation": azblobBackupStorageImplementationName,
30+
"azblob_backup_account_name": azblob.Account,
31+
"azblob_backup_account_key_file": secrets.Mount(&azblob.AuthSecret, azblobAuthDirName).FilePath(),
32+
"azblob_backup_container_name": azblob.Container,
33+
"azblob_backup_storage_root": rootKeyPrefix(azblob.KeyPrefix, clusterName),
3434
}
3535
}
3636

‎pkg/operator/vitessbackup/storage_ceph.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525

2626
func cephBackupFlags(ceph *planetscalev2.CephBackupLocation) vitess.Flags {
2727
flags := vitess.Flags{
28-
"backup-storage-implementation": cephBackupStorageImplementationName,
29-
"ceph-backup-storage-config": secrets.Mount(&ceph.AuthSecret, cephAuthDirName).FilePath(),
28+
"backup_storage_implementation": cephBackupStorageImplementationName,
29+
"ceph_backup_storage_config": secrets.Mount(&ceph.AuthSecret, cephAuthDirName).FilePath(),
3030
}
3131
return flags
3232
}

‎pkg/operator/vitessbackup/storage_file.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
func fileBackupFlags(clusterName string) vitess.Flags {
2525
return vitess.Flags{
26-
"backup-storage-implementation": fileBackupStorageImplementationName,
27-
"file-backup-storage-root": rootKeyPrefix(fileBackupStorageMountPath, clusterName),
26+
"backup_storage_implementation": fileBackupStorageImplementationName,
27+
"file_backup_storage_root": rootKeyPrefix(fileBackupStorageMountPath, clusterName),
2828
}
2929
}
3030

‎pkg/operator/vitessbackup/storage_gcs.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626

2727
func gcsBackupFlags(gcs *planetscalev2.GCSBackupLocation, clusterName string) vitess.Flags {
2828
return vitess.Flags{
29-
"backup-storage-implementation": gcsBackupStorageImplementationName,
30-
"gcs-backup-storage-bucket": gcs.Bucket,
31-
"gcs-backup-storage-root": rootKeyPrefix(gcs.KeyPrefix, clusterName),
29+
"backup_storage_implementation": gcsBackupStorageImplementationName,
30+
"gcs_backup_storage_bucket": gcs.Bucket,
31+
"gcs_backup_storage_root": rootKeyPrefix(gcs.KeyPrefix, clusterName),
3232
}
3333
}
3434

‎pkg/operator/vitessbackup/storage_s3.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ import (
2626

2727
func s3BackupFlags(s3 *planetscalev2.S3BackupLocation, clusterName string) vitess.Flags {
2828
flags := vitess.Flags{
29-
"backup-storage-implementation": s3BackupStorageImplementationName,
30-
"s3-backup-aws-region": s3.Region,
31-
"s3-backup-storage-bucket": s3.Bucket,
32-
"s3-backup-storage-root": rootKeyPrefix(s3.KeyPrefix, clusterName),
33-
"s3-backup-force-path-style": s3.ForcePathStyle,
29+
"backup_storage_implementation": s3BackupStorageImplementationName,
30+
"s3_backup_aws_region": s3.Region,
31+
"s3_backup_storage_bucket": s3.Bucket,
32+
"s3_backup_storage_root": rootKeyPrefix(s3.KeyPrefix, clusterName),
33+
"s3_backup_force_path_style": s3.ForcePathStyle,
3434
}
3535

3636
if s3.MinPartSize > 0 {
37-
flags["s3-backup-aws-min-partsize"] = s3.MinPartSize
37+
flags["s3_backup_aws_min_partsize"] = s3.MinPartSize
3838
}
3939

4040
if len(s3.Endpoint) > 0 {
41-
flags["s3-backup-aws-endpoint"] = s3.Endpoint
41+
flags["s3_backup_aws_endpoint"] = s3.Endpoint
4242
}
4343
return flags
4444
}

‎pkg/operator/vtctld/deployment.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,24 +236,24 @@ func (spec *Spec) flags() vitess.Flags {
236236
"cell": spec.Cell.Name,
237237

238238
"port": planetscalev2.DefaultWebPort,
239-
"grpc-port": planetscalev2.DefaultGrpcPort,
240-
"service-map": serviceMap,
239+
"grpc_port": planetscalev2.DefaultGrpcPort,
240+
"service_map": serviceMap,
241241

242-
"topo-implementation": spec.GlobalLockserver.Implementation,
243-
"topo-global-server-address": spec.GlobalLockserver.Address,
244-
"topo-global-root": spec.GlobalLockserver.RootPath,
242+
"topo_implementation": spec.GlobalLockserver.Implementation,
243+
"topo_global_server_address": spec.GlobalLockserver.Address,
244+
"topo_global_root": spec.GlobalLockserver.RootPath,
245245

246246
"logtostderr": true,
247247
}
248248
if spec.BackupLocation == nil {
249249
return flags
250250
}
251251
flags = flags.Merge(vitess.Flags{
252-
"backup-engine-implementation": string(spec.BackupEngine),
252+
"backup_engine_implementation": string(spec.BackupEngine),
253253
})
254254
if spec.BackupEngine == planetscalev2.VitessBackupEngineXtraBackup {
255255
flags = flags.Merge(vitess.Flags{
256-
"backup-storage-compress": true,
256+
"backup_storage_compress": true,
257257
})
258258
}
259259
clusterName := spec.Labels[planetscalev2.ClusterLabel]

‎pkg/operator/vtgate/deployment.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -267,26 +267,26 @@ func (spec *Spec) baseFlags() vitess.Flags {
267267

268268
return vitess.Flags{
269269
"cell": spec.Cell.Name,
270-
"cells-to-watch": strings.Join(cellsToWatch, ","),
271-
"tablet-types-to-wait": tabletTypesToWait,
270+
"cells_to_watch": strings.Join(cellsToWatch, ","),
271+
"tablet_types_to_wait": tabletTypesToWait,
272272

273-
"enable-buffer": bufferMasterTrafficDuringFailover,
274-
"buffer-min-time-between-failovers": bufferMinTimeBetweenFailovers,
275-
"buffer-max-failover-duration": bufferMaxFailoverDuration,
276-
"buffer-size": bufferSize,
273+
"enable_buffer": bufferMasterTrafficDuringFailover,
274+
"buffer_min_time_between_failovers": bufferMinTimeBetweenFailovers,
275+
"buffer_max_failover_duration": bufferMaxFailoverDuration,
276+
"buffer_size": bufferSize,
277277

278-
"grpc-max-message-size": grpcMaxMessageSize,
278+
"grpc_max_message_size": grpcMaxMessageSize,
279279

280-
"mysql-server-port": planetscalev2.DefaultMysqlPort,
280+
"mysql_server_port": planetscalev2.DefaultMysqlPort,
281281

282282
"logtostderr": true,
283-
"topo-implementation": spec.Cell.GlobalLockserver.Implementation,
284-
"topo-global-server-address": spec.Cell.GlobalLockserver.Address,
285-
"topo-global-root": spec.Cell.GlobalLockserver.RootPath,
283+
"topo_implementation": spec.Cell.GlobalLockserver.Implementation,
284+
"topo_global_server_address": spec.Cell.GlobalLockserver.Address,
285+
"topo_global_root": spec.Cell.GlobalLockserver.RootPath,
286286

287-
"service-map": serviceMap,
287+
"service_map": serviceMap,
288288
"port": planetscalev2.DefaultWebPort,
289-
"grpc-port": planetscalev2.DefaultGrpcPort,
289+
"grpc_port": planetscalev2.DefaultGrpcPort,
290290
}
291291
}
292292

@@ -295,9 +295,9 @@ func updateAuth(spec *Spec, flags vitess.Flags, container *corev1.Container, pod
295295
staticAuthFile := secrets.Mount(spec.Authentication.Static.Secret, staticAuthDirName)
296296

297297
// Get usernames and passwords from a static file, mounted from a Secret.
298-
flags["mysql-auth-server-impl"] = "static"
299-
flags["mysql-auth-server-static-file"] = staticAuthFile.FilePath()
300-
flags["mysql-auth-static-reload-interval"] = "30s"
298+
flags["mysql_auth_server_impl"] = "static"
299+
flags["mysql_auth_server_static_file"] = staticAuthFile.FilePath()
300+
flags["mysql_auth_static_reload_interval"] = "30s"
301301

302302
// Add the volume to the Pod, if needed.
303303
update.Volumes(&podSpec.Volumes, staticAuthFile.PodVolumes())
@@ -321,12 +321,12 @@ func updateTransport(spec *Spec, flags vitess.Flags, container *corev1.Container
321321

322322
// GRPC does not have an equivalent flag,
323323
// and all GRPC transport is required to be encrypted when certs are set.
324-
flags["mysql-server-require-secure-transport"] = spec.SecureTransport.Required
324+
flags["mysql_server_require_secure_transport"] = spec.SecureTransport.Required
325325

326-
flags["mysql-server-ssl-cert"] = tlsCertFile.FilePath()
327-
flags["mysql-server-ssl-key"] = tlsKeyFile.FilePath()
328-
flags["grpc-cert"] = tlsCertFile.FilePath()
329-
flags["grpc-key"] = tlsKeyFile.FilePath()
326+
flags["mysql_server_ssl_cert"] = tlsCertFile.FilePath()
327+
flags["mysql_server_ssl_key"] = tlsKeyFile.FilePath()
328+
flags["grpc_cert"] = tlsCertFile.FilePath()
329+
flags["grpc_key"] = tlsKeyFile.FilePath()
330330

331331
// Add the volumes to the Pod, if needed.
332332
update.Volumes(&podSpec.Volumes, tlsCertFile.PodVolumes())
@@ -341,8 +341,8 @@ func updateTransport(spec *Spec, flags vitess.Flags, container *corev1.Container
341341
if tls.ClientCACertSecret != nil {
342342
clientCACertFile := secrets.Mount(tls.ClientCACertSecret, tlsClientCACertDirName)
343343

344-
flags["mysql-server-ssl-ca"] = clientCACertFile.FilePath()
345-
flags["grpc-ca"] = clientCACertFile.FilePath()
344+
flags["mysql_server_ssl_ca"] = clientCACertFile.FilePath()
345+
flags["grpc_ca"] = clientCACertFile.FilePath()
346346

347347
update.Volumes(&podSpec.Volumes, clientCACertFile.PodVolumes())
348348

‎pkg/operator/vtorc/deployment.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,12 @@ func UpdateDeployment(obj *appsv1.Deployment, spec *Spec) {
211211

212212
func (spec *Spec) flags() vitess.Flags {
213213
return vitess.Flags{
214-
"topo-implementation": spec.GlobalLockserver.Implementation,
215-
"topo-global-server-address": spec.GlobalLockserver.Address,
216-
"topo-global-root": spec.GlobalLockserver.RootPath,
214+
"topo_implementation": spec.GlobalLockserver.Implementation,
215+
"topo_global_server_address": spec.GlobalLockserver.Address,
216+
"topo_global_root": spec.GlobalLockserver.RootPath,
217217
"port": planetscalev2.DefaultWebPort,
218218

219-
"clusters-to-watch": spec.Keyspace + "/" + spec.Shard,
219+
"clusters_to_watch": spec.Keyspace + "/" + spec.Shard,
220220

221221
"logtostderr": true,
222222
}

‎pkg/operator/vttablet/backup.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ import (
2828

2929
func xtrabackupFlags(backupThreads, restoreThreads int) vitess.Flags {
3030
flags := vitess.Flags{
31-
"xtrabackup-user": xtrabackupUser,
32-
"xtrabackup-stream-mode": xtrabackupStreamMode,
33-
"xtrabackup-stripes": xtrabackupStripeCount,
34-
"xtrabackup-backup-flags": fmt.Sprintf("--parallel=%d", backupThreads),
35-
"xbstream-restore-flags": fmt.Sprintf("--parallel=%d", restoreThreads),
36-
"backup-storage-compress": true,
31+
"xtrabackup_user": xtrabackupUser,
32+
"xtrabackup_stream_mode": xtrabackupStreamMode,
33+
"xtrabackup_stripes": xtrabackupStripeCount,
34+
"xtrabackup_backup_flags": fmt.Sprintf("--parallel=%d", backupThreads),
35+
"xbstream_restore_flags": fmt.Sprintf("--parallel=%d", restoreThreads),
36+
"backup_storage_compress": true,
3737
}
3838

3939
return flags
@@ -55,10 +55,10 @@ func init() {
5555
return nil
5656
}
5757
flags := vitess.Flags{
58-
"restore-from-backup": true,
59-
"restore-concurrency": restoreConcurrency,
60-
"wait-for-backup-interval": waitForBackupInterval,
61-
"backup-engine-implementation": string(spec.BackupEngine),
58+
"restore_from_backup": true,
59+
"restore_concurrency": restoreConcurrency,
60+
"wait_for_backup_interval": waitForBackupInterval,
61+
"backup_engine_implementation": string(spec.BackupEngine),
6262
}
6363
switch spec.BackupEngine {
6464
case planetscalev2.VitessBackupEngineXtraBackup:
@@ -94,7 +94,7 @@ func init() {
9494
return nil
9595
}
9696
flags := vitess.Flags{
97-
"backup-engine-implementation": string(spec.BackupEngine),
97+
"backup_engine_implementation": string(spec.BackupEngine),
9898
}
9999
if spec.BackupEngine == planetscalev2.VitessBackupEngineXtraBackup {
100100
// A vtbackup Pod is given the same resources as the mysqld

‎pkg/operator/vttablet/datastore.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -77,32 +77,32 @@ func datastoreFlags(spec *Spec) vitess.Flags {
7777

7878
func localDatastoreFlags(spec *Spec) vitess.Flags {
7979
return vitess.Flags{
80-
"db-charset": spec.dbConfigCharset(),
81-
"db-app-user": dbConfigAppUname,
82-
"db-dba-user": dbConfigDbaUname,
83-
"db-repl-user": dbConfigReplUname,
84-
"db-filtered-user": dbConfigFilteredUname,
80+
"db_charset": spec.dbConfigCharset(),
81+
"db_app_user": dbConfigAppUname,
82+
"db_dba_user": dbConfigDbaUname,
83+
"db_repl_user": dbConfigReplUname,
84+
"db_filtered_user": dbConfigFilteredUname,
8585

8686
// Only in the case of local mysql do we want to use the vt_ prefix.
87-
"init-db-name-override": spec.localDatabaseName(),
87+
"init_db_name_override": spec.localDatabaseName(),
8888

89-
"enforce-strict-trans-tables": true,
89+
"enforce_strict_trans_tables": true,
9090

9191
// TODO: Should this be configurable?
92-
"enable-replication-reporter": true,
92+
"enable_replication_reporter": true,
9393

94-
"mysqlctl-socket": mysqlctlSocketPath,
95-
"mycnf-socket-file": mysqlSocketPath,
94+
"mysqlctl_socket": mysqlctlSocketPath,
95+
"mycnf_socket_file": mysqlSocketPath,
9696
}
9797
}
9898

9999
func externalDatastoreSSLCAFlags(spec *Spec) vitess.Flags {
100100
caCertFile := secrets.Mount(spec.ExternalDatastore.ServerCACertSecret, externalDatastoreCACertDirName)
101101
return vitess.Flags{
102-
"db-ssl-ca": caCertFile.FilePath(),
102+
"db_ssl_ca": caCertFile.FilePath(),
103103

104104
// TODO: See if this should be passed in rather than hard coded.
105-
"db-flags": enableSSLBitflag,
105+
"db_flags": enableSSLBitflag,
106106
}
107107
}
108108

@@ -111,21 +111,21 @@ func externalDatastoreFlags(spec *Spec) vitess.Flags {
111111

112112
flags := vitess.Flags{
113113
"unmanaged": true,
114-
"restore-from-backup": false,
115-
"db-app-user": spec.ExternalDatastore.User,
116-
"db-appdebug-user": spec.ExternalDatastore.User,
117-
"db-allprivs-user": spec.ExternalDatastore.User,
118-
"db-dba-user": spec.ExternalDatastore.User,
119-
"db-filtered-user": spec.ExternalDatastore.User,
120-
"db-repl-user": spec.ExternalDatastore.User,
114+
"restore_from_backup": false,
115+
"db_app_user": spec.ExternalDatastore.User,
116+
"db_appdebug_user": spec.ExternalDatastore.User,
117+
"db_allprivs_user": spec.ExternalDatastore.User,
118+
"db_dba_user": spec.ExternalDatastore.User,
119+
"db_filtered_user": spec.ExternalDatastore.User,
120+
"db_repl_user": spec.ExternalDatastore.User,
121121
"db-credentials-file": credentialsFile.FilePath(),
122-
"db-host": spec.ExternalDatastore.Host,
123-
"db-port": spec.ExternalDatastore.Port,
124-
"init-db-name-override": spec.ExternalDatastore.Database,
122+
"db_host": spec.ExternalDatastore.Host,
123+
"db_port": spec.ExternalDatastore.Port,
124+
"init_db_name_override": spec.ExternalDatastore.Database,
125125

126-
"enable-replication-reporter": false,
126+
"enable_replication_reporter": false,
127127

128-
"enforce-strict-trans-tables": false,
128+
"enforce_strict_trans_tables": false,
129129
}
130130

131131
return flags

0 commit comments

Comments
 (0)