itsulu/runboat
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused ADMIN_PASSWD env var

Browse source
This commit is contained in:
Stéphane Bidoul 2021-11-06 15:07:02 +01:00
parent 61ec2f06a0
commit 43e0e5f0d1
No known key found for this signature in database
GPG key ID: BCAB2555446B5B92
6 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env.sample
View file

@ -6,7 +6,6 @@ RUNBOAT_BUILD_PGHOST=postgres14.runboat-builds-db
RUNBOAT_BUILD_PGPORT=5432 RUNBOAT_BUILD_PGPORT=5432
RUNBOAT_BUILD_PGUSER=runboat-build RUNBOAT_BUILD_PGUSER=runboat-build
RUNBOAT_BUILD_PGPASSWORD=... RUNBOAT_BUILD_PGPASSWORD=...
RUNBOAT_BUILD_ADMIN_PASSWD=...
RUNBOAT_BUILD_DOMAIN=runboat.odoo-community.org RUNBOAT_BUILD_DOMAIN=runboat.odoo-community.org
RUNBOAT_BUILD_ENV={} RUNBOAT_BUILD_ENV={}
RUNBOAT_GITHUB_TOKEN= RUNBOAT_GITHUB_TOKEN=

1
.env.test
View file

@ -6,7 +6,6 @@ RUNBOAT_BUILD_PGHOST=postgres14.runboat-builds-db
RUNBOAT_BUILD_PGPORT=5432 RUNBOAT_BUILD_PGPORT=5432
RUNBOAT_BUILD_PGUSER=runboat-build RUNBOAT_BUILD_PGUSER=runboat-build
RUNBOAT_BUILD_PGPASSWORD=... RUNBOAT_BUILD_PGPASSWORD=...
RUNBOAT_BUILD_ADMIN_PASSWD=...
RUNBOAT_BUILD_DOMAIN=runboat.odoo-community.org RUNBOAT_BUILD_DOMAIN=runboat.odoo-community.org
RUNBOAT_BUILD_ENV={} RUNBOAT_BUILD_ENV={}
RUNBOAT_GITHUB_TOKEN= RUNBOAT_GITHUB_TOKEN=

1
Dockerfile
View file

@ -20,7 +20,6 @@ ENV RUNBOAT_BUILD_PGHOST=postgres14.runboat-builds-db
ENV RUNBOAT_BUILD_PGPORT=5432 ENV RUNBOAT_BUILD_PGPORT=5432
ENV RUNBOAT_BUILD_PGUSER=runboat-build ENV RUNBOAT_BUILD_PGUSER=runboat-build
ENV RUNBOAT_BUILD_PGPASSWORD= ENV RUNBOAT_BUILD_PGPASSWORD=
ENV RUNBOAT_BUILD_ADMIN_PASSWD=
ENV RUNBOAT_BUILD_DOMAIN=runboat.example.com ENV RUNBOAT_BUILD_DOMAIN=runboat.example.com
ENV RUNBOAT_GITHUB_TOKEN= ENV RUNBOAT_GITHUB_TOKEN=
ENV RUNBOAT_LOG_CONFIG=/etc/runboat-log-config.yaml ENV RUNBOAT_LOG_CONFIG=/etc/runboat-log-config.yaml

2
src/runboat/k8s.py
View file

@ -139,7 +139,6 @@ class DeploymentVars(BaseModel):
pguser: str pguser: str
pgpassword: str pgpassword: str
pgdatabase: str pgdatabase: str
admin_passwd: str
hostname: str hostname: str
build_env: dict[str, str] build_env: dict[str, str]
@ -170,7 +169,6 @@ def make_deployment_vars(
pguser=settings.build_pguser, pguser=settings.build_pguser,
pgpassword=settings.build_pgpassword, pgpassword=settings.build_pgpassword,
pgdatabase=build_name, pgdatabase=build_name,
admin_passwd=settings.build_admin_passwd,
hostname=f"{slug}.{settings.build_domain}", hostname=f"{slug}.{settings.build_domain}",
build_env=settings.build_env or {}, build_env=settings.build_env or {},
) )

1
src/runboat/kubefiles/kustomization.yaml.jinja
View file

@ -31,7 +31,6 @@ secretGenerator:
- name: odoosecretenv - name: odoosecretenv
literals: literals:
- PGPASSWORD={{ pgpassword }} - PGPASSWORD={{ pgpassword }}
- ADMIN_PASSWD={{ admin_passwd }}
configMapGenerator: configMapGenerator:
- name: odooenv - name: odooenv

1
src/runboat/settings.py
View file

@ -15,7 +15,6 @@ class Settings(BaseSettings):
build_pgport: str build_pgport: str
build_pguser: str build_pguser: str
build_pgpassword: str build_pgpassword: str
build_admin_passwd: str
build_domain: str build_domain: str
build_env: Optional[dict[str, str]] build_env: Optional[dict[str, str]]
build_images: dict[str, str] = { build_images: dict[str, str] = {