Skip to content
This repository was archived by the owner on Jan 28, 2022. It is now read-only.

Commit bc604f4

Browse files
update build and clean up (#134)
* update build and clean up
1 parent 282291b commit bc604f4

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ install-kustomize:
182182
ifeq (,$(shell which kustomize))
183183
@echo "installing kustomize"
184184
# download kustomize
185-
#curl -o /usr/local/kubebuilder/bin/kustomize -sL "https://go.kubebuilder.io/kustomize/$(shell go env GOOS)/$(shell go env GOARCH)"
186-
curl -sL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv3.4.0/kustomize_v3.4.0_linux_amd64.tar.gz | tar -xz -C /tmp/
185+
curl -sL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv3.4.0/kustomize_v3.4.0_$(shell go env GOOS)_$(shell go env GOARCH).tar.gz | tar -xz -C /tmp/
187186
mv /tmp/kustomize /usr/local/kubebuilder/bin/kustomize
188187
# set permission
189188
chmod a+x /usr/local/kubebuilder/bin/kustomize

azure-pipelines.yaml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,14 @@ steps:
2424

2525
- script: |
2626
set -x
27-
2827
ls -l /usr/local/go*
29-
3028
mkdir -p '$(GOBIN)'
3129
mkdir -p '$(GOPATH)/pkg'
3230
mkdir -p '$(MODULE_PATH)'
3331
shopt -s extglob
3432
mv !(gopath) '$(MODULE_PATH)'
3533
echo '##vso[task.prependpath]$(GOBIN)'
3634
echo '##vso[task.prependpath]$(GOROOT)/bin'
37-
3835
go version
3936
go env
4037
displayName: 'Set up the Go workspace'
@@ -43,17 +40,15 @@ steps:
4340

4441
- script: |
4542
set -x
46-
4743
mkdir -p '$(MODULE_PATH)/bin'
48-
4944
os=$(go env GOOS)
5045
arch=$(go env GOARCH)
51-
5246
# download kubebuilder
53-
curl -sL https://go.kubebuilder.io/dl/2.0.0-alpha.4/${os}/${arch} | tar -xz -C $(MODULE_PATH)/bin
54-
mv $(MODULE_PATH)/bin/kubebuilder_2.0.0-alpha.4_${os}_${arch}/bin/* $(MODULE_PATH)/bin/
47+
curl -sL https://go.kubebuilder.io/dl/2.2.0/${os}/${arch} | tar -xz -C $(MODULE_PATH)/bin
48+
mv $(MODULE_PATH)/bin/kubebuilder_2.2.0_${os}_${arch}/bin/* $(MODULE_PATH)/bin/
5549
# download kustomize
56-
curl -o $(MODULE_PATH)/bin/kustomize -sL https://go.kubebuilder.io/kustomize/${os}/${arch}
50+
curl -sL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv3.4.0/kustomize_v3.4.0_${os}_${arch}.tar.gz | tar -xz -C /tmp/
51+
mv /tmp/kustomize $(MODULE_PATH)/bin/kustomize
5752
# set permission
5853
chmod a+x $(MODULE_PATH)/bin/*
5954
# export path
@@ -62,10 +57,7 @@ steps:
6257
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.21.0
6358
# install test dependencies
6459
go mod download
65-
go get -u github.com/axw/gocov/gocov
66-
go get -u golang.org/x/tools/cmd/cover
67-
go get -u github.com/AlekSi/gocov-xml
68-
go get -u github.com/matm/gocov-html
60+
make install-test-dependency
6961
# run test
7062
make test
7163
continueOnError: 'false'

config/samples/databricks_v1alpha1_djob.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
new_cluster:
99
spark_version: 5.3.x-scala2.11
1010
node_type_id: Standard_D3_v2
11-
num_workers: 10
11+
num_workers: 3
1212
libraries:
1313
- jar: 'dbfs:/my-jar.jar'
1414
- maven:

config/samples/databricks_v1alpha1_run_direct.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spec:
77
new_cluster:
88
spark_version: 5.3.x-scala2.11
99
node_type_id: Standard_D3_v2
10-
num_workers: 10
10+
num_workers: 3
1111
libraries:
1212
- jar: 'dbfs:/my-jar.jar'
1313
- maven:

0 commit comments

Comments
 (0)