[installer]: set affinities for pods and jobs

Author: Simon Emms

installer/pkg/components/blobserve/deployment.go

@@ -6,6 +6,7 @@ package blobserve
 
 import (
 "fmt"
+"github.com/gitpod-io/gitpod/installer/pkg/cluster"
 "github.com/gitpod-io/gitpod/installer/pkg/common"
 dockerregistry "github.com/gitpod-io/gitpod/installer/pkg/components/docker-registry"
 appsv1 "k8s.io/api/apps/v1"
@@ -69,7 +70,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 },
 },
 Spec: corev1.PodSpec{
-Affinity: &corev1.Affinity{},
+Affinity: common.Affinity(cluster.AffinityLabelWorkspaceServices),
 ServiceAccountName: Component,
 EnableServiceLinks: pointer.Bool(false),
 Volumes: []corev1.Volume{{

installer/pkg/components/content-service/deployment.go

@@ -5,6 +5,7 @@
 package content_service
 
 import (
+"github.com/gitpod-io/gitpod/installer/pkg/cluster"
 "github.com/gitpod-io/gitpod/installer/pkg/common"
 
 v1 "k8s.io/api/apps/v1"
@@ -24,7 +25,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 }
 
 podSpec := corev1.PodSpec{
-Affinity: &corev1.Affinity{},
+Affinity: common.Affinity(cluster.AffinityLabelMeta),
 ServiceAccountName: Component,
 EnableServiceLinks: pointer.Bool(false),
 DNSPolicy: "ClusterFirst",

installer/pkg/components/dashboard/deployment.go

@@ -5,6 +5,7 @@
 package dashboard
 
 import (
+"github.com/gitpod-io/gitpod/installer/pkg/cluster"
 "github.com/gitpod-io/gitpod/installer/pkg/common"
 
 appsv1 "k8s.io/api/apps/v1"
@@ -39,7 +40,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 Labels: labels,
 },
 Spec: corev1.PodSpec{
-Affinity: &corev1.Affinity{},
+Affinity: common.Affinity(cluster.AffinityLabelMeta),
 ServiceAccountName: Component,
 EnableServiceLinks: pointer.Bool(false),
 DNSPolicy: "ClusterFirst",

installer/pkg/components/database/incluster/helm.go

@@ -5,6 +5,7 @@
 package incluster
 
 import (
+"github.com/gitpod-io/gitpod/installer/pkg/cluster"
 "github.com/gitpod-io/gitpod/installer/pkg/common"
 "github.com/gitpod-io/gitpod/installer/pkg/helm"
 "github.com/gitpod-io/gitpod/installer/third_party/charts"
@@ -13,6 +14,16 @@ import (
 
 var Helm = common.CompositeHelmFunc(
 helm.ImportTemplate(charts.MySQL(), helm.TemplateConfig{}, func(cfg *common.RenderContext) (*common.HelmConfig, error) {
+affinity, err := helm.AffinityYaml(cluster.AffinityLabelMeta)
+if err != nil {
+return nil, err
+}
+
+primaryAffinityTemplate, err := helm.KeyFileValue("mysql.primary.affinity", affinity)
+if err != nil {
+return nil, err
+}
+
 return &common.HelmConfig{
 Enabled: true,
 Values: &values.Options{
@@ -23,6 +34,10 @@ var Helm = common.CompositeHelmFunc(
 helm.KeyValue("mysql.initdbScriptsConfigMap", SQLInitScripts),
 helm.KeyValue("mysql.serviceAccount.name", Component),
 },
+// This is too complex to be sent as a string
+FileValues: []string{
+primaryAffinityTemplate,
+},
 },
 }, nil
 }),

installer/pkg/components/database/init/job.go

@@ -8,6 +8,7 @@ package init
 
 import (
 "fmt"
+"github.com/gitpod-io/gitpod/installer/pkg/cluster"
 
 "github.com/gitpod-io/gitpod/installer/pkg/common"
 batchv1 "k8s.io/api/batch/v1"
@@ -32,7 +33,7 @@ func job(ctx *common.RenderContext) ([]runtime.Object, error) {
 Template: corev1.PodTemplateSpec{
 ObjectMeta: objectMeta,
 Spec: corev1.PodSpec{
-Affinity: &corev1.Affinity{},
+Affinity: common.Affinity(cluster.AffinityLabelMeta),
 RestartPolicy: corev1.RestartPolicyNever,
 ServiceAccountName: Component,
 EnableServiceLinks: pointer.Bool(false),

installer/pkg/components/image-builder-mk3/deployment.go

@@ -6,6 +6,7 @@ package image_builder_mk3
 
 import (
 "fmt"
+"github.com/gitpod-io/gitpod/installer/pkg/cluster"
 
 "github.com/gitpod-io/gitpod/installer/pkg/common"
 dockerregistry "github.com/gitpod-io/gitpod/installer/pkg/components/docker-registry"
@@ -78,7 +79,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 },
 },
 Spec: corev1.PodSpec{
-Affinity: &corev1.Affinity{},
+Affinity: common.Affinity(cluster.AffinityLabelMeta),
 ServiceAccountName: Component,
 EnableServiceLinks: pointer.Bool(false),
 DNSPolicy: "ClusterFirst",

installer/pkg/components/migrations/job.go

@@ -5,6 +5,7 @@
 package migrations
 
 import (
+"github.com/gitpod-io/gitpod/installer/pkg/cluster"
 "github.com/gitpod-io/gitpod/installer/pkg/common"
 batchv1 "k8s.io/api/batch/v1"
 corev1 "k8s.io/api/core/v1"
@@ -28,7 +29,7 @@ func job(ctx *common.RenderContext) ([]runtime.Object, error) {
 Template: corev1.PodTemplateSpec{
 ObjectMeta: objectMeta,
 Spec: corev1.PodSpec{
-Affinity: &corev1.Affinity{},
+Affinity: common.Affinity(cluster.AffinityLabelMeta),
 RestartPolicy: corev1.RestartPolicyNever,
 ServiceAccountName: Component,
 EnableServiceLinks: pointer.Bool(false),

installer/pkg/components/minio/incluster/minio.go

@@ -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"
 "github.com/gitpod-io/gitpod/installer/third_party/charts"
@@ -15,6 +16,16 @@ import (
 var Helm = func(apiPort int32, consolePort int32) common.HelmFunc {
 return common.CompositeHelmFunc(
 helm.ImportTemplate(charts.Minio(), helm.TemplateConfig{}, func(cfg *common.RenderContext) (*common.HelmConfig, error) {
+affinity, err := helm.AffinityYaml(cluster.AffinityLabelMeta)
+if err != nil {
+return nil, err
+}
+
+affinityTemplate, err := helm.KeyFileValue("minio.affinity", affinity)
+if err != nil {
+return nil, err
+}
+
 return &common.HelmConfig{
 Enabled: true,
 Values: &values.Options{
@@ -24,6 +35,10 @@ var Helm = func(apiPort int32, consolePort int32) common.HelmFunc {
 helm.KeyValue("minio.service.ports.api", fmt.Sprintf("%d", apiPort)),
 helm.KeyValue("minio.service.ports.console", fmt.Sprintf("%d", consolePort)),
 },
+// This is too complex to be sent as a string
+FileValues: []string{
+affinityTemplate,
+},
 },
 }, nil
 }),

installer/pkg/components/openvsx-proxy/statefulset.go

@@ -6,6 +6,7 @@ package openvsx_proxy
 
 import (
 "fmt"
+"github.com/gitpod-io/gitpod/installer/pkg/cluster"
 
 "github.com/gitpod-io/gitpod/installer/pkg/common"
 appsv1 "k8s.io/api/apps/v1"
@@ -50,7 +51,7 @@ func statefulset(ctx *common.RenderContext) ([]runtime.Object, error) {
 },
 },
 Spec: v1.PodSpec{
-Affinity: &v1.Affinity{},
+Affinity: common.Affinity(cluster.AffinityLabelIDE),
 ServiceAccountName: Component,
 EnableServiceLinks: pointer.Bool(false),
 DNSPolicy: "ClusterFirst",

installer/pkg/components/proxy/deployment.go

@@ -6,6 +6,7 @@ package proxy
 
 import (
 "fmt"
+"github.com/gitpod-io/gitpod/installer/pkg/cluster"
 
 "github.com/gitpod-io/gitpod/installer/pkg/common"
 
@@ -115,7 +116,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 },
 },
 Spec: corev1.PodSpec{
-Affinity: &corev1.Affinity{},
+Affinity: common.Affinity(cluster.AffinityLabelMeta),
 PriorityClassName: common.SystemNodeCritical,
 ServiceAccountName: Component,
 EnableServiceLinks: pointer.Bool(false),