[installer]: configure and validate the external database

installer/pkg/components/database/cloudsql/constants.go

@@ -5,13 +5,9 @@
 package cloudsql
 
 const (
-	Component       = "cloudsqlproxy"
-	dbSessionsImage = "mysql"
-	dbSessionsTag   = "5.7.34"
-	ImageRepo       = "b.gcr.io/cloudsql-docker"
-	ImageName       = "gce-proxy"
-	ImageVersion    = "1.11"
-	initScriptDir   = "init"
-	Port            = 3306
-	SQLInitScripts  = "db-init-scripts"
+	Component    = "cloudsqlproxy"
+	ImageRepo    = "b.gcr.io/cloudsql-docker"
+	ImageName    = "gce-proxy"
+	ImageVersion = "1.11"
+	Port         = 3306
 )

installer/pkg/components/database/cloudsql/objects.go

@@ -4,12 +4,14 @@
 
 package cloudsql
 
-import "github.com/gitpod-io/gitpod/installer/pkg/common"
+import (
+	"github.com/gitpod-io/gitpod/installer/pkg/common"
+	dbinit "github.com/gitpod-io/gitpod/installer/pkg/components/database/init"
+)
 
 var Objects = common.CompositeRenderFunc(
-	configmap,
 	deployment,
-	job,
+	dbinit.Objects,
 	common.DefaultServiceAccount(Component),
 	common.GenerateService(Component, map[string]common.ServicePort{
 		Component: {

installer/pkg/components/database/external/objects.go

@@ -0,0 +1,14 @@
+// Copyright (c) 2021 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 external
+
+import (
+	"github.com/gitpod-io/gitpod/installer/pkg/common"
+	dbinit "github.com/gitpod-io/gitpod/installer/pkg/components/database/init"
+)
+
+var Objects = common.CompositeRenderFunc(
+	dbinit.Objects,
+)

installer/pkg/components/database/cloudsql/configmap.go → installer/pkg/components/database/init/configmap.go

@@ -2,7 +2,7 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License-AGPL.txt in the project root for license information.
 
-package cloudsql
+package init
 
 import (
 	"embed"
@@ -14,7 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
-//go:embed init/*.sql
+//go:embed files/*.sql
 var initScriptFiles embed.FS
 
 func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
@@ -42,7 +42,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		&corev1.ConfigMap{
 			TypeMeta: common.TypeMetaConfigmap,
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      SQLInitScripts,
+				Name:      sqlInitScripts,
 				Namespace: ctx.Namespace,
 				Labels:    common.DefaultLabels(Component),
 			},

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

@@ -0,0 +1,13 @@
+// Copyright (c) 2021 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 init
+
+const (
+	Component       = "dbinit"
+	dbSessionsImage = "mysql"
+	dbSessionsTag   = "5.7.34"
+	initScriptDir   = "files"
+	sqlInitScripts  = "db-init-scripts"
+)

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

@@ -4,7 +4,7 @@
 
 // This runs the init scripts in a non-inCluster DB instance
 
-package cloudsql
+package init
 
 import (
 	"fmt"
@@ -35,9 +35,9 @@ func job(ctx *common.RenderContext) ([]runtime.Object, error) {
 					ServiceAccountName: Component,
 					EnableServiceLinks: pointer.Bool(false),
 					Volumes: []corev1.Volume{{
-						Name: SQLInitScripts,
+						Name: sqlInitScripts,
 						VolumeSource: corev1.VolumeSource{ConfigMap: &corev1.ConfigMapVolumeSource{
-							LocalObjectReference: corev1.LocalObjectReference{Name: SQLInitScripts},
+							LocalObjectReference: corev1.LocalObjectReference{Name: sqlInitScripts},
 						}},
 					}},
 					// The init container is designed to emulate Helm hooks
@@ -55,7 +55,7 @@ func job(ctx *common.RenderContext) ([]runtime.Object, error) {
 							"mysql -h $DB_HOST --port $DB_PORT -u $DB_USERNAME -p$DB_PASSWORD < /db-init-scripts/init.sql",
 						},
 						VolumeMounts: []corev1.VolumeMount{{
-							Name:      SQLInitScripts,
+							Name:      sqlInitScripts,
 							MountPath: "/db-init-scripts",
 							ReadOnly:  true,
 						}},

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

@@ -0,0 +1,15 @@
+// Copyright (c) 2021 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 init
+
+import (
+	"github.com/gitpod-io/gitpod/installer/pkg/common"
+)
+
+var Objects = common.CompositeRenderFunc(
+	configmap,
+	job,
+	common.DefaultServiceAccount(Component),
+)

installer/pkg/components/database/objects.go

@@ -7,6 +7,7 @@ package database
 import (
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
 	"github.com/gitpod-io/gitpod/installer/pkg/components/database/cloudsql"
+	"github.com/gitpod-io/gitpod/installer/pkg/components/database/external"
 	"github.com/gitpod-io/gitpod/installer/pkg/components/database/incluster"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/pointer"
@@ -16,6 +17,10 @@ func cloudSqlEnabled(cfg *common.RenderContext) bool {
 	return !pointer.BoolDeref(cfg.Config.Database.InCluster, false) && cfg.Config.Database.CloudSQL != nil
 }
 
+func externalEnabled(cfg *common.RenderContext) bool {
+	return !pointer.BoolDeref(cfg.Config.Database.InCluster, false) && cfg.Config.Database.External != nil
+}
+
 func inClusterEnabled(cfg *common.RenderContext) bool {
 	return pointer.BoolDeref(cfg.Config.Database.InCluster, false)
 }
@@ -28,6 +33,9 @@ var Objects = common.CompositeRenderFunc(
 		if cloudSqlEnabled(cfg) {
 			return cloudsql.Objects(cfg)
 		}
+		if externalEnabled(cfg) {
+			return external.Objects(cfg)
+		}
 		return nil, nil
 	}),
 )

installer/pkg/config/v1/validation.go

@@ -87,5 +87,10 @@ func (v version) ClusterValidation(rcfg interface{}) cluster.ValidationChecks {
 		res = append(res, cluster.CheckSecret(secretName, cluster.CheckSecretRequiredData("credentials.json", "encryptionKeys", "password", "username")))
 	}
 
+	if cfg.Database.External != nil {
+		secretName := cfg.Database.External.Certificate.Name
+		res = append(res, cluster.CheckSecret(secretName, cluster.CheckSecretRequiredData("encryptionKeys", "host", "password", "port", "username")))
+	}
+
 	return res
 }