[installer] Do not start binaries in verbose mode

gitpod-io · Jan 25, 2022 · 18a2c54 · 18a2c54
1 parent 9e5d13a
commit 18a2c54
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/components/ws-daemon/pkg/resources/dispatch.go b/components/ws-daemon/pkg/resources/dispatch.go
@@ -88,7 +88,9 @@ func (d *DispatchListener) WorkspaceAdded(ctx context.Context, ws *dispatch.Work
 		limit, err := resource.ParseQuantity(fixedLimit)
 		if err != nil {
 			log.WithError(err).WithField("limitReq", fixedLimit).Warn("workspace requested a fixed CPU limit, but we cannot parse the value")
+			return xerrors.Errorf("cannot parse CPU limit annotation value: %w", err)
 		}
+
 		// we need to scale from milli jiffie to jiffie - see governer code for details
 		scaledLimit = limit.MilliValue() / 10
 		cpuLimiter = FixedLimiter(scaledLimit)

diff --git a/installer/pkg/components/agent-smith/daemonset.go b/installer/pkg/components/agent-smith/daemonset.go
@@ -53,7 +53,7 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 						Name:            Component,
 						Image:           common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.AgentSmith.Version),
 						ImagePullPolicy: corev1.PullIfNotPresent,
-						Args:            []string{"run", "-v", "--config", "/config/config.json"},
+						Args:            []string{"run", "--config", "/config/config.json"},
 						Resources: corev1.ResourceRequirements{
 							Requests: corev1.ResourceList{
 								"cpu":    resource.MustParse("100m"),

diff --git a/installer/pkg/components/blobserve/deployment.go b/installer/pkg/components/blobserve/deployment.go
@@ -92,7 +92,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 						}},
 						Containers: []corev1.Container{{
 							Name:            Component,
-							Args:            []string{"run", "-v", "/mnt/config/config.json"},
+							Args:            []string{"run", "/mnt/config/config.json"},
 							Image:           common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.Blobserve.Version),
 							ImagePullPolicy: corev1.PullIfNotPresent,
 							Ports: []corev1.ContainerPort{{

diff --git a/installer/pkg/components/registry-facade/daemonset.go b/installer/pkg/components/registry-facade/daemonset.go
@@ -132,7 +132,7 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 						Name:            Component,
 						Image:           common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.RegistryFacade.Version),
 						ImagePullPolicy: corev1.PullIfNotPresent,
-						Args:            []string{"run", "-v", "/mnt/config/config.json"},
+						Args:            []string{"run", "/mnt/config/config.json"},
 						Resources: corev1.ResourceRequirements{
 							Requests: corev1.ResourceList{
 								"cpu":    resource.MustParse("100m"),

diff --git a/installer/pkg/components/ws-daemon/daemonset.go b/installer/pkg/components/ws-daemon/daemonset.go
@@ -193,7 +193,6 @@ fi
 				Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.WSDaemon.Version),
 				Args: []string{
 					"run",
-					"-v",
 					"--config",
 					"/config/config.json",
 				},

diff --git a/installer/pkg/components/ws-manager/deployment.go b/installer/pkg/components/ws-manager/deployment.go
@@ -34,7 +34,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		},
 		Containers: []corev1.Container{{
 			Name:            Component,
-			Args:            []string{"run", "-v", "--config", "/config/config.json"},
+			Args:            []string{"run", "--config", "/config/config.json"},
 			Image:           common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.WSManager.Version),
 			ImagePullPolicy: corev1.PullIfNotPresent,
 			Resources: corev1.ResourceRequirements{

diff --git a/installer/pkg/components/ws-proxy/deployment.go b/installer/pkg/components/ws-proxy/deployment.go
@@ -107,7 +107,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 						}}, volumes...),
 						Containers: []corev1.Container{{
 							Name:            Component,
-							Args:            []string{"run", "-v", "/config/config.json"},
+							Args:            []string{"run", "/config/config.json"},
 							Image:           common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.WSProxy.Version),
 							ImagePullPolicy: corev1.PullIfNotPresent,
 							Resources: corev1.ResourceRequirements{