From 4956e48a0bd72c840ea59b58ed4e4b1685f41071 Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Thu, 3 Feb 2022 17:03:17 +0100
Subject: [PATCH] service-maintenance: Skip db cleanup

Let's enable the cloud cleanup first, and then move on to the db.
---
 cmd/osbuild-service-maintenance/main.go | 31 ++++++++++++++-----------
 templates/composer.yml                  | 27 ---------------------
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/cmd/osbuild-service-maintenance/main.go b/cmd/osbuild-service-maintenance/main.go
index 1e375c9a9..8f2e6b25d 100644
--- a/cmd/osbuild-service-maintenance/main.go
+++ b/cmd/osbuild-service-maintenance/main.go
@@ -39,19 +39,6 @@ func main() {
 		logrus.Info("Dry run, no state will be changed")
 	}
 
-	dbURL := fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=%s",
-		conf.PGUser,
-		conf.PGPassword,
-		conf.PGHost,
-		conf.PGPort,
-		conf.PGDatabase,
-		conf.PGSSLMode,
-	)
-	jobs, err := dbjobqueue.New(dbURL)
-	if err != nil {
-		panic(err)
-	}
-
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
@@ -94,6 +81,24 @@ func main() {
 	wg.Wait()
 	logrus.Info("🦀🦀🦀 cloud cleanup done 🦀🦀🦀")
 
+	if conf.PGHost == "" {
+		logrus.Info("🦀🦀🦀 db host not defined, skipping db cleanup 🦀🦀🦀")
+		return
+	}
+
+	dbURL := fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=%s",
+		conf.PGUser,
+		conf.PGPassword,
+		conf.PGHost,
+		conf.PGPort,
+		conf.PGDatabase,
+		conf.PGSSLMode,
+	)
+	jobs, err := dbjobqueue.New(dbURL)
+	if err != nil {
+		panic(err)
+	}
+
 	var jobTypes []string
 	for _, a := range archs {
 		jobTypes = append(jobTypes, fmt.Sprintf("%s:%s", jobType, a))
diff --git a/templates/composer.yml b/templates/composer.yml
index 3f3d0761a..ae27b8502 100644
--- a/templates/composer.yml
+++ b/templates/composer.yml
@@ -248,33 +248,6 @@ objects:
                   cpu: "${CPU_LIMIT}"
                   memory: "${MEMORY_LIMIT}"
               env:
-              - name: PGHOST
-                valueFrom:
-                  secretKeyRef:
-                    name: composer-db
-                    key: db.host
-              - name: PGPORT
-                valueFrom:
-                  secretKeyRef:
-                    name: composer-db
-                    key: db.port
-              - name: PGDATABASE
-                valueFrom:
-                  secretKeyRef:
-                    name: composer-db
-                    key: db.name
-              - name: PGUSER
-                valueFrom:
-                  secretKeyRef:
-                    name: composer-db
-                    key: db.user
-              - name: PGPASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: composer-db
-                    key: db.password
-              - name: PGSSLMODE
-                value: "${PGSSLMODE}"
               - name: GCP_AUTH_PROVIDER_X509_CERT_URL
                 valueFrom:
                   secretKeyRef: