From f43db4c5f24eda98af762d424189537bde7da3da Mon Sep 17 00:00:00 2001 From: Lasha Kakabadze Date: Mon, 4 Sep 2023 10:58:31 +0400 Subject: [PATCH 1/5] change platform variable names --- .../src/components/DbLabInstanceForm/utils/index.tsx | 12 ++++++------ .../DbLabInstanceInstallForm/utils/index.ts | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx b/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx index 9fefb3db2..24d0e1bac 100644 --- a/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx +++ b/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx @@ -51,10 +51,10 @@ export const getPlaybookCommand = ( dle_verification_token='${state.verificationToken}' \\\r dle_version='${state.tag}' \\\r ${ state.snapshots > 1 ? `zpool_datasets_number='${state.snapshots}' \\\r` : `` } - ${ orgKey ? `dle_platform_org_key='${orgKey}' \\\r` : `` } - ${ API_SERVER === DEBUG_API_SERVER ? `dle_platform_url='${DEBUG_API_SERVER}' \\\r` : `` } + ${ orgKey ? `platform_org_key='${orgKey}' \\\r` : `` } + ${ API_SERVER === DEBUG_API_SERVER ? `platform_url='${DEBUG_API_SERVER}' \\\r` : `` } ${state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : ``} - dle_platform_project_name='${state.name}'"` + platform_project_name='${state.name}'"` export const getPlaybookCommandWithoutDocker = ( state: typeof initialState, @@ -73,14 +73,14 @@ export const getPlaybookCommandWithoutDocker = ( ${ state.snapshots > 1 ? `zpool_datasets_number='${state.snapshots}' \\\r` : `` } - ${orgKey ? `dle_platform_org_key='${orgKey}' \\\r` : ``} + ${orgKey ? `platform_org_key='${orgKey}' \\\r` : ``} ${ API_SERVER === DEBUG_API_SERVER - ? `dle_platform_url='${DEBUG_API_SERVER}' \\\r` + ? `platform_url='${DEBUG_API_SERVER}' \\\r` : `` } ${state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : ``} - dle_platform_project_name='${state.name}'"` + platform_project_name='${state.name}'"` export const getGcpAccountContents = () => `export GCP_SERVICE_ACCOUNT_CONTENTS='{ diff --git a/ui/packages/platform/src/components/DbLabInstanceInstallForm/utils/index.ts b/ui/packages/platform/src/components/DbLabInstanceInstallForm/utils/index.ts index 81bca541b..905549686 100644 --- a/ui/packages/platform/src/components/DbLabInstanceInstallForm/utils/index.ts +++ b/ui/packages/platform/src/components/DbLabInstanceInstallForm/utils/index.ts @@ -13,10 +13,10 @@ export const getPlaybookCommand = ( postgresai/dle-se-ansible:${sePackageTag} \\\r ansible-playbook deploy_dle.yml --extra-vars \\\r "dle_host='user@server-ip-address' \\\r - dle_platform_project_name='${state.name}' \\\r + platform_project_name='${state.name}' \\\r dle_version='${state.tag}' \\\r - ${ orgKey ? `dle_platform_org_key='${orgKey}' \\\r` : `` } - ${ API_SERVER === DEBUG_API_SERVER ? `dle_platform_url='${DEBUG_API_SERVER}' \\\r` : `` } + ${ orgKey ? `platform_org_key='${orgKey}' \\\r` : `` } + ${ API_SERVER === DEBUG_API_SERVER ? `platform_url='${DEBUG_API_SERVER}' \\\r` : `` } ${ state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : `` } dle_verification_token='${state.verificationToken}'" ` @@ -27,12 +27,12 @@ export const getAnsiblePlaybookCommand = ( ) => `ansible-playbook deploy_dle.yml --extra-vars \\\r "dle_host='user@server-ip-address' \\\r - dle_platform_project_name='${state.name}' \\\r + platform_project_name='${state.name}' \\\r dle_version='${state.tag}' \\\r - ${orgKey ? `dle_platform_org_key='${orgKey}' \\\r` : ``} + ${orgKey ? `platform_org_key='${orgKey}' \\\r` : ``} ${ API_SERVER === DEBUG_API_SERVER - ? `dle_platform_url='${DEBUG_API_SERVER}' \\\r` + ? `platform_url='${DEBUG_API_SERVER}' \\\r` : `` } ${state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : ``} -- GitLab From eef5539ce02bb0bdc85d1d0f4912d981ff3411e6 Mon Sep 17 00:00:00 2001 From: Lasha Kakabadze Date: Mon, 4 Sep 2023 11:02:08 +0400 Subject: [PATCH 2/5] update dle variable names --- .../src/components/DbLabInstanceForm/utils/index.tsx | 8 ++++---- .../DbLabInstanceInstallForm/utils/index.ts | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx b/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx index 24d0e1bac..36d1250a2 100644 --- a/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx +++ b/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx @@ -48,8 +48,8 @@ export const getPlaybookCommand = ( server_image='${cloudImages?.native_os_image}' \\\r server_location='${state.location.native_code}' \\\r volume_size='${state.storage}' \\\r - dle_verification_token='${state.verificationToken}' \\\r - dle_version='${state.tag}' \\\r + dblab_engine_verification_token='${state.verificationToken}' \\\r + dblab_engine_version='${state.tag}' \\\r ${ state.snapshots > 1 ? `zpool_datasets_number='${state.snapshots}' \\\r` : `` } ${ orgKey ? `platform_org_key='${orgKey}' \\\r` : `` } ${ API_SERVER === DEBUG_API_SERVER ? `platform_url='${DEBUG_API_SERVER}' \\\r` : `` } @@ -68,8 +68,8 @@ export const getPlaybookCommandWithoutDocker = ( server_image='${cloudImages?.native_os_image}' \\\r server_location='${state.location.native_code}' \\\r volume_size='${state.storage}' \\\r - dle_verification_token='${state.verificationToken}' \\\r - dle_version='${state.tag}' \\\r + dblab_engine_verification_token='${state.verificationToken}' \\\r + dblab_engine_version='${state.tag}' \\\r ${ state.snapshots > 1 ? `zpool_datasets_number='${state.snapshots}' \\\r` : `` } diff --git a/ui/packages/platform/src/components/DbLabInstanceInstallForm/utils/index.ts b/ui/packages/platform/src/components/DbLabInstanceInstallForm/utils/index.ts index 905549686..8c1f81ffa 100644 --- a/ui/packages/platform/src/components/DbLabInstanceInstallForm/utils/index.ts +++ b/ui/packages/platform/src/components/DbLabInstanceInstallForm/utils/index.ts @@ -12,13 +12,13 @@ export const getPlaybookCommand = ( --env ANSIBLE_SSH_ARGS="-F none" \\\r postgresai/dle-se-ansible:${sePackageTag} \\\r ansible-playbook deploy_dle.yml --extra-vars \\\r - "dle_host='user@server-ip-address' \\\r + "dblab_engine_host='user@server-ip-address' \\\r platform_project_name='${state.name}' \\\r - dle_version='${state.tag}' \\\r + dblab_engine_version='${state.tag}' \\\r ${ orgKey ? `platform_org_key='${orgKey}' \\\r` : `` } ${ API_SERVER === DEBUG_API_SERVER ? `platform_url='${DEBUG_API_SERVER}' \\\r` : `` } ${ state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : `` } - dle_verification_token='${state.verificationToken}'" + dblab_engine_verification_token='${state.verificationToken}'" ` export const getAnsiblePlaybookCommand = ( @@ -26,9 +26,9 @@ export const getAnsiblePlaybookCommand = ( orgKey: string, ) => `ansible-playbook deploy_dle.yml --extra-vars \\\r - "dle_host='user@server-ip-address' \\\r + "dblab_engine_host='user@server-ip-address' \\\r platform_project_name='${state.name}' \\\r - dle_version='${state.tag}' \\\r + dblab_engine_version='${state.tag}' \\\r ${orgKey ? `platform_org_key='${orgKey}' \\\r` : ``} ${ API_SERVER === DEBUG_API_SERVER @@ -36,7 +36,7 @@ export const getAnsiblePlaybookCommand = ( : `` } ${state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : ``} - dle_verification_token='${state.verificationToken}'" + dblab_engine_verification_token='${state.verificationToken}'" ` export const getAnsibleInstallationCommand = () => -- GitLab From b217c27bba9ce0711f37747b572c15dfeb33838e Mon Sep 17 00:00:00 2001 From: Lasha Kakabadze Date: Tue, 3 Oct 2023 16:53:27 +0100 Subject: [PATCH 3/5] update image tag --- .../platform/src/components/DbLabInstanceForm/utils/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx b/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx index 36d1250a2..3cf79a0ac 100644 --- a/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx +++ b/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx @@ -7,7 +7,7 @@ export const DEBUG_API_SERVER = 'https://v2.postgres.ai/api/general' export const availableTags = ['3.4.0', '4.0.0-alpha.6'] -export const sePackageTag = 'v1.0-rc.8' +export const sePackageTag = 'v1.0-rc.9' export const dockerRunCommand = (provider: string) => { /* eslint-disable no-template-curly-in-string */ -- GitLab From 2d8570831b9e543f76d6f9802584c99682ce4030 Mon Sep 17 00:00:00 2001 From: Lasha Kakabadze Date: Tue, 3 Oct 2023 18:17:27 +0100 Subject: [PATCH 4/5] update and reuse image tag for snippet --- ui/packages/platform/src/api/configs/launchDeploy.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/packages/platform/src/api/configs/launchDeploy.ts b/ui/packages/platform/src/api/configs/launchDeploy.ts index e939a2ef6..f6cb22762 100644 --- a/ui/packages/platform/src/api/configs/launchDeploy.ts +++ b/ui/packages/platform/src/api/configs/launchDeploy.ts @@ -1,6 +1,6 @@ import { simpleInstallRequest } from 'helpers/simpleInstallRequest' import { initialState } from 'components/DbLabInstanceForm/reducer' -import { DEBUG_API_SERVER } from 'components/DbLabInstanceForm/utils' +import { DEBUG_API_SERVER, sePackageTag } from 'components/DbLabInstanceForm/utils' const API_SERVER = process.env.REACT_APP_API_SERVER @@ -41,7 +41,7 @@ export const launchDeploy = async ({ image: cloudImage, location: state.location.native_code, }, - image: 'postgresai/dle-se-ansible:v1.0-rc.8', + image: `postgresai/dle-se-ansible:${sePackageTag}`, extraVars: [ `provision=${state.provider}`, `server_name=${state.name}`, -- GitLab From 09dc8cdfcf345d60a671efe960ffec1786fd8153 Mon Sep 17 00:00:00 2001 From: Lasha Kakabadze Date: Tue, 3 Oct 2023 20:12:04 +0100 Subject: [PATCH 5/5] update simple instance variable names --- ui/packages/platform/src/api/configs/launchDeploy.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/packages/platform/src/api/configs/launchDeploy.ts b/ui/packages/platform/src/api/configs/launchDeploy.ts index f6cb22762..6b3b04b41 100644 --- a/ui/packages/platform/src/api/configs/launchDeploy.ts +++ b/ui/packages/platform/src/api/configs/launchDeploy.ts @@ -45,21 +45,21 @@ export const launchDeploy = async ({ extraVars: [ `provision=${state.provider}`, `server_name=${state.name}`, - `dle_platform_project_name=${state.name}`, + `platform_project_name=${state.name}`, `server_type=${state.instanceType.native_name}`, `server_image=${cloudImage}`, `server_location=${state.location.native_code}`, `volume_size=${state.storage}`, - `dle_version=${state.tag}`, + `dblab_engine_version=${state.tag}`, `zpool_datasets_number=${state.snapshots}`, - `dle_verification_token=${state.verificationToken}`, - `dle_platform_org_key=${orgKey}`, + `dblab_engine_verification_token=${state.verificationToken}`, + `platform_org_key=${orgKey}`, ...(state.publicKeys ? // eslint-disable-next-line no-useless-escape [`ssh_public_keys=\"${state.publicKeys}\"`] : []), ...(API_SERVER === DEBUG_API_SERVER - ? [`dle_platform_url=https://v2.postgres.ai/api/general`] + ? [`platform_url=https://v2.postgres.ai/api/general`] : []), ], extraEnvs: formatExtraEnvs(extraEnvs), -- GitLab