From 43e0e5f0d1c9be13068af16236fa0c227d232446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@gmail.com>
Date: Sat, 6 Nov 2021 15:07:02 +0100
Subject: [PATCH] Remove unused ADMIN_PASSWD env var

---
 .env.sample                                    | 1 -
 .env.test                                      | 1 -
 Dockerfile                                     | 1 -
 src/runboat/k8s.py                             | 2 --
 src/runboat/kubefiles/kustomization.yaml.jinja | 1 -
 src/runboat/settings.py                        | 1 -
 6 files changed, 7 deletions(-)

diff --git a/.env.sample b/.env.sample
index ad24921..4501604 100644
--- a/.env.sample
+++ b/.env.sample
@@ -6,7 +6,6 @@ RUNBOAT_BUILD_PGHOST=postgres14.runboat-builds-db
 RUNBOAT_BUILD_PGPORT=5432
 RUNBOAT_BUILD_PGUSER=runboat-build
 RUNBOAT_BUILD_PGPASSWORD=...
-RUNBOAT_BUILD_ADMIN_PASSWD=...
 RUNBOAT_BUILD_DOMAIN=runboat.odoo-community.org
 RUNBOAT_BUILD_ENV={}
 RUNBOAT_GITHUB_TOKEN=
diff --git a/.env.test b/.env.test
index 26254ec..7fd2f69 100644
--- a/.env.test
+++ b/.env.test
@@ -6,7 +6,6 @@ RUNBOAT_BUILD_PGHOST=postgres14.runboat-builds-db
 RUNBOAT_BUILD_PGPORT=5432
 RUNBOAT_BUILD_PGUSER=runboat-build
 RUNBOAT_BUILD_PGPASSWORD=...
-RUNBOAT_BUILD_ADMIN_PASSWD=...
 RUNBOAT_BUILD_DOMAIN=runboat.odoo-community.org
 RUNBOAT_BUILD_ENV={}
 RUNBOAT_GITHUB_TOKEN=
diff --git a/Dockerfile b/Dockerfile
index fd36e43..a72fd4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,6 @@ ENV RUNBOAT_BUILD_PGHOST=postgres14.runboat-builds-db
 ENV RUNBOAT_BUILD_PGPORT=5432
 ENV RUNBOAT_BUILD_PGUSER=runboat-build
 ENV RUNBOAT_BUILD_PGPASSWORD=
-ENV RUNBOAT_BUILD_ADMIN_PASSWD=
 ENV RUNBOAT_BUILD_DOMAIN=runboat.example.com
 ENV RUNBOAT_GITHUB_TOKEN=
 ENV RUNBOAT_LOG_CONFIG=/etc/runboat-log-config.yaml
diff --git a/src/runboat/k8s.py b/src/runboat/k8s.py
index 1500931..c1cdc39 100644
--- a/src/runboat/k8s.py
+++ b/src/runboat/k8s.py
@@ -139,7 +139,6 @@ class DeploymentVars(BaseModel):
     pguser: str
     pgpassword: str
     pgdatabase: str
-    admin_passwd: str
     hostname: str
     build_env: dict[str, str]
 
@@ -170,7 +169,6 @@ def make_deployment_vars(
         pguser=settings.build_pguser,
         pgpassword=settings.build_pgpassword,
         pgdatabase=build_name,
-        admin_passwd=settings.build_admin_passwd,
         hostname=f"{slug}.{settings.build_domain}",
         build_env=settings.build_env or {},
     )
diff --git a/src/runboat/kubefiles/kustomization.yaml.jinja b/src/runboat/kubefiles/kustomization.yaml.jinja
index 1983918..f049186 100644
--- a/src/runboat/kubefiles/kustomization.yaml.jinja
+++ b/src/runboat/kubefiles/kustomization.yaml.jinja
@@ -31,7 +31,6 @@ secretGenerator:
   - name: odoosecretenv
     literals:
       - PGPASSWORD={{ pgpassword }}
-      - ADMIN_PASSWD={{ admin_passwd }}
 
 configMapGenerator:
   - name: odooenv
diff --git a/src/runboat/settings.py b/src/runboat/settings.py
index 0b93f76..809788c 100644
--- a/src/runboat/settings.py
+++ b/src/runboat/settings.py
@@ -15,7 +15,6 @@ class Settings(BaseSettings):
     build_pgport: str
     build_pguser: str
     build_pgpassword: str
-    build_admin_passwd: str
     build_domain: str
     build_env: Optional[dict[str, str]]
     build_images: dict[str, str] = {