[installer] Minor alignments + fixes

Author: geropl

install/installer/pkg/common/constants.go

@@ -45,6 +45,8 @@ const (
 	WSProxyComponent            = "ws-proxy"
 	ImageBuilderComponent       = "image-builder-mk3"
 	ImageBuilderRPCPort         = 8080
+	DebugPort                   = 6060
+	DebugNodePort               = 9229
 
 	AnnotationConfigChecksum = "gitpod.io/checksum_config"
 )

install/installer/pkg/components/database/cloudsql/deployment.go

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

install/installer/pkg/components/server/constants.go

@@ -18,6 +18,8 @@ const (
 	PrometheusPort        = 9500
 	PrometheusPortName    = "metrics"
 	InstallationAdminPort = common.ServerInstallationAdminPort
-	InstallationAdminName = "installation-admin"
+	InstallationAdminName = "install-admin"
+	DebugPortName         = "debug"
+	DebugNodePortName     = "debugnode"
 	ServicePort           = 3000
 )

install/installer/pkg/components/server/deployment.go

@@ -292,11 +292,14 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 								Name:          PrometheusPortName,
 								ContainerPort: PrometheusPort,
 							}, {
-								Name:          "debug",
-								ContainerPort: 6060,
+								Name:          InstallationAdminName,
+								ContainerPort: InstallationAdminPort,
 							}, {
-								Name:          "debugnode",
-								ContainerPort: 9229,
+								Name:          DebugPortName,
+								ContainerPort: common.DebugPort,
+							}, {
+								Name:          DebugNodePortName,
+								ContainerPort: common.DebugNodePort,
 							},
 							},
 							// todo(sje): do we need to cater for serverContainer.env from values.yaml?

install/installer/pkg/components/server/objects.go

@@ -29,6 +29,14 @@ var Objects = common.CompositeRenderFunc(
 			ContainerPort: InstallationAdminPort,
 			ServicePort:   InstallationAdminPort,
 		},
+		DebugPortName: {
+			ContainerPort: common.DebugPort,
+			ServicePort:   common.DebugPort,
+		},
+		DebugNodePortName: {
+			ContainerPort: common.DebugNodePort,
+			ServicePort:   common.DebugNodePort,
+		},
 	}),
 	common.DefaultServiceAccount(Component),
 )