Skip to content

Commit 8ff6142

Browse files
iQQBotroboquat
iQQBot
authored and
roboquat
committed
fix workspace leak
1 parent 473274c commit 8ff6142

21 files changed

+81
-20
lines changed

‎components/ws-manager/pkg/manager/create.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ func (m *Manager) createDefiniteWorkspacePod(startContext *startWorkspaceContext
375375
Namespace: m.Config.Namespace,
376376
Labels: labels,
377377
Annotations: annotations,
378+
Finalizers: []string{"gitpod.io/finalizer"},
378379
},
379380
Spec: corev1.PodSpec{
380381
AutomountServiceAccountToken: &boolFalse,

‎components/ws-manager/pkg/manager/testdata/cdwp_admission.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_empty_resource_req.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_fixedresources.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@
3333
"prometheus.io/port": "23000",
3434
"prometheus.io/scrape": "true",
3535
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
36-
}
36+
},
37+
"finalizers": [
38+
"gitpod.io/finalizer"
39+
]
3740
},
3841
"spec": {
3942
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_fullworkspacebackup.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
"prometheus.io/port": "23000",
3535
"prometheus.io/scrape": "true",
3636
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
37-
}
37+
},
38+
"finalizers": [
39+
"gitpod.io/finalizer"
40+
]
3841
},
3942
"spec": {
4043
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_ghost.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_imagebuild.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_imagebuild_template.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_no_ideimage.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_prebuild.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template_override_resources.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_probe.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_readinessprobe.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_tasks.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_template.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_timeout.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@
3333
"prometheus.io/port": "23000",
3434
"prometheus.io/scrape": "true",
3535
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
36-
}
36+
},
37+
"finalizers": [
38+
"gitpod.io/finalizer"
39+
]
3740
},
3841
"spec": {
3942
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_userns.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_withaffinity_regular.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

‎components/ws-manager/pkg/manager/testdata/cdwp_withaffinityheadless.golden

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"prometheus.io/port": "23000",
3333
"prometheus.io/scrape": "true",
3434
"seccomp.security.alpha.kubernetes.io/pod": "localhost/workspace-default"
35-
}
35+
},
36+
"finalizers": [
37+
"gitpod.io/finalizer"
38+
]
3639
},
3740
"spec": {
3841
"volumes": [

0 commit comments

Comments
 (0)