Address comments.

Author: thompsonja

helm/vitess/templates/_helpers.tpl

@@ -14,14 +14,17 @@
 {{- range . }}{{template "format-flags" .}}{{end -}}
 {{- end -}}
 
-# Format a shard name, making sure it starts and ends with [A-Za-z0-9].
-{{- define "format-shard-name" -}}
+# Clean labels, making sure it starts and ends with [A-Za-z0-9].
+# This is especially important for shard names, which can start or end with
+# '-' (like -80 or 80-), which would be an invalid kubernetes label.
+{{- define "clean-label" -}}
+{{- $replaced_label := . | replace "_" "-"}}
 {{- if hasPrefix "-" . -}}
-x{{.}}
+x{{$replaced_label}}
 {{- else if hasSuffix "-" . -}}
-{{.}}x
+{{$replaced_label}}x
 {{- else -}}
-{{.}}
+{{$replaced_label}}
 {{- end -}}
 {{- end -}}
 

helm/vitess/templates/_vttablet.tpl

@@ -176,9 +176,9 @@ volumes:
 {{- $tablet := index . 4 -}}
 {{- with $tablet.vttablet -}}
 {{- $0 := $.Values.vttablet -}}
-{{- $cellClean := $cell.name | replace "_" "-" -}}
-{{- $keyspaceClean := $keyspace.name | replace "_" "-" -}}
-{{- $shardClean := include "format-shard-name" $shard.name -}}
+{{- $cellClean := include "clean-label" $cell.name -}}
+{{- $keyspaceClean := include "clean-label" $keyspace.name -}}
+{{- $shardClean := include "clean-label" $shard.name -}}
 {{- $setName := printf "%s-%s-%s-%s" $cellClean $keyspaceClean $shardClean $tablet.type | lower -}}
 {{- $uid := "$(cat $VTDATAROOT/init/tablet-uid)" }}
 # vttablet StatefulSet
@@ -224,7 +224,7 @@ spec:
 {{- $cell := index . 1 -}}
 {{- $keyspace := index . 2 -}}
 {{- $shard := index . 3 -}}
-{{- $shardClean := include "format-shard-name" $shard.name -}}
+{{- $shardClean := include "clean-label" $shard.name -}}
 {{- $tablet := index . 4 -}}
 {{- $uid := index . 5 -}}
 {{- with $tablet.vttablet -}}

test/cluster/sandbox/initial_reparent.py

@@ -29,6 +29,7 @@ def initial_reparent(keyspace, master_cell, num_shards, namespace, timeout_s):
     if time.time() - start_time > timeout_s:
       logging.error('Timed out waiting to find a replica tablet')
       return 1
+
     for shard_name in sharding_utils.get_shard_names(num_shards):
       if shard_name in master_tablets:
         continue
@@ -61,6 +62,7 @@ def initial_reparent(keyspace, master_cell, num_shards, namespace, timeout_s):
     if len(successfully_reparented) == num_shards:
       logging.info('Done with initial reparent.')
       return 0
+
   logging.error('Timed out waiting for initial reparent.')
   return 1