From 731f9563fd0e23aa1808f3b8639dfb1dd4c0e93b Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Mon, 9 Nov 2020 17:16:43 -0500 Subject: [PATCH] Ensure all files pass ci-non-go.sh checks. Signed-off-by: Manuel Mendez --- .github/workflows/vagrant-packet.yaml | 12 ++++++------ deploy/tls/ca-config.json | 11 +++++++++-- deploy/vagrant/scripts/tinkerbell.sh | 2 +- setup.sh | 4 ++-- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/vagrant-packet.yaml b/.github/workflows/vagrant-packet.yaml index 843b625..47b14d4 100644 --- a/.github/workflows/vagrant-packet.yaml +++ b/.github/workflows/vagrant-packet.yaml @@ -9,9 +9,9 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'ci-check/vagrant-setup') runs-on: vagrant steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Vagrant Test - run: | - export VAGRANT_DEFAULT_PROVIDER="virtualbox" - go test --timeout 1h -v ./test/_vagrant + - name: Checkout + uses: actions/checkout@v2 + - name: Vagrant Test + run: | + export VAGRANT_DEFAULT_PROVIDER="virtualbox" + go test --timeout 1h -v ./test/_vagrant diff --git a/deploy/tls/ca-config.json b/deploy/tls/ca-config.json index d6d666e..9c9e14d 100644 --- a/deploy/tls/ca-config.json +++ b/deploy/tls/ca-config.json @@ -6,11 +6,18 @@ "profiles": { "server": { "expiry": "8760h", - "usages": ["signing", "key encipherment", "server auth"] + "usages": [ + "signing", + "key encipherment", + "server auth" + ] }, "signing": { "expiry": "8760h", - "usages": ["signing", "key encipherment"] + "usages": [ + "signing", + "key encipherment" + ] } } } diff --git a/deploy/vagrant/scripts/tinkerbell.sh b/deploy/vagrant/scripts/tinkerbell.sh index 3c03f0c..803ca26 100644 --- a/deploy/vagrant/scripts/tinkerbell.sh +++ b/deploy/vagrant/scripts/tinkerbell.sh @@ -81,7 +81,7 @@ main() ( fi if [ ! -f ./.env ]; then - ./generate-envrc.sh eth1 > .env + ./generate-envrc.sh eth1 >.env fi # shellcheck disable=SC1091 diff --git a/setup.sh b/setup.sh index 9a097fb..db12b97 100755 --- a/setup.sh +++ b/setup.sh @@ -405,8 +405,8 @@ start_registry() ( bootstrap_docker_registry() ( docker_login - # osie looks for tink-worker:latest, so we have to play with it a bit - # https://github.com/tinkerbell/osie/blob/master/apps/workflow-helper.sh#L66 + # osie looks for tink-worker:latest, so we have to play with it a bit + # https://github.com/tinkerbell/osie/blob/master/apps/workflow-helper.sh#L66 docker_mirror_image "${TINKERBELL_TINK_WORKER_IMAGE}" "${TINKERBELL_HOST_IP}/tink-worker:latest" )