Update migratrion script (goharbor#7728)

* Fix migration script 1. port is string when parsed from configparser 2. remove index and db_user in if condition Signed-off-by: Qian Deng <dengq@vmware.com> * Add port to public_url Add port to public_url Signed-off-by: Qian Deng <dengq@vmware.com> * Customized value for notary and clair db config in notary and clair is hardcoded Signed-off-by: Qian Deng <dengq@vmware.com> * Add notary and clair db config in harbor.yml Add notary clair config to harbor.yml and fix related regression Signed-off-by: Qian Deng <dengq@vmware.com>

Author: ninjadq

make/harbor.yml

@@ -83,11 +83,34 @@ _version: 1.8.0
 # Uncomment external_database if using external database. And the password will replace the the password setting in database.
 # And currently only support postgres.
 # external_database:
-# host: postgresql
-# port: 5432
-# username: postgres
-# password: root123
-# ssl_mode: disable
+# harbor:
+# host: postgresql
+# port: 5432
+# db_name: registry
+# username: postgres
+# password: root123
+# ssl_mode: disable
+# clair:
+# host: postgresql
+# port: 5432
+# db_name: registry
+# username: postgres
+# password: root123
+# ssl_mode: disable
+# notary_signer:
+# host: postgresql
+# port: 5432
+# db_name: registry
+# username: postgres
+# password: root123
+# ssl_mode: disable
+# notary_server:
+# host: postgresql
+# port: 5432
+# db_name: registry
+# username: postgres
+# password: root123
+# ssl_mode: disable
 
 # Uncomment external_redis if using external Redis server
 # external_redis:
@@ -101,4 +124,4 @@ _version: 1.8.0
 
 # Uncomment uaa for trusting the certificate of uaa instance that is hosted via self-signed cert.
 # uaa:
-# ca_file: /path/to/ca
+# ca_file: /path/to/ca

make/photon/prepare/templates/clair/config.yaml.jinja

@@ -2,7 +2,7 @@ clair:
  database:
  type: pgsql
  options:
- source: postgresql://{{username}}:{{password}}@{{host}}:{{port}}/{{dbname}}?sslmode=disable
+ source: postgresql://{{clair_db_username}}:{{clair_db_password}}@{{clair_db_host}}:{{clair_db_port}}/{{clair_db_name}}?sslmode={{clair_db_sslmode}}
 
  # Number of elements kept in the cache
  # Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database.
@@ -16,7 +16,7 @@ clair:
  # Deadline before an API request will respond with a 503
  timeout: 300s
  updater:
- interval: {{interval}}h
+ interval: {{clair_updaters_interval}}h
 
  notifier:
  attempts: 3

make/photon/prepare/templates/clair/postgres_env.jinja

@@ -1 +1 @@
-POSTGRES_PASSWORD={{password}}
+POSTGRES_PASSWORD={{clair_db_password}}

make/photon/prepare/templates/core/env.jinja

@@ -9,12 +9,12 @@ PORT=8080
 LOG_LEVEL={{log_level}}
 EXT_ENDPOINT={{public_url}}
 DATABASE_TYPE=postgresql
-POSTGRESQL_HOST={{db_host}}
-POSTGRESQL_PORT={{db_port}}
-POSTGRESQL_USERNAME={{db_user}}
-POSTGRESQL_PASSWORD={{db_password}}
-POSTGRESQL_DATABASE=registry
-POSTGRESQL_SSLMODE=disable
+POSTGRESQL_HOST={{harbor_db_host}}
+POSTGRESQL_PORT={{harbor_db_port}}
+POSTGRESQL_USERNAME={{harbor_db_username}}
+POSTGRESQL_PASSWORD={{harbor_db_password}}
+POSTGRESQL_DATABASE={{harbor_db_name}}
+POSTGRESQL_SSLMODE={{harbor_db_sslmode}}
 REGISTRY_URL={{registry_url}}
 TOKEN_SERVICE_URL={{token_service_url}}
 HARBOR_ADMIN_PASSWORD={{harbor_admin_password}}
@@ -24,12 +24,12 @@ JOBSERVICE_SECRET={{jobservice_secret}}
 ADMIRAL_URL={{admiral_url}}
 WITH_NOTARY={{with_notary}}
 WITH_CLAIR={{with_clair}}
-CLAIR_DB_PASSWORD={{db_password}}
-CLAIR_DB_HOST={{db_host}}
-CLAIR_DB_PORT={{db_port}}
-CLAIR_DB_USERNAME={{db_user}}
-CLAIR_DB={{clair_db}}
-CLAIR_DB_SSLMODE=disable
+CLAIR_DB_PASSWORD={{clair_db_password}}
+CLAIR_DB_HOST={{clair_db_host}}
+CLAIR_DB_PORT={{clair_db_port}}
+CLAIR_DB_USERNAME={{clair_db_username}}
+CLAIR_DB={{clair_db_name}}
+CLAIR_DB_SSLMODE={{clair_db_sslmode}}
 CORE_URL={{core_url}}
 JOBSERVICE_URL={{jobservice_url}}
 CLAIR_URL={{clair_url}}

make/photon/prepare/templates/db/env.jinja

@@ -1 +1 @@
-POSTGRES_PASSWORD={{db_password}}
+POSTGRES_PASSWORD={{harbor_db_password}}

make/photon/prepare/templates/notary/server-config.postgres.json.jinja

@@ -14,7 +14,7 @@
 },
 "storage": {
 "backend": "postgres",
-"db_url": "postgres://server:password@postgresql:5432/notaryserver?sslmode=disable"
+"db_url": "postgres://{{notary_server_db_username}}:{{notary_server_db_password}}@{{notary_server_db_host}}:{{notary_server_db_port}}/{{notary_server_db_name}}?sslmode={{notary_server_db_sslmode}}"
  },
  "auth": {
  "type": "token",

make/photon/prepare/templates/notary/server_env.jinja

@@ -1,2 +1,2 @@
 MIGRATIONS_PATH=migrations/server/postgresql
-DB_URL=postgres://server:password@postgresql:5432/notaryserver?sslmode=disable
+DB_URL=postgres://{{notary_server_db_username}}:{{notary_server_db_password}}@{{notary_server_db_host}}:{{notary_server_db_port}}/{{notary_server_db_name}}?sslmode={{notary_server_db_sslmode}}

make/photon/prepare/templates/notary/signer-config.postgres.json.jinja

@@ -9,7 +9,7 @@
 },
  "storage": {
  "backend": "postgres",
- "db_url": "postgres://signer:password@postgresql:5432/notarysigner?sslmode=disable",
- "default_alias":"defaultalias"
+"db_url": "postgres://{{notary_signer_db_username}}:{{notary_signer_db_password}}@{{notary_signer_db_host}}:{{notary_signer_db_port}}/{{notary_signer_db_name}}?sslmode={{notary_signer_db_sslmode}}",
+ "default_alias": "{{alias}}"
  }
 } 

