Skip to content

Commit

Permalink
Cleanup from previous repo
Browse files Browse the repository at this point in the history
  • Loading branch information
pwittrock committed Mar 15, 2018
1 parent f62c182 commit aff94d6
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ steps:
- 'GOOS=${_GOOS}'
- 'GOARCH=${_GOARCH}'
- 'VERSION=${TAG_NAME}'
- name: "ubuntu"
- name: "golang:1.10-stretch"
args: ["bash", "build/test.sh"]
env:
- 'GOOS=${_GOOS}'
Expand Down
2 changes: 1 addition & 1 deletion build/cloudbuild_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ steps:
- 'GOOS=${_GOOS}'
- 'GOARCH=${_GOARCH}'
- 'VERSION=${TAG_NAME}'
- name: "ubuntu"
- name: "golang:1.10-stretch"
args: ["bash", "build/test.sh"]
env:
- 'GOOS=${_GOOS}'
Expand Down
8 changes: 6 additions & 2 deletions build/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

cp -r /workspace/_output/kubebuilder /tmp/kubebuilder/

export GOPATH=/tmp/go
# Tests won't work on darwin
if [ $GOOS = "linux" ]; then

export GOPATH=/go
mkdir -p $GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test/
cd $GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test/

Expand All @@ -18,8 +21,9 @@ kubebuilder create resource --group insect --version v1beta1 --kind Bee
kubebuilder create resource --group insect --version v1beta1 --kind Wasp

# Verify the controller-manager builds and the tests pass
go install github.com/kubernetes-sigs/kubebuilder-test/cmd/controller-manager
go build ./cmd/...
go build ./pkg/...
go test ./cmd/...
go test ./pkg/...

fi
2 changes: 1 addition & 1 deletion cmd/internal/codegen/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func (apis *APIs) GetRules() []rbacv1.PolicyRule {
}

type APIGroup struct {
// Package is the name of the go package the api group is under - e.g. github.com/pwittrock/apiserver-helloworld/apis
// Package is the name of the go package the api group is under - e.g. github.com/me/apiserver-helloworld/apis
Package string
// Domain is the domain portion of the group - e.g. k8s.io
Domain string
Expand Down
4 changes: 2 additions & 2 deletions docs/tools_user_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ New API workflow:
## Download the latest release

Make sure you downloaded and installed the latest release:
[here](https://github.com/pwittrock/kubebuilder/blob/master/docs/installing.md)
[here](https://github.com/kubernetes-sigs/kubebuilder/blob/master/docs/installing.md)

- Download the latest [release](https://github.com/pwittrock/kubebuilder/releases/)
- Download the latest [release](https://github.com/kubernetes-sigs/kubebuilder/releases/)
- Extract the tar and move the kubebuilder/ directory to `/usr/local` (or somewhere else on your path)
- Add `/usr/local/kubebuilder/bin` to your path - `export PATH=$PATH:/usr/local/kubebuilder/bin`
- Set environment variables for starting test control planes
Expand Down
1 change: 1 addition & 0 deletions test/scripts/build_kubebuilder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ go install github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder-gen
go install github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder

export VENDOR_KB=/tmp/vendorbin/vendor/github.com/kubernetes-sigs/kubebuilder

# Build vendor tar
mkdir -p $VENDOR_KB/pkg/ || echo ""
cp -r vendor/* /tmp/vendorbin/vendor/
Expand Down

0 comments on commit aff94d6

Please sign in to comment.