[5.5] quote environment values if necessary (#429)

* Quote environment values if necessary.
* Address review comments
* Bump planet to release

Makefile

@@ -42,7 +42,7 @@ RELEASE_OUT ?=
 TELEPORT_TAG = 3.0.5
 # TELEPORT_REPOTAG adapts TELEPORT_TAG to the teleport tagging scheme
 TELEPORT_REPOTAG := v$(TELEPORT_TAG)
-PLANET_TAG := 5.5.17-$(K8S_VER_SUFFIX)
+PLANET_TAG := 5.5.18-$(K8S_VER_SUFFIX)
 PLANET_BRANCH := $(PLANET_TAG)
 K8S_APP_TAG := $(GRAVITY_TAG)
 TELEKUBE_APP_TAG := $(GRAVITY_TAG)

lib/ops/opsservice/configure.go

@@ -24,6 +24,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 
@@ -923,7 +924,7 @@ func (s *site) getPlanetConfig(config planetConfig) (args []string, err error) {
 	}
 
 	for k, v := range config.env {
-		args = append(args, fmt.Sprintf("--env=%v=%v", k, v))
+		args = append(args, fmt.Sprintf("--env=%v=%v", k, strconv.Quote(v)))
 	}
 
 	args = append(args, s.addCloudConfig(config.config)...)

lib/ops/opsservice/configure_test.go

@@ -139,6 +139,7 @@ func (s *ConfigureSuite) TestGeneratesPlanetConfigPackage(c *check.C) {
 		env: map[string]string{
 			"VAR":  "value",
 			"VAR2": "value2",
+			"VAR3": "value1,value2",
 		},
 		config: &clusterconfig.Resource{
 			Kind:    storage.KindClusterConfiguration,
@@ -181,7 +182,7 @@ multizone=true`,
 		"secrets-dir":                {"/var/lib/gravity/secrets"},
 		"election-enabled":           {"true"},
 		"service-uid":                {"1000"},
-		"env":                        {"VAR=value", "VAR2=value2"},
+		"env":                        {`VAR="value"`, `VAR2="value2"`, `VAR3="value1,value2"`},
 		"volume": {
 			"/var/lib/gravity/planet/etcd:/ext/etcd",
 			"/var/lib/gravity/planet/docker:/ext/docker",

lib/update/internal/rollingupdate/phases/restart.go

@@ -51,17 +51,12 @@ func NewRestart(
 		return nil, trace.NotFound("no server specified for phase %q",
 			params.Phase.ID)
 	}
-	cluster, err := operator.GetLocalSite()
-	if err != nil {
-		return nil, trace.Wrap(err)
-	}
 	return &restart{
 		FieldLogger:   logger,
 		operationID:   operationID,
 		backend:       backend,
 		packages:      packages,
 		localPackages: localPackages,
-		serviceUser:   cluster.ServiceUser,
 		update:        params.Phase.Data.Update.Servers[0],
 	}, nil
 }
@@ -141,6 +136,5 @@ type restart struct {
 	packages      pack.PackageService
 	localPackages update.LocalPackageService
 	update        storage.UpdateServer
-	serviceUser   storage.OSUser
 	operationID   string
 }