You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2020/03/16 14:56:48 UTC
[incubator-dlab] branch odahu-integration updated:
[odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new c754988 [odahu-integration] Bugfix
c754988 is described below
commit c7549883508d4b6338dfda8730d5d17e98b974a6
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Mon Mar 16 16:56:33 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/scripts/deploy_dlab.py | 1 -
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 4 ++--
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 4 +++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_dlab.py b/infrastructure-provisioning/scripts/deploy_dlab.py
index d18a7ed..8bebb61 100644
--- a/infrastructure-provisioning/scripts/deploy_dlab.py
+++ b/infrastructure-provisioning/scripts/deploy_dlab.py
@@ -142,7 +142,6 @@ parser.add_argument('--billing_dataset_name', type=str, default='', help='Name o
' for billing')
parser.add_argument('--default_endpoint_name', type=str, default='local', help='Name of localhost provisioning service,'
'that created by default')
-parser.add_argument('--ssn_gcr_username', type=str, default='_json_key', help='Username for GCR authentication')
parser.add_argument('--ssn_gcr_creds', type=str, default='', help='Base64 encrypted json key for GCR authentication')
parser.add_argument('--conf_stepcerts_enabled', type=str, default='false', help='Enable or disable step certificates')
parser.add_argument('--conf_stepcerts_root_ca', type=str, default='', help='Step root CA')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index eca36a3..cb0bdd6 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -247,10 +247,10 @@ if __name__ == "__main__":
{"name": "deeplearning", "tag": "latest"},
{"name": "dataengine", "tag": "latest"},
{"name": "dataengine-service", "tag": "latest"}]
- params = "--hostname {} --keyfile {} --additional_config '{}' --os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {} --nexus_username {} --nexus_password {} --nexus_url {}". \
+ params = "--hostname {} --keyfile {} --additional_config '{}' --os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {} --gcr_creds {}". \
format(instance_hostname, ssn_conf['ssh_key_path'], json.dumps(additional_config),
os.environ['conf_os_family'], ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
- os.environ['conf_cloud_provider'], ssn_conf['region'], os.environ['nexus_username'], os.environ['nexus_password'], os.environ['ssn_nexus_url'])
+ os.environ['conf_cloud_provider'], ssn_conf['region'], os.environ['ssn_gcr_creds'])
try:
local("~/scripts/{}.py {}".format('configure_docker', params))
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 88d6f75..3bb6b96 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -28,6 +28,7 @@ import sys
from dlab.ssn_lib import *
import os
import time
+import base64
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
@@ -80,9 +81,10 @@ def add_china_repository(dlab_path):
sudo('sed -i "22i COPY general/files/os/debian/sources.list /etc/apt/sources.list" Dockerfile')
def login_in_gcr(gcr_creds):
+ decoded_creds = base64.b64decode(gcr_creds + "==")
try:
with open('/tmp/dlab-gcr-ro-sa.json', 'w') as f:
- f.write(json.dumps(gcr_creds))
+ f.write(json.dumps(decoded_creds))
sudo('cat /tmp/dlab-gcr-ro-sa.json | docker login -u _json_key --password-stdin https://gcr.io')
sudo('rm /tmp/dlab-gcr-ro-sa.json')
except Exception as err:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org