Skip to content

Commit aff94d6

Browse files
committed
Cleanup from previous repo
1 parent f62c182 commit aff94d6

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

build/cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
- 'GOOS=${_GOOS}'
3535
- 'GOARCH=${_GOARCH}'
3636
- 'VERSION=${TAG_NAME}'
37-
- name: "ubuntu"
37+
- name: "golang:1.10-stretch"
3838
args: ["bash", "build/test.sh"]
3939
env:
4040
- 'GOOS=${_GOOS}'

build/cloudbuild_local.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ steps:
4242
- 'GOOS=${_GOOS}'
4343
- 'GOARCH=${_GOARCH}'
4444
- 'VERSION=${TAG_NAME}'
45-
- name: "ubuntu"
45+
- name: "golang:1.10-stretch"
4646
args: ["bash", "build/test.sh"]
4747
env:
4848
- 'GOOS=${_GOOS}'

build/test.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

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

5-
export GOPATH=/tmp/go
5+
# Tests won't work on darwin
6+
if [ $GOOS = "linux" ]; then
7+
8+
export GOPATH=/go
69
mkdir -p $GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test/
710
cd $GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test/
811

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

2023
# Verify the controller-manager builds and the tests pass
21-
go install github.com/kubernetes-sigs/kubebuilder-test/cmd/controller-manager
2224
go build ./cmd/...
2325
go build ./pkg/...
2426
go test ./cmd/...
2527
go test ./pkg/...
28+
29+
fi

cmd/internal/codegen/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (apis *APIs) GetRules() []rbacv1.PolicyRule {
7373
}
7474

7575
type APIGroup struct {
76-
// Package is the name of the go package the api group is under - e.g. github.com/pwittrock/apiserver-helloworld/apis
76+
// Package is the name of the go package the api group is under - e.g. github.com/me/apiserver-helloworld/apis
7777
Package string
7878
// Domain is the domain portion of the group - e.g. k8s.io
7979
Domain string

docs/tools_user_guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ New API workflow:
1616
## Download the latest release
1717

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

21-
- Download the latest [release](https://github.com/pwittrock/kubebuilder/releases/)
21+
- Download the latest [release](https://github.com/kubernetes-sigs/kubebuilder/releases/)
2222
- Extract the tar and move the kubebuilder/ directory to `/usr/local` (or somewhere else on your path)
2323
- Add `/usr/local/kubebuilder/bin` to your path - `export PATH=$PATH:/usr/local/kubebuilder/bin`
2424
- Set environment variables for starting test control planes

test/scripts/build_kubebuilder.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ go install github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder-gen
88
go install github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder
99

1010
export VENDOR_KB=/tmp/vendorbin/vendor/github.com/kubernetes-sigs/kubebuilder
11+
1112
# Build vendor tar
1213
mkdir -p $VENDOR_KB/pkg/ || echo ""
1314
cp -r vendor/* /tmp/vendorbin/vendor/

0 commit comments

Comments
 (0)