diff --git a/.github/workflows/awstest.yml b/.github/workflows/awstest.yml index acfa988..1040fea 100644 --- a/.github/workflows/awstest.yml +++ b/.github/workflows/awstest.yml @@ -53,7 +53,7 @@ jobs: - name: install and start minikube run: | . ./util/awscli_util.sh - awscli_install_minikube ${ipaddr} + awscli_start_minikube ${ipaddr} # --------------------------- # download minikube credentials and open port access diff --git a/build/helm/keylime/values.yaml b/build/helm/keylime/values.yaml index ee8ce99..0e7a8da 100644 --- a/build/helm/keylime/values.yaml +++ b/build/helm/keylime/values.yaml @@ -51,9 +51,9 @@ global: tenantName: "" # registrarName is the name of the secret to be used for the "cv_ca" folder for the registrar if generate is not true registrarName: "" - # verifierName is the name of the secret to be used for the "cv_ca" folder for the registrar if generate is not true + # verifierName is the name of the secret to be used for the "cv_ca" folder for the verifier if generate is not true verifierName: "" - # leave it empty, and new password, maintained accross multiple upgrades, will be generated + # leave it empty, and new password, maintained across multiple upgrades, will be generated password: "" # tpmCertStore manages the TPM cert store which is used for verifying the EK of the TPMs tpmCertStore: diff --git a/util/awscli_util.sh b/util/awscli_util.sh index 21aa8b4..3be41ae 100755 --- a/util/awscli_util.sh +++ b/util/awscli_util.sh @@ -51,19 +51,19 @@ function awscli_config() { echo "ERROR: AWS keypair secret undefined. Exiting." exit -1 fi - + if [[ "${AWS_ACCESS_KEY_ID}" == "" ]] then echo "ERROR: AWS access key ID undefined. Exiting." exit -1 fi - + if [[ "${AWS_ACCESS_KEY_SECRET}" == "" ]] then echo "ERROR: AWS secret undefined. Exiting." exit -1 fi - + # create ssh configuration and credentials mkdir ${HOME}/.ssh cat > ${HOME}/.ssh/config </dev/null 2>&1 + aws ec2 create-tags --resources ${instanceid} --tags="Key=Name,Value=${vmname}-$$" >/dev/null 2>&1 echo ${instanceid} return 0 } @@ -241,7 +241,7 @@ EOF fi # install and start minikube echo "awscli_start_minikube on ${ipaddr}: installing minikube" - ssh -i ${HOME}/.ssh/aws.pem ubuntu@${ipaddr} > /tmp/minikube-install.log 2>&1 < /tmp/minikube-install.log 2>&1 <