Cleanup installer (#18784)

aledbf · web-flow · commit d464ef8ecdc1 · 2023-09-25T10:58:04.000+02:00
* Cleanup installer

* Remove MessageBus references
diff --git a/License.third-party.go.txt b/License.third-party.go.txt
@@ -194,7 +194,6 @@ github.com/prometheus/procfs                                                 Apa
 github.com/prometheus/pushgateway                                            Apache License 2.0
 github.com/PuerkitoBio/purell                                                BSD 3-Clause "New" or "Revised" License
 github.com/PuerkitoBio/urlesc                                                BSD 3-Clause "New" or "Revised" License
-github.com/rabbitmq/amqp091-go                                               BSD 2-Clause "Simplified" License
 github.com/ramr/go-reaper                                                    MIT License
 github.com/redis/go-redis                                                    BSD 2-Clause "Simplified" License
 github.com/relvacode/iso8601                                                 MIT License
diff --git a/install/installer/docs/overview.md b/install/installer/docs/overview.md
@@ -198,7 +198,6 @@ yq eval-all --inplace \
 - All Gitpod components
 - Container registry*
 - MySQL database*
-- RabbitMQ
 - Minio object storage*
 
 \* By default, these dependencies are installed if the `inCluster` setting
diff --git a/install/installer/pkg/common/common.go b/install/installer/pkg/common/common.go
@@ -19,7 +19,6 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	networkingv1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -597,25 +596,6 @@ var (
 		tcpProtocol := corev1.ProtocolTCP
 		return &tcpProtocol
 	}()
-	PrometheusIngressRule = networkingv1.NetworkPolicyIngressRule{
-		Ports: []networkingv1.NetworkPolicyPort{
-			{
-				Protocol: TCPProtocol,
-				Port:     &intstr.IntOrString{IntVal: baseserver.BuiltinMetricsPort},
-			},
-		},
-		From: []networkingv1.NetworkPolicyPeer{
-			{
-				// todo(sje): add these labels to the prometheus instance
-				PodSelector: &metav1.LabelSelector{
-					MatchLabels: map[string]string{
-						"app":       "prometheus",
-						"component": "server",
-					},
-				},
-			},
-		},
-	}
 )
 
 var DeploymentStrategy = appsv1.DeploymentStrategy{
diff --git a/install/installer/pkg/common/constants.go b/install/installer/pkg/common/constants.go
@@ -20,7 +20,6 @@ const (
 	DockerRegistryName          = "registry"
 	GitpodContainerRegistry     = "eu.gcr.io/gitpod-core-dev/build"
 	InClusterDbSecret           = "mysql"
-	InClusterMessageQueueName   = "rabbitmq"
 	KubeRBACProxyRepo           = "quay.io"
 	KubeRBACProxyImage          = "brancz/kube-rbac-proxy"
 	KubeRBACProxyTag            = "v0.14.2"
@@ -45,7 +44,6 @@ const (
 	SystemNodeCritical          = "system-node-critical"
 	PublicApiComponent          = "public-api-server"
 	UsageComponent              = "usage"
-	WSManagerComponent          = "ws-manager"
 	WSManagerMk2Component       = "ws-manager-mk2"
 	WSManagerBridgeComponent    = "ws-manager-bridge"
 	WSProxyComponent            = "ws-proxy"
diff --git a/install/installer/pkg/common/networkpolicies.go b/install/installer/pkg/common/networkpolicies.go
@@ -52,29 +52,3 @@ func AllowKubeDnsEgressRule() v1.NetworkPolicyEgressRule {
 
 	return dnsEgressRule
 }
-
-func AllowWSManagerEgressRule() v1.NetworkPolicyEgressRule {
-	var tcp = corev1.ProtocolTCP
-
-	dnsEgressRule := v1.NetworkPolicyEgressRule{
-		Ports: []v1.NetworkPolicyPort{
-			{
-				Protocol: &tcp,
-				Port: &intstr.IntOrString{
-					IntVal: 8080,
-				},
-			},
-		},
-		To: []v1.NetworkPolicyPeer{{
-			PodSelector: &metav1.LabelSelector{
-				MatchLabels: map[string]string{
-					"app":       AppName,
-					"component": WSManagerComponent,
-				},
-			},
-			NamespaceSelector: &metav1.LabelSelector{},
-		}},
-	}
-
-	return dnsEgressRule
-}
diff --git a/install/installer/pkg/common/toleration.go b/install/installer/pkg/common/toleration.go
diff --git a/install/installer/pkg/components/image-builder-mk3/networkpolicy.go b/install/installer/pkg/components/image-builder-mk3/networkpolicy.go
@@ -28,13 +28,6 @@ func networkpolicy(ctx *common.RenderContext) ([]runtime.Object, error) {
 					},
 				},
 			},
-			{
-				PodSelector: &metav1.LabelSelector{
-					MatchLabels: map[string]string{
-						"component": common.WSManagerComponent,
-					},
-				},
-			},
 			{
 				PodSelector: &metav1.LabelSelector{
 					MatchLabels: map[string]string{
diff --git a/install/installer/pkg/components/image-builder-mk3/tlssecret.go b/install/installer/pkg/components/image-builder-mk3/tlssecret.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
-	"github.com/gitpod-io/gitpod/installer/pkg/config/v1"
 
 	certmanagerv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
 	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
@@ -17,13 +16,6 @@ import (
 )
 
 func tlssecret(ctx *common.RenderContext) ([]runtime.Object, error) {
-	// Only enable TLS in workspace clusters. This check can be removed
-	// once image-builder-mk3 has been removed from application clusters
-	// (https://github.com/gitpod-io/gitpod/issues/7845).
-	if ctx.Config.Kind != config.InstallationWorkspace {
-		return nil, nil
-	}
-
 	serverAltNames := []string{
 		fmt.Sprintf("%s.%s.svc", Component, ctx.Namespace),
 		fmt.Sprintf("%s.%s.svc.cluster.local", Component, ctx.Namespace),
diff --git a/install/installer/pkg/components/registry-facade/daemonset.go b/install/installer/pkg/components/registry-facade/daemonset.go
@@ -303,7 +303,6 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 						},
 						common.CAVolume(),
 					}, volumes...),
-					Tolerations: common.GPUToleration(),
 				},
 			},
 			UpdateStrategy: common.DaemonSetRolloutStrategy(),
diff --git a/install/installer/pkg/components/ws-daemon/daemonset.go b/install/installer/pkg/components/ws-daemon/daemonset.go
@@ -205,8 +205,6 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 		},
 	}
 
