Merge pull request #186 from porter-dev/beta.3.provisioning-integration

use pg password for provisioner

internal/kubernetes/agent.go

@@ -241,7 +241,7 @@ func (a *Agent) ProvisionECR(
 	ecrName string,
 	awsInfra *models.AWSInfra,
 	operation provisioner.ProvisionerOperation,
-	pgConf *provisioner.PostgresConf,
+	pgConf *config.DBConf,
 	redisConf *config.RedisConf,
 ) (*batchv1.Job, error) {
 	id := awsInfra.GetID()
@@ -272,7 +272,7 @@ func (a *Agent) ProvisionEKS(
 	eksName string,
 	awsInfra *models.AWSInfra,
 	operation provisioner.ProvisionerOperation,
-	pgConf *provisioner.PostgresConf,
+	pgConf *config.DBConf,
 	redisConf *config.RedisConf,
 ) (*batchv1.Job, error) {
 	id := awsInfra.GetID()
@@ -300,7 +300,7 @@ func (a *Agent) ProvisionEKS(
 func (a *Agent) ProvisionTest(
 	projectID uint,
 	operation provisioner.ProvisionerOperation,
-	pgConf *provisioner.PostgresConf,
+	pgConf *config.DBConf,
 	redisConf *config.RedisConf,
 ) (*batchv1.Job, error) {
 	prov := &provisioner.Conf{

internal/kubernetes/provisioner/provisioner.go

@@ -31,7 +31,7 @@ type Conf struct {
 	Namespace string
 	ID        string
 	Redis     *config.RedisConf
-	Postgres  *PostgresConf
+	Postgres  *config.DBConf
 	Operation ProvisionerOperation
 
 	// provider-specific configurations
@@ -40,12 +40,6 @@ type Conf struct {
 	EKS *eks.Conf
 }
 
-// PostgresConf is the postgres config for the provisioner container
-type PostgresConf struct {
-	Host string
-	Port int
-}
-
 type ProvisionerOperation string
 
 const (
@@ -172,19 +166,20 @@ func (conf *Conf) addRedisEnv(env []v1.EnvVar) []v1.EnvVar {
 
 	env = append(env, v1.EnvVar{
 		Name:  "REDIS_USER",
-		Value: "default",
+		Value: conf.Redis.Username,
 	})
 
 	env = append(env, v1.EnvVar{
-		Name: "REDIS_PASS",
-		ValueFrom: &v1.EnvVarSource{
-			SecretKeyRef: &v1.SecretKeySelector{
-				LocalObjectReference: v1.LocalObjectReference{
-					Name: "redis",
-				},
-				Key: "redis-password",
-			},
-		},
+		Name:  "REDIS_PASS",
+		Value: conf.Redis.Password,
+		// ValueFrom: &v1.EnvVarSource{
+		// 	SecretKeyRef: &v1.SecretKeySelector{
+		// 		LocalObjectReference: v1.LocalObjectReference{
+		// 			Name: "redis",
+		// 		},
+		// 		Key: "redis-password",
+		// 	},
+		// },
 	})
 
 	env = append(env, v1.EnvVar{
@@ -209,19 +204,12 @@ func (conf *Conf) addPostgresEnv(env []v1.EnvVar) []v1.EnvVar {
 
 	env = append(env, v1.EnvVar{
 		Name:  "PG_USER",
-		Value: "postgres",
+		Value: conf.Postgres.Username,
 	})
 
 	env = append(env, v1.EnvVar{
-		Name: "PG_PASS",
-		ValueFrom: &v1.EnvVarSource{
-			SecretKeyRef: &v1.SecretKeySelector{
-				LocalObjectReference: v1.LocalObjectReference{
-					Name: "postgres-postgresql",
-				},
-				Key: "postgresql-password",
-			},
-		},
+		Name:  "PG_PASS",
+		Value: conf.Postgres.Password,
 	})
 
 	return env

server/api/provision_handler.go

@@ -36,10 +36,7 @@ func (app *App) HandleProvisionTest(w http.ResponseWriter, r *http.Request) {
 	_, err = agent.ProvisionTest(
 		uint(projID),
 		provisioner.Apply,
-		&provisioner.PostgresConf{
-			Host: app.DBConf.Host,
-			Port: app.DBConf.Port,
-		},
+		&app.DBConf,
 		app.RedisConf,
 	)
 
@@ -119,10 +116,7 @@ func (app *App) HandleProvisionAWSECRInfra(w http.ResponseWriter, r *http.Reques
 		form.ECRName,
 		infra,
 		provisioner.Apply,
-		&provisioner.PostgresConf{
-			Host: app.DBConf.Host,
-			Port: app.DBConf.Port,
-		},
+		&app.DBConf,
 		app.RedisConf,
 	)
 
@@ -212,10 +206,7 @@ func (app *App) HandleDestroyAWSECRInfra(w http.ResponseWriter, r *http.Request)
 		form.ECRName,
 		infra,
 		provisioner.Destroy,
-		&provisioner.PostgresConf{
-			Host: app.DBConf.Host,
-			Port: app.DBConf.Port,
-		},
+		&app.DBConf,
 		app.RedisConf,
 	)
 
@@ -297,10 +288,7 @@ func (app *App) HandleProvisionAWSEKSInfra(w http.ResponseWriter, r *http.Reques
 		form.EKSName,
 		infra,
 		provisioner.Apply,
-		&provisioner.PostgresConf{
-			Host: app.DBConf.Host,
-			Port: app.DBConf.Port,
-		},
+		&app.DBConf,
 		app.RedisConf,
 	)
 
@@ -390,10 +378,7 @@ func (app *App) HandleDestroyAWSEKSInfra(w http.ResponseWriter, r *http.Request)
 		form.EKSName,
 		infra,
 		provisioner.Destroy,
-		&provisioner.PostgresConf{
-			Host: app.DBConf.Host,
-			Port: app.DBConf.Port,
-		},
+		&app.DBConf,
 		app.RedisConf,
 	)