make/photon/prepare/templates/notary/signer_env.jinja

@@ -1,3 +1,3 @@
 NOTARY_SIGNER_DEFAULTALIAS={{alias}}
 MIGRATIONS_PATH=migrations/signer/postgresql
-DB_URL=postgres://signer:password@postgresql:5432/notarysigner?sslmode=disable
+DB_URL=postgres://{{notary_signer_db_username}}:{{notary_signer_db_password}}@{{notary_signer_db_host}}:{{notary_signer_db_port}}/{{notary_signer_db_name}}?sslmode={{notary_signer_db_sslmode}}

make/photon/prepare/utils/clair.py

@@ -27,19 +27,14 @@ def prepare_clair(config_dict):
  render_jinja(
  postgres_env_template,
  postgres_env_path,
- password=config_dict['db_password'])
+ **config_dict)
 
  render_jinja(
  clair_config_template,
  clair_config_path,
  uid=DEFAULT_UID,
  gid=DEFAULT_GID,
- password= config_dict['db_password'],
- username= config_dict['db_user'],
- host= config_dict['db_host'],
- port= config_dict['db_port'],
- dbname= config_dict['clair_db'],
- interval= config_dict['clair_updaters_interval'])
+ **config_dict)
 
  # config http proxy for Clair
  render_jinja(