Skip to content

[node-labeler] Refactor node labeling to use taints instead of labels #20652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
344 changes: 276 additions & 68 deletions components/node-labeler/cmd/run.go

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions install/installer/pkg/common/toleration.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Copyright (c) 2025 Gitpod GmbH. All rights reserved.
// Licensed under the GNU Affero General Public License (AGPL).
// See License.AGPL.txt in the project root for license information.

package common

import (
configv1 "github.com/gitpod-io/gitpod/installer/pkg/config/v1"
corev1 "k8s.io/api/core/v1"
)

const (
RegistryFacadeTaintKey = "gitpod.io/registry-facade-not-ready"
WsDaemonTaintKey = "gitpod.io/ws-daemon-not-ready"
)

func WithTolerationWorkspaceComponentNotReady(ctx *RenderContext) []corev1.Toleration {
if ctx.Config.Kind != configv1.InstallationFull {
return []corev1.Toleration{}
}
return []corev1.Toleration{
{
Key: RegistryFacadeTaintKey,
Operator: corev1.TolerationOpExists,
Effect: corev1.TaintEffectNoSchedule,
},
{
Key: WsDaemonTaintKey,
Operator: corev1.TolerationOpExists,
Effect: corev1.TaintEffectNoSchedule,
},
}
}
6 changes: 6 additions & 0 deletions install/installer/pkg/components/agent-smith/daemonset.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
},
common.CAVolume(),
},
Tolerations: []corev1.Toleration{
{
Effect: corev1.TaintEffectNoSchedule,
Operator: corev1.TolerationOpExists,
},
},
},
},
UpdateStrategy: common.DaemonSetRolloutStrategy(),
Expand Down
1 change: 1 addition & 0 deletions install/installer/pkg/components/blobserve/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
FailureThreshold: 3,
},
}, *common.KubeRBACProxyContainer(ctx)},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
},
}, *common.KubeRBACProxyContainer(ctx),
},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
}

err = common.AddStorageMounts(ctx, &podSpec, Component)
Expand Down
1 change: 1 addition & 0 deletions install/installer/pkg/components/dashboard/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
TimeoutSeconds: 1,
},
}},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
10 changes: 10 additions & 0 deletions install/installer/pkg/components/database/incluster/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ var Helm = common.CompositeHelmFunc(
return nil, err
}

tolerations, err := helm.WithTolerationWorkspaceComponentNotReadyYaml(cfg)
if err != nil {
return nil, err
}
tolerationsTemplate, err := helm.KeyFileValue("mysql.primary.tolerations", tolerations)
if err != nil {
return nil, err
}

imageRegistry := common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL)

type EnvVar struct {
Expand Down Expand Up @@ -73,6 +82,7 @@ var Helm = common.CompositeHelmFunc(
FileValues: []string{
primaryAffinityTemplate,
extraEnvVarsTemplate,
tolerationsTemplate,
},
},
}, nil
Expand Down
13 changes: 13 additions & 0 deletions install/installer/pkg/components/docker-registry/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,25 @@ var Helm = common.CompositeHelmFunc(
)
}

tolerations, err := helm.WithTolerationWorkspaceComponentNotReadyYaml(cfg)
if err != nil {
return nil, err
}
tolerationsTemplate, err := helm.KeyFileValue("docker-registry.tolerations", tolerations)
if err != nil {
return nil, err
}

registryValues = append(registryValues, helm.KeyValue("docker-registry.persistence.enabled", enablePersistence))

return &common.HelmConfig{
Enabled: inCluster,
Values: &values.Options{
Values: registryValues,
// This is too complex to be sent as a string
FileValues: []string{
tolerationsTemplate,
},
},
}, nil
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
},
*common.KubeRBACProxyContainerWithConfig(ctx),
},
Volumes: volumes,
Volumes: volumes,
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
1 change: 1 addition & 0 deletions install/installer/pkg/components/ide-proxy/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
TimeoutSeconds: 1,
},
}},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
},
},
},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
},
*common.KubeRBACProxyContainer(ctx),
},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
1 change: 1 addition & 0 deletions install/installer/pkg/components/migrations/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ func job(ctx *common.RenderContext) ([]runtime.Object, error) {
"cd /app/node_modules/@gitpod/gitpod-db && yarn run wait-for-db && yarn run typeorm migration:show || true && yarn run typeorm migration:run",
},
}},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
11 changes: 11 additions & 0 deletions install/installer/pkg/components/minio/incluster/minio.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package incluster

