Skip to content

Commit

Permalink
Fix CI and minor typos, end white spaces deletion
Browse files Browse the repository at this point in the history
Signed-off-by: Sergio Arroutbi <[email protected]>
  • Loading branch information
sarroutbi committed Dec 12, 2023
1 parent e99b07c commit fde9742
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/helm/keylime/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 7 additions & 9 deletions util/awscli_util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<EOF
Expand Down Expand Up @@ -117,7 +117,7 @@ function awscli_launch() {
exit -1
fi
local instanceid=$(echo "${output}" | jq -r .Instances[0].InstanceId -)
aws ec2 create-tags --resources ${instanceid} --tags="Key=Name,Value=${vmname}-$$" >/dev/null 2>&1
aws ec2 create-tags --resources ${instanceid} --tags="Key=Name,Value=${vmname}-$$" >/dev/null 2>&1
echo ${instanceid}
return 0
}
Expand Down Expand Up @@ -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 <<EOF
ssh -i ${HOME}/.ssh/aws.pem ubuntu@${ipaddr} > /tmp/minikube-install.log 2>&1 <<EOF
curl https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 -o /tmp/minikube-linux-amd64
sudo mv /tmp/minikube-linux-amd64 /usr/local/bin/minikube
sudo chmod 755 /usr/local/bin/minikube
Expand Down Expand Up @@ -297,8 +297,8 @@ function awscli_access_minikube() {
echo "ERROR: failed to patch ${HOME}/.kube/config"
exit -1
fi


# we don't need to worry about cleaning up this connection,
# because the last step of any GH action is to remove the target VM itself.
echo "awscli_access_minikube: creating a ssh tunnel to ${ipaddr}"
Expand All @@ -318,5 +318,3 @@ function awscli_access_minikube() {
echo "awscli_access_minikube: SUCCESS after $((t1-t0)) seconds."
return 0
}


0 comments on commit fde9742

Please sign in to comment.