Remove unused labels

Author: aledbf

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"

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.

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,
 	}
 }