Use consts

telepresenceio · Jul 25, 2024 · e75515c · e75515c
1 parent 5f9942d
commit e75515c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cmd/traffic/cmd/manager/managerutil/envconfig.go b/cmd/traffic/cmd/manager/managerutil/envconfig.go
@@ -70,7 +70,7 @@ type Env struct {
 	ClientDnsIncludeSuffixes             []string      `env:"CLIENT_DNS_INCLUDE_SUFFIXES,       		parser=split-trim,  default="`
 	ClientConnectionTTL                  time.Duration `env:"CLIENT_CONNECTION_TTL,              		parser=time.ParseDuration"`
 
-	ArgoRolloutsEnabled bool `env:"ARGO_ROLLOUTS_ENABLED, parser=bool, default=0"`
+	ArgoRolloutsEnabled bool `env:"ARGO_ROLLOUTS_ENABLED, parser=bool, default=false"`
 }
 
 func (e *Env) GeneratorConfig(qualifiedAgentImage string) (agentmap.GeneratorConfig, error) {

diff --git a/cmd/traffic/cmd/manager/managerutil/envconfig_test.go b/cmd/traffic/cmd/manager/managerutil/envconfig_test.go
@@ -66,7 +66,7 @@ func TestEnvconfig(t *testing.T) {
 		"simple": {
 			Input: map[string]string{
 				"AGENT_REGISTRY":        "docker.io/datawire",
-				"ARGO_ROLLOUTS_ENABLED": "1",
+				"ARGO_ROLLOUTS_ENABLED": "true",
 			},
 			Output: func(e *managerutil.Env) {
 				e.AgentRegistry = "docker.io/datawire"

diff --git a/pkg/client/userd/trafficmgr/workloads.go b/pkg/client/userd/trafficmgr/workloads.go
@@ -174,10 +174,10 @@ func (nw *namespacedWASWatcher) cancel() {
 
 func (nw *namespacedWASWatcher) hasSynced() bool {
 	return nw.svcWatcher.HasSynced() &&
-		nw.wlWatchers[0].HasSynced() &&
-		nw.wlWatchers[1].HasSynced() &&
-		nw.wlWatchers[2].HasSynced() &&
-		(nw.wlWatchers[3] == nil || nw.wlWatchers[3].HasSynced())
+		nw.wlWatchers[deployments].HasSynced() &&
+		nw.wlWatchers[replicasets].HasSynced() &&
+		nw.wlWatchers[statefulsets].HasSynced() &&
+		(nw.wlWatchers[rollouts] == nil || nw.wlWatchers[rollouts].HasSynced())
 }
 
 func newWASWatcher(knownWorkloadKinds *manager.KnownWorkloadKinds) *workloadsAndServicesWatcher {