github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix passing AWS creds through Dapper 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 16fa128e96)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/6589/head
Brad Davidson 2022-11-28 18:16:43 +00:00 committed by Brad Davidson
parent 467a456c31
commit 060adae6e0
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.dapper
View File

@ -44,7 +44,7 @@ ARG SELINUX=true
ENV SELINUX $SELINUX
ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/k3s-io/k3s/.cache -v trivy-cache:/root/.cache/trivy
ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP GCLOUD_AUTH GITHUB_TOKEN GOLANG DEBUG
ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP AWS_SECRET_ACCESS_KEY AWS_ACCESS_KEY_ID GITHUB_TOKEN GOLANG DEBUG
ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy

2
scripts/build-upload
View File

@ -2,9 +2,11 @@
# Check for AWS Credentials
[ -n "$AWS_SECRET_ACCESS_KEY" ] || {
echo "AWS_SECRET_ACCESS_KEY is not set"
exit 0
}
[ -n "$AWS_ACCESS_KEY_ID" ] || {
echo "AWS_ACCESS_KEY_ID is not set"
exit 0
}

2
scripts/log-upload
View File

@ -2,9 +2,11 @@
# Check for AWS Credentials
[ -n "$AWS_SECRET_ACCESS_KEY" ] || {
echo "AWS_SECRET_ACCESS_KEY is not set"
exit 0
}
[ -n "$AWS_ACCESS_KEY_ID" ] || {
echo "AWS_ACCESS_KEY_ID is not set"
exit 0
}