Skip to content

use origin-release images for tooling #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulfantom merged 4 commits into from
Sep 10, 2018
Merged

use origin-release images for tooling #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33e7383
use origin-release images for tooling
paulfantom Sep 10, 2018
0ff532b
remove debug
paulfantom Sep 10, 2018
c243004
use hacks in makefile
paulfantom Sep 10, 2018
d72b9e2
Update go-lint.sh
paulfantom Sep 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ integration:
go test -v sigs.k8s.io/cluster-api-provider-aws/test/integration

fmt:
hack/verify-gofmt.sh
hack/go-fmt.sh .
Copy link

@frobware frobware Sep 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is go-fmt different to go-vet w.r.t. passing ./.... One does, the other doesn't. Curious as to why.

Copy link
Author

@paulfantom paulfantom Sep 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea, that's how installer runs it.
All those scripts are created by guys from installer team, we just copy-pasted them.

Copy link
Member

@enxebre enxebre Sep 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You just need to look at the code of the script https://github.com/openshift/cluster-api-provider-aws/blob/master/hack/go-fmt.sh#L4 https://golang.org/cmd/gofmt/


vet:
go vet ./...
hack/go-vet.sh ./...
3 changes: 1 addition & 2 deletions hack/go-fmt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ else
--env IS_CONTAINER=TRUE \
--volume "${PWD}:/go/src/sigs.k8s.io/cluster-api-provider-aws:z" \
--workdir /go/src/sigs.k8s.io/cluster-api-provider-aws \
--entrypoint sh \
quay.io/coreos/golang-testing \
openshift/origin-release:golang-1.10 \
./hack/go-fmt.sh "${@}"
Copy link

@frobware frobware Sep 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why ${@} and not just "$@"?

Copy link
Author

@paulfantom paulfantom Sep 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ShellCheck says that both are valid.

fi
3 changes: 1 addition & 2 deletions hack/go-lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ else
--env IS_CONTAINER=TRUE \
--volume "${PWD}:/go/src/sigs.k8s.io/cluster-api-provider-aws:z" \
--workdir /go/src/sigs.k8s.io/cluster-api-provider-aws \
--entrypoint sh \
quay.io/coreos/golang-testing \
openshift/origin-release:golang-1.10 \
./hack/go-lint.sh "${@}"
fi
2 changes: 1 addition & 1 deletion hack/go-vet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ else
--env IS_CONTAINER=TRUE \
--volume "${PWD}:/go/src/sigs.k8s.io/cluster-api-provider-aws:z" \
--workdir /go/src/sigs.k8s.io/cluster-api-provider-aws \
quay.io/coreos/golang-testing \
openshift/origin-release:golang-1.10 \
./hack/go-vet.sh "${@}"
fi;