You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/10/10 15:00:31 UTC
[incubator-dlab] branch DLAB-1158 updated: fixed typo
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new 35b3c50 fixed typo
35b3c50 is described below
commit 35b3c502a516aa93921ce253010971fe3bfc0e24
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Thu Oct 10 18:00:20 2019 +0300
fixed typo
---
.../terraform/aws/ssn-k8s/main/files/masters-user-data.sh | 2 +-
.../terraform/aws/ssn-k8s/main/files/workers-user-data.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh
index 079e987..866e238 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh
@@ -193,7 +193,7 @@ EOF
aws s3 cp s3://${k8s-bucket-name}/k8s/masters/join_command /tmp/join_command
aws s3 cp s3://${k8s-bucket-name}/k8s/masters/cert_key /tmp/cert_key
cert_key=$(cat /tmp/cert_key)
-token=$(cat /tmp/join_command | sed 's/--\+/\n/g' | grep "token ")
+token=$(cat /tmp/join_command | sed 's/--\+/\n/g' | grep "token " | awk '{print $2}')
hashes=$(cat /tmp/join_command | sed 's/--\+/\n/g' | grep "discovery-token-ca-cert-hash" | awk '{print $2}')
sed -i "s/NODE_NAME/$full_hostname/g" /tmp/node.yaml
sed -i "s/TOKEN/$token/g" /tmp/node.yaml
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/workers-user-data.sh b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/workers-user-data.sh
index f6c63cc..04a8f57 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/workers-user-data.sh
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/workers-user-data.sh
@@ -81,7 +81,7 @@ nodeRegistration:
name: NODE_NAME
EOF
aws s3 cp s3://${k8s-bucket-name}/k8s/masters/join_command /tmp/join_command
-token=$(cat /tmp/join_command | sed 's/--\+/\n/g' | grep "token ")
+token=$(cat /tmp/join_command | sed 's/--\+/\n/g' | grep "token " | awk '{print $2}')
hashes=$(cat /tmp/join_command | sed 's/--\+/\n/g' | grep "discovery-token-ca-cert-hash" | awk '{print $2}')
full_hostname=$(curl http://169.254.169.254/latest/meta-data/hostname)
sed -i "s/NODE_NAME/$full_hostname/g" /tmp/node.yaml
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org