From 44ef47089bf4a01166be9cbaf43ea57c2457b15d Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Thu, 3 Mar 2022 18:36:30 -0300 Subject: [PATCH] Remove unused labels --- components/common-go/kubernetes/kubernetes.go | 9 --------- components/ws-manager/pkg/manager/create.go | 1 - install/installer/pkg/common/common.go | 6 ++---- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/components/common-go/kubernetes/kubernetes.go b/components/common-go/kubernetes/kubernetes.go index ef99b22cad6284..65e0773dc16121 100644 --- a/components/common-go/kubernetes/kubernetes.go +++ b/components/common-go/kubernetes/kubernetes.go @@ -37,21 +37,12 @@ const ( // ServiceTypeLabel help differentiate between port service and IDE service ServiceTypeLabel = "serviceType" - // GitpodDiskPressureLabel marks a node as having disk pressure (besides the root disk - used for the workspace SSDs, set by ws-daemon) - GitpodDiskPressureLabel = "gitpod.io/diskPressure" - - // GitpodNodeServiceLabel marks a pod as providing a particular service to a node - GitpodNodeServiceLabel = "gitpod.io/nodeService" - // TraceIDAnnotation adds a Jaeger/OpenTracing header to the pod so that we can trace it's behaviour TraceIDAnnotation = "gitpod/traceid" // CPULimitAnnotation enforces a strict CPU limit on a workspace by virtue of ws-daemon CPULimitAnnotation = "gitpod.io/cpuLimit" - // RequiredNodeServicesAnnotation lists all Gitpod services required on the node - RequiredNodeServicesAnnotation = "gitpod.io/requiredNodeServices" - // ContainerIsGoneAnnotation is used as workaround for containerd https://github.com/containerd/containerd/pull/4214 // which might cause workspace container status propagation to fail, which in turn would keep a workspace running indefinitely. ContainerIsGoneAnnotation = "gitpod.io/containerIsGone" diff --git a/components/ws-manager/pkg/manager/create.go b/components/ws-manager/pkg/manager/create.go index 2faacbdc70a7d1..b37917c643841b 100644 --- a/components/ws-manager/pkg/manager/create.go +++ b/components/ws-manager/pkg/manager/create.go @@ -305,7 +305,6 @@ func (m *Manager) createDefiniteWorkspacePod(startContext *startWorkspaceContext kubernetes.WorkspaceImageSpecAnnotation: imageSpec, kubernetes.OwnerTokenAnnotation: startContext.OwnerToken, wsk8s.TraceIDAnnotation: startContext.TraceID, - wsk8s.RequiredNodeServicesAnnotation: "ws-daemon,registry-facade", // TODO(cw): post Kubernetes 1.19 use GA form for settings those profiles "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined", // We're using a custom seccomp profile for user namespaces to allow clone, mount and chroot. diff --git a/install/installer/pkg/common/common.go b/install/installer/pkg/common/common.go index d5288362833ddd..806b81c1b47d5c 100644 --- a/install/installer/pkg/common/common.go +++ b/install/installer/pkg/common/common.go @@ -13,7 +13,6 @@ import ( "strconv" "strings" - wsk8s "github.com/gitpod-io/gitpod/common-go/kubernetes" config "github.com/gitpod-io/gitpod/installer/pkg/config/v1" "github.com/gitpod-io/gitpod/installer/pkg/config/v1/experimental" @@ -31,9 +30,8 @@ import ( func DefaultLabels(component string) map[string]string { return map[string]string{ - "app": AppName, - "component": component, - wsk8s.GitpodNodeServiceLabel: component, + "app": AppName, + "component": component, } }