-	tolerations = append(tolerations, common.GPUToleration()...)
-
 	podSpec := corev1.PodSpec{
 		Volumes:        volumes,
 		InitContainers: initContainers,
diff --git a/install/installer/pkg/config/v1/config.go b/install/installer/pkg/config/v1/config.go
@@ -121,9 +121,6 @@ type Config struct {
 
 	Database Database `json:"database" validate:"required"`
 
-	// Deprecated.
-	MessageBus *MessageBus `json:"messageBus,omitempty"`
-
 	ObjectStorage ObjectStorage `json:"objectStorage" validate:"required"`
 
 	ContainerRegistry ContainerRegistry `json:"containerRegistry" validate:"required"`
@@ -186,10 +183,6 @@ type Tracing struct {
 	SecretName *string `json:"secretName,omitempty"`
 }
 
-type MessageBus struct {
-	Credentials *ObjectRef `json:"credentials"`
-}
-
 type Database struct {
 	InCluster *bool             `json:"inCluster,omitempty"`
 	External  *DatabaseExternal `json:"external,omitempty"`
diff --git a/install/installer/pkg/config/v1/deprecations.go b/install/installer/pkg/config/v1/deprecations.go
@@ -58,13 +58,6 @@ var deprecatedFields = map[string]deprecatedField{
 			return nil
 		},
 	},
-	// No MapValue can exist as this requires a secret rather than passing in the value
-	"experimental.common.staticMessagebusPassword": {
-		Selector: func(cfg *Config) (bool, any) {
-			val := cfg.Experimental.Common.StaticMessagebusPassword
-			return val != "", "***" // Redact the password
-		},
-	},
 	"experimental.ide.resolveLatest": {
 		Selector: func(cfg *Config) (bool, any) {
 			val := cfg.Experimental.IDE.ResolveLatest
diff --git a/install/installer/pkg/config/v1/experimental/experimental.go b/install/installer/pkg/config/v1/experimental/experimental.go
@@ -35,8 +35,6 @@ type Config struct {
 type CommonConfig struct {
 	// Deprecated.
 	PodConfig map[string]*PodConfig `json:"podConfig,omitempty"`
-	// Deprecated use a secret instead in messageBus.credentials
-	StaticMessagebusPassword string `json:"staticMessagebusPassword"`
 }
 
 type PodConfig struct {
diff --git a/install/installer/pkg/config/versions/versions.go b/install/installer/pkg/config/versions/versions.go
@@ -16,7 +16,6 @@ type Versioned struct {
 type Components struct {
 	AgentSmith      Versioned `json:"agentSmith"`
 	Blobserve       Versioned `json:"blobserve"`
-	CAUpdater       Versioned `json:"caUpdater"`
 	ContentService  Versioned `json:"contentService"`
 	Dashboard       Versioned `json:"dashboard"`
 	DBMigrations    Versioned `json:"dbMigrations"`
@@ -30,8 +29,6 @@ type Components struct {
 		Versioned
 		BuilderImage Versioned `json:"builderImage"`
 	} `json:"imageBuilderMk3"`
-	// Deprecated.
-	IntegrationTests  Versioned `json:"integrationTests"`
 	OpenVSXProxy      Versioned `json:"openVSXProxy"`
 	Proxy             Versioned `json:"proxy"`
 	PublicAPIServer   Versioned `json:"public-api-server"`
@@ -84,8 +81,6 @@ type Components struct {
 	NodeLabeler     Versioned `json:"node-labeler"`
 }
 
-// var embedded embed.FS
-
 func Embedded() (*Manifest, error) {
 	return loadEmbedded()
 }

Original file line number	Diff line number	Diff line change
`@@ -205,8 +205,6 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {`
`205`	`205`	`},`
`206`	`206`	`}`
`207`	`207`
`208`		`- tolerations = append(tolerations, common.GPUToleration()...)`
`209`		`-`
`210`	`208`	`podSpec := corev1.PodSpec{`
`211`	`209`	`Volumes: volumes,`
`212`	`210`	`InitContainers: initContainers,`