Skip to content

Commit e401df8

Browse files
committed
Update vtgate flags (_ -> -)
Signed-off-by: Matt Lord <[email protected]>
1 parent 2a5ed00 commit e401df8

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

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

0 commit comments

Comments
 (0)