Skip to content

Commit a217671

Browse files
kylos101kylos101
authored
[dev image] update to Jammy (#16718)
* [dev image] update to Jammy Ref: gitpod-io/workspace-images#1017 no more `python-dev` ref: lewagon/data-setup#219 (comment) https://wiki.termux.com/wiki/No_more_-dev_packages * [dev image] update images latest dev image * [ws-manager] avoid false positive linter errors * [ws-daemon] fix ineffectual assignment for err golangci-lint is catching more errors since upgrading to go 1.19.5 * Update to more recent gcloud * Moar timeout
1 parent afb0a26 commit a217671

22 files changed

+42
-25
lines changed

Diff for: ‎.github/actions/delete-preview/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
22

33
USER root
44
ENV OCI_TOOL_VERSION="0.2.0"

Diff for: ‎.github/actions/deploy-gitpod/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
22

33
USER root
44
ENV OCI_TOOL_VERSION="0.2.0"

Diff for: ‎.github/actions/deploy-monitoring-satellite/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
22

33
USER root
44
ENV OCI_TOOL_VERSION="0.2.0"

Diff for: ‎.github/actions/preview-create/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
22

33
USER root
44
ENV OCI_TOOL_VERSION="0.2.0"

Diff for: ‎.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
8181
runs-on: [ self-hosted ]
8282
container:
83-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
83+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
8484
volumes:
8585
- /var/tmp:/var/tmp
8686
- /tmp:/tmp
@@ -148,7 +148,7 @@ jobs:
148148
ports:
149149
- 23306:23306
150150
container:
151-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
151+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
152152
volumes:
153153
- /var/tmp:/var/tmp
154154
- /tmp:/tmp

Diff for: ‎.github/workflows/ide-integration-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Configuration
2222
runs-on: [self-hosted]
2323
container:
24-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
24+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
2525
outputs:
2626
name: ${{ steps.configuration.outputs.name }}
2727
version: ${{ steps.configuration.outputs.version }}
@@ -89,7 +89,7 @@ jobs:
8989
needs: [configuration, infrastructure]
9090
runs-on: [self-hosted]
9191
container:
92-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
92+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
9393
volumes:
9494
- /var/tmp:/var/tmp
9595
- /tmp:/tmp

Diff for: ‎.github/workflows/preview-env-gc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: "Find stale preview environments"
99
runs-on: [self-hosted]
1010
container:
11-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
11+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
1212
outputs:
1313
names: ${{ steps.set-matrix.outputs.names }}
1414
count: ${{ steps.set-matrix.outputs.count }}

Diff for: ‎.gitpod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
1+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
22
workspaceLocation: gitpod/gitpod-ws.code-workspace
33
checkoutLocation: gitpod
44
ports:

Diff for: ‎.werft/aks-installer-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

Diff for: ‎.werft/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pod:
7070
- name: MYSQL_TCP_PORT
7171
value: 23306
7272
- name: build
73-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
73+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
7474
workingDir: /workspace
7575
imagePullPolicy: IfNotPresent
7676
resources:

Diff for: ‎.werft/cleanup-installer-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pod:
2525
secretName: aks-credentials
2626
containers:
2727
- name: nightly-test
28-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
28+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
2929
workingDir: /workspace
3030
imagePullPolicy: Always
3131
volumeMounts:

Diff for: ‎.werft/debug.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pod:
5454
- name: MYSQL_TCP_PORT
5555
value: 23306
5656
- name: build
57-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
57+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
5858
workingDir: /workspace
5959
imagePullPolicy: IfNotPresent
6060
volumeMounts:

Diff for: ‎.werft/eks-installer-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

Diff for: ‎.werft/gke-installer-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

Diff for: ‎.werft/k3s-installer-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

Diff for: ‎.werft/platform-trigger-werft-cleanup.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pod:
2222
secretName: gcp-sa-gitpod-dev-deployer
2323
containers:
2424
- name: build
25-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
25+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
2626
workingDir: /workspace
2727
imagePullPolicy: IfNotPresent
2828
volumeMounts:

Diff for: ‎.werft/workspace-run-integration-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pod:
2222
secretName: github-token-gitpod-bot
2323
containers:
2424
- name: gcloud
25-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
25+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
2626
workingDir: /workspace
2727
imagePullPolicy: IfNotPresent
2828
env:

Diff for: ‎WORKSPACE.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ defaultVariant:
3434
- "**/node_modules/**"
3535
config:
3636
go:
37-
lintCommand: ["sh", "-c", "golangci-lint run --disable govet,errcheck,typecheck,staticcheck,structcheck --allow-parallel-runners --timeout 5m"]
37+
lintCommand: ["sh", "-c", "golangci-lint run --disable govet,errcheck,typecheck,staticcheck,structcheck --allow-parallel-runners --timeout 15m"]
3838
variants:
3939
- name: oss
4040
srcs:

Diff for: ‎components/ws-daemon/pkg/internal/session/workspace.go

-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,6 @@ func (s *Workspace) UpdateGitStatus(ctx context.Context, persistentVolumeClaim b
310310
err = s.Persist()
311311
if err != nil {
312312
log.WithError(err).WithFields(s.OWI()).Warn("cannot persist latest Git status")
313-
err = nil
314313
}
315314

316315
return s.LastGitStatus, nil

Diff for: ‎components/ws-manager/pkg/manager/manager.go

+3
Original file line numberDiff line numberDiff line change
@@ -893,6 +893,7 @@ func (m *Manager) deleteWorkspacePVC(ctx context.Context, pvcName string) error
893893
return nil
894894
}
895895

896+
//nolint:unused
896897
func (m *Manager) deleteWorkspaceSecrets(ctx context.Context, podName string) error {
897898
secret := &corev1.Secret{
898899
ObjectMeta: metav1.ObjectMeta{
@@ -1586,6 +1587,7 @@ func (m *Manager) connectToWorkspaceDaemon(ctx context.Context, wso workspaceObj
15861587
return wsdaemon.NewWorkspaceContentServiceClient(conn), nil
15871588
}
15881589

1590+
//nolint:unused
15891591
func (m *Manager) createWorkspaceSnapshotFromPVC(ctx context.Context, pvcName string, pvcVolumeSnapshotName string, pvcVolumeSnapshotClassName string, workspaceID string, labels map[string]string) error {
15901592
// create snapshot object out of PVC
15911593
volumeSnapshot := &volumesnapshotv1.VolumeSnapshot{
@@ -1611,6 +1613,7 @@ func (m *Manager) createWorkspaceSnapshotFromPVC(ctx context.Context, pvcName st
16111613
return nil
16121614
}
16131615

1616+
//nolint:unused
16141617
func (m *Manager) waitForWorkspaceVolumeSnapshotReady(ctx context.Context, pvcVolumeSnapshotName string, log *logrus.Entry) (pvcVolumeSnapshotContentName string, readyVolumeSnapshot bool, err error) {
16151618
log = log.WithField("VolumeSnapshot.Name", pvcVolumeSnapshotName)
16161619

Diff for: ‎components/ws-manager/pkg/manager/monitor.go

+17-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ var (
6262
// wsdaemonRetryInterval is the time in between attempts to work with ws-daemon.
6363
//
6464
// Note: this is a variable rather than a constant so that tests can modify this value.
65+
//nolint:unused
6566
wsdaemonRetryInterval = 5 * time.Second
6667
)
6768

@@ -75,8 +76,10 @@ type Monitor struct {
7576

7677
probeMap sync.Map
7778

79+
//nolint:unused
7880
initializerMap sync.Map
79-
finalizerMap sync.Map
81+
//nolint:unused
82+
finalizerMap sync.Map
8083

8184
act actingManager
8285

@@ -505,6 +508,7 @@ type actingManager interface {
505508
modifyFinalizer(ctx context.Context, workspaceID string, finalizer string, add bool) error
506509
}
507510

511+
//nolint:unused
508512
func (m *Monitor) clearInitializerFromMap(podName string) {
509513
m.initializerMap.Delete(podName)
510514
}
@@ -602,6 +606,8 @@ func (m *Monitor) traceWorkspaceState(state string, wso *workspaceObjects) opent
602606
}
603607

604608
// waitForWorkspaceReady waits until the workspace's content and Theia to become available.
609+
//
610+
//nolint:unused
605611
func (m *Monitor) waitForWorkspaceReady(ctx context.Context, pod *corev1.Pod) (err error) {
606612
span, ctx := tracing.FromContext(ctx, "waitForWorkspaceReady")
607613
defer tracing.FinishSpan(span, &err)
@@ -715,6 +721,8 @@ func (m *Monitor) waitForWorkspaceReady(ctx context.Context, pod *corev1.Pod) (e
715721

716722
// probeWorkspaceReady continually HTTP GETs a workspace's ready URL until we've tried a certain number of times
717723
// or the workspace responded with status code 200.
724+
//
725+
//nolint:unused
718726
func (m *Monitor) probeWorkspaceReady(ctx context.Context, pod *corev1.Pod) (result *WorkspaceProbeResult, err error) {
719727
span, ctx := tracing.FromContext(ctx, "probeWorkspaceReady")
720728
defer tracing.FinishSpan(span, &err)
@@ -775,6 +783,8 @@ func (m *Monitor) probeWorkspaceReady(ctx context.Context, pod *corev1.Pod) (res
775783
// initializeWorkspaceContent talks to a ws-daemon daemon on the node of the pod and initializes the workspace content.
776784
// If we're already initializing the workspace, thus function will return immediately. If we were not initializing,
777785
// prior to this call this function returns once initialization is complete.
786+
//
787+
//nolint:unused
778788
func (m *Monitor) initializeWorkspaceContent(ctx context.Context, pod *corev1.Pod) (err error) {
779789
span, ctx := tracing.FromContext(ctx, "initializeWorkspaceContent")
780790
defer tracing.FinishSpan(span, &err)
@@ -939,6 +949,8 @@ func (m *Monitor) initializeWorkspaceContent(ctx context.Context, pod *corev1.Po
939949
}
940950

941951
// retryIfUnavailable makes multiple attempts to execute op if op returns an UNAVAILABLE gRPC status code
952+
//
953+
//nolint:unused
942954
func retryIfUnavailable(ctx context.Context, op func(ctx context.Context) error) (err error) {
943955
for i := 0; i < wsdaemonMaxAttempts; i++ {
944956
err := op(ctx)
@@ -959,6 +971,7 @@ func retryIfUnavailable(ctx context.Context, op func(ctx context.Context) error)
959971
return grpc_status.Error(codes.Unavailable, "workspace content initialization is currently unavailable")
960972
}
961973

974+
//nolint:unused
962975
func shouldDisableRemoteStorage(pod *corev1.Pod) bool {
963976
wso := &workspaceObjects{Pod: pod}
964977
tpe, err := wso.WorkspaceType()
@@ -975,6 +988,8 @@ func shouldDisableRemoteStorage(pod *corev1.Pod) bool {
975988
}
976989

977990
// finalizeWorkspaceContent talks to a ws-daemon daemon on the node of the pod and creates a backup of the workspace content.
991+
//
992+
//nolint:unused
978993
func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceObjects) {
979994
span, ctx := tracing.FromContext(ctx, "finalizeWorkspaceContent")
980995
defer tracing.FinishSpan(span, nil)
@@ -1407,6 +1422,7 @@ func workspaceObjectListOptions(namespace string) *client.ListOptions {
14071422
}
14081423
}
14091424

1425+
//nolint:unused
14101426
func handleGRPCError(ctx context.Context, err error) error {
14111427
if err == nil {
14121428
return err

Diff for: ‎dev/image/Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the GNU Affero General Public License (AGPL).
33
# See License.AGPL.txt in the project root for license information.
44

5-
FROM gitpod/workspace-full:2022-11-09-13-54-49
5+
FROM gitpod/workspace-full:2023-03-06-18-43-51
66

77
ENV TRIGGER_REBUILD 26
88

@@ -151,7 +151,7 @@ ARG GCS_DIR=/opt/google-cloud-sdk
151151
ENV PATH=$GCS_DIR/bin:$PATH
152152
RUN sudo chown gitpod: /opt \
153153
&& mkdir $GCS_DIR \
154-
&& curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-x86_64.tar.gz \
154+
&& curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-420.0.0-linux-x86_64.tar.gz \
155155
| tar -xzvC /opt \
156156
&& /opt/google-cloud-sdk/install.sh --quiet --usage-reporting=false --bash-completion=true \
157157
--additional-components gke-gcloud-auth-plugin docker-credential-gcr alpha beta \
@@ -163,7 +163,6 @@ ENV USE_GKE_GCLOUD_AUTH_PLUGIN=True
163163
# Install tools for gsutil
164164
RUN sudo install-packages \
165165
gcc \
166-
python-dev \
167166
python-setuptools
168167

169168
RUN sudo python3 -m pip uninstall crcmod; sudo python3 -m pip install --no-cache-dir -U crcmod

0 commit comments

Comments
 (0)