import (
"fmt"

"github.com/gitpod-io/gitpod/installer/pkg/cluster"
"github.com/gitpod-io/gitpod/installer/pkg/common"
"github.com/gitpod-io/gitpod/installer/pkg/helm"
Expand All @@ -26,6 +27,15 @@ var Helm = func(apiPort int32, consolePort int32, commonHelmValues []string) com
return nil, err
}

tolerations, err := helm.WithTolerationWorkspaceComponentNotReadyYaml(cfg)
if err != nil {
return nil, err
}
tolerationsTemplate, err := helm.KeyFileValue("minio.tolerations", tolerations)
if err != nil {
return nil, err
}

return &common.HelmConfig{
Enabled: true,
Values: &values.Options{
Expand All @@ -41,6 +51,7 @@ var Helm = func(apiPort int32, consolePort int32, commonHelmValues []string) com
// This is too complex to be sent as a string
FileValues: []string{
affinityTemplate,
tolerationsTemplate,
},
},
}, nil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
},
*common.KubeRBACProxyContainerWithConfig(ctx),
},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
}

return []runtime.Object{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ func statefulset(ctx *common.RenderContext) ([]runtime.Object, error) {
}},
}, *common.KubeRBACProxyContainer(ctx),
},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
VolumeClaimTemplates: volumeClaimTemplates,
Expand Down
4 changes: 3 additions & 1 deletion install/installer/pkg/components/proxy/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,9 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
Value: segmentEndpoint,
}},
)),
}},
},
},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
},
*common.KubeRBACProxyContainer(ctx),
},
Volumes: volumes,
Volumes: volumes,
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
1 change: 1 addition & 0 deletions install/installer/pkg/components/redis/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
},
*common.KubeRBACProxyContainer(ctx),
},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
1 change: 1 addition & 0 deletions install/installer/pkg/components/server/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
volumeMounts...,
),
}, *common.KubeRBACProxyContainer(ctx)},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
1 change: 1 addition & 0 deletions install/installer/pkg/components/spicedb/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
},
*common.KubeRBACProxyContainer(ctx),
},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
Volumes: []v1.Volume{
bootstrapVolume,
},
Expand Down
1 change: 1 addition & 0 deletions install/installer/pkg/components/usage/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
},
*common.KubeRBACProxyContainerWithConfig(ctx),
},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
PeriodSeconds: 20,
},
}, *common.KubeRBACProxyContainer(ctx)},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
},
*common.KubeRBACProxyContainer(ctx),
},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
Volumes: append([]corev1.Volume{
{
Name: VolumeConfig,
Expand Down
1 change: 1 addition & 0 deletions install/installer/pkg/components/ws-proxy/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
},
*common.KubeRBACProxyContainer(ctx),
},
Tolerations: common.WithTolerationWorkspaceComponentNotReady(ctx),
}

return []runtime.Object{
Expand Down
11 changes: 11 additions & 0 deletions install/installer/pkg/helm/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,17 @@ func AffinityYaml(orLabels ...string) ([]byte, error) {
return marshal, nil
}

func WithTolerationWorkspaceComponentNotReadyYaml(ctx *common.RenderContext) ([]byte, error) {
tolerations := common.WithTolerationWorkspaceComponentNotReady(ctx)

marshal, err := yaml.Marshal(tolerations)
if err != nil {
return nil, err
}

return marshal, nil
}

func nodeAffinity(orLabels ...string) *corev1.Affinity {
var terms []corev1.NodeSelectorTerm
for _, lbl := range orLabels {
Expand Down
Loading