[dev] Update go to 1.16.3

.gitpod.yml

@@ -1,4 +1,4 @@
-image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9
+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.38
 workspaceLocation: gitpod/gitpod-ws.code-workspace
 checkoutLocation: gitpod
 ports:
@@ -32,7 +32,7 @@ tasks:
   - before: scripts/branch-namespace.sh
     init: yarn --network-timeout 100000 && yarn build
   - name: Go
-    init: leeway exec --filter-type go -v -- go mod download
+    init: leeway exec --filter-type go -v -- go mod verify
     openMode: split-right
 vscode:
   extensions:

.werft/build.yaml

@@ -30,7 +30,7 @@ pod:
     - name: MYSQL_TCP_PORT
       value: 23306
   - name: build
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.38
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:

.werft/run-integration-tests.yaml

@@ -22,7 +22,7 @@ pod:
     emptyDir: {}
   initContainers:
   - name: gcloud
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.38
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:
@@ -36,7 +36,7 @@ pod:
     - bash
     - -c
     - |
-      
+
       echo "[prep] preparing config."
 
       gcloud auth activate-service-account --key-file /mnt/secrets/gcp-sa/service-account.json
@@ -74,6 +74,6 @@ pod:
       echo "[prep|DONE]"
 
       /entrypoint.sh -kubeconfig=/config/kubeconfig -namespace={{ .Annotations.namespace }} -username=$USERNAME 2>&1 | ts "[int-tests] "
-      
+
       RC=${PIPESTATUS[0]}
       if [ $RC -eq 1 ]; then echo "[int-tests|FAIL]"; else echo "[int-tests|DONE]"; fi

.werft/wipe-devstaging.yaml

@@ -14,15 +14,15 @@ pod:
       secretName: gcp-sa-gitpod-dev-deployer
   containers:
   - name: wipe-devstaging
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.38
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:
     - name: gcp-sa
       mountPath: /mnt/secrets/gcp-sa
       readOnly: true
     command:
-    - bash 
+    - bash
     - -c
     - |
       sleep 1

WORKSPACE.yaml

@@ -4,10 +4,11 @@ defaultArgs:
   coreYarnLockBase: ../..
   publishToNPM: true
 
-defaultVariant: 
+defaultVariant:
   config:
     go:
       lintCommand: ["golangci-lint", "run", "--disable", "govet,typecheck"]
+      buildCommand: ["go", "build", "-trimpath", "-ldflags='-buildid= -w -s'"]
 
 variants:
 - name: oss

components/docker-up/BUILD.yaml

@@ -15,7 +15,6 @@ packages:
       - ["go", "generate"]
     config:
       dontTest: true
-      buildCommand: ["go", "build", "-trimpath", "-ldflags='-buildid= -w -s'"]
   - name: bin-runc-facade
     type: go
     srcs:
@@ -30,7 +29,6 @@ packages:
       - ["rmdir", "runc-facade"]
     config:
       dontTest: true
-      buildCommand: ["go", "build", "-trimpath", "-ldflags='-buildid= -w -s'"]
   - name: bin-slirp-docker-proxy
     type: go
     srcs:
@@ -45,7 +43,6 @@ packages:
       - ["rmdir", "slirp-docker-proxy"]
     config:
       dontTest: true
-      buildCommand: ["go", "build", "-trimpath", "-ldflags='-buildid= -w -s'"]
   - name: app
     type: generic
     deps:

components/gitpod-protocol/go/BUILD.yaml

@@ -10,5 +10,4 @@ packages:
       - GOOS=linux
     config:
       packaging: library
-      buildFlags:
-        - "-ldflags=-w"
+      buildCommand: ["go", "build", "-trimpath", "-ldflags=-buildid="]

components/gitpod-protocol/go/gitpod-config_test.go

@@ -24,7 +24,7 @@ func TestGitpodConfig(t *testing.T) {
 		{
 			Desc: "parsing",
 			Content: `
-image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9
+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.38
 workspaceLocation: gitpod/gitpod-ws.code-workspace
 checkoutLocation: gitpod
 ports:
@@ -43,7 +43,7 @@ vscode:
     - [email protected]:UATTe2sTFfCYWQ3jw4IRsw==
     - [email protected]:ZnPmyF/Pb8AIWeCqc83gPw==`,
 			Expectation: &GitpodConfig{
-				Image:             "eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9",
+				Image:             "eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.38",
 				WorkspaceLocation: "gitpod/gitpod-ws.code-workspace",
 				CheckoutLocation:  "gitpod",
 				Ports: []*PortsItems{

components/supervisor/BUILD.yaml

@@ -15,9 +15,6 @@ packages:
     env:
       - CGO_ENABLED=0
       - GOOS=linux
-    config:
-      buildFlags:
-        - "-ldflags=-w"
   - name: docker
     type: docker
     srcs:

components/ws-daemon/BUILD.yaml

@@ -17,6 +17,7 @@ packages:
       - GOOS=linux
     config:
       packaging: app
+      buildCommand: ["go", "build", "-trimpath", "-ldflags=-buildid="]
   - name: content-initializer
     type: go
     srcs:
@@ -37,6 +38,7 @@ packages:
     config:
       packaging: app
       dontTest: true
+      buildCommand: ["go", "build", "-trimpath", "-ldflags=-buildid="]
   - name: docker
     type: docker
     deps:

components/ws-manager/BUILD.yaml

@@ -18,7 +18,6 @@ packages:
       - GOOS=linux
     config:
       packaging: app
-      buildCommand: ["go", "build", "-trimpath", "-ldflags", "-w -extldflags \"-static\""]
   - name: docker
     type: docker
     deps:

components/ws-proxy/BUILD.yaml

@@ -17,6 +17,7 @@ packages:
       - GOOS=linux
     config:
       packaging: app
+      buildCommand: ["go", "build", "-trimpath", "-ldflags=-buildid="]
   - name: docker
     type: docker
     srcs:

dev/gpctl/BUILD.yaml

@@ -18,3 +18,4 @@ packages:
     config:
       packaging: app
       dontTest: true
+

dev/image/Dockerfile

@@ -114,11 +114,13 @@ ENV PATH=/home/gitpod/.nvm/versions/node/v${GITPOD_NODE_VERSION}/bin:$PATH
 # Fix the Go version
 ENV GOPATH=$HOME/go-packages
 ENV GOROOT=$HOME/go
-RUN go get golang.org/dl/go1.16 && \
-    go1.16 download && \
-    mv $(which go1.16) $(which go)
-ENV GOPATH=/workspace/go \
-    PATH=/workspace/go/bin:$PATH
+RUN go get golang.org/dl/go1.16.3 \
+  && go1.16.3 download \
+  && mv $(which go1.16.3) $(which go)
+ENV GOPATH=/workspace/go
+ENV PATH=/workspace/go/bin:$PATH
+
+ENV GOFLAGS="-mod=readonly"
 
 ## Register leeway autocompletion in bashrc
 RUN bash -c "echo . \<\(leeway bash-completion\) >> ~/.bashrc"

install/installer/BUILD.yaml

@@ -9,6 +9,8 @@ packages:
     env:
       - CGO_ENABLED=0
       - GOOS=linux
+    config:
+      packaging: app
   - name: docker
     type: docker
     srcs: