diff --git a/Makefile b/Makefile index 1928fd5..ef33723 100644 --- a/Makefile +++ b/Makefile @@ -182,8 +182,7 @@ install-kustomize: ifeq (,$(shell which kustomize)) @echo "installing kustomize" # download kustomize - #curl -o /usr/local/kubebuilder/bin/kustomize -sL "https://go.kubebuilder.io/kustomize/$(shell go env GOOS)/$(shell go env GOARCH)" - 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/ + 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/ mv /tmp/kustomize /usr/local/kubebuilder/bin/kustomize # set permission chmod a+x /usr/local/kubebuilder/bin/kustomize diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index dc95421..91809d1 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -24,9 +24,7 @@ steps: - script: | set -x - ls -l /usr/local/go* - mkdir -p '$(GOBIN)' mkdir -p '$(GOPATH)/pkg' mkdir -p '$(MODULE_PATH)' @@ -34,7 +32,6 @@ steps: mv !(gopath) '$(MODULE_PATH)' echo '##vso[task.prependpath]$(GOBIN)' echo '##vso[task.prependpath]$(GOROOT)/bin' - go version go env displayName: 'Set up the Go workspace' @@ -43,17 +40,15 @@ steps: - script: | set -x - mkdir -p '$(MODULE_PATH)/bin' - os=$(go env GOOS) arch=$(go env GOARCH) - # download kubebuilder - curl -sL https://go.kubebuilder.io/dl/2.0.0-alpha.4/${os}/${arch} | tar -xz -C $(MODULE_PATH)/bin - mv $(MODULE_PATH)/bin/kubebuilder_2.0.0-alpha.4_${os}_${arch}/bin/* $(MODULE_PATH)/bin/ + curl -sL https://go.kubebuilder.io/dl/2.2.0/${os}/${arch} | tar -xz -C $(MODULE_PATH)/bin + mv $(MODULE_PATH)/bin/kubebuilder_2.2.0_${os}_${arch}/bin/* $(MODULE_PATH)/bin/ # download kustomize - curl -o $(MODULE_PATH)/bin/kustomize -sL https://go.kubebuilder.io/kustomize/${os}/${arch} + 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/ + mv /tmp/kustomize $(MODULE_PATH)/bin/kustomize # set permission chmod a+x $(MODULE_PATH)/bin/* # export path @@ -62,10 +57,7 @@ steps: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.21.0 # install test dependencies go mod download - go get -u github.com/axw/gocov/gocov - go get -u golang.org/x/tools/cmd/cover - go get -u github.com/AlekSi/gocov-xml - go get -u github.com/matm/gocov-html + make install-test-dependency # run test make test continueOnError: 'false' diff --git a/config/samples/databricks_v1alpha1_djob.yaml b/config/samples/databricks_v1alpha1_djob.yaml index 86e2c2b..bb19b53 100644 --- a/config/samples/databricks_v1alpha1_djob.yaml +++ b/config/samples/databricks_v1alpha1_djob.yaml @@ -8,7 +8,7 @@ spec: new_cluster: spark_version: 5.3.x-scala2.11 node_type_id: Standard_D3_v2 - num_workers: 10 + num_workers: 3 libraries: - jar: 'dbfs:/my-jar.jar' - maven: diff --git a/config/samples/databricks_v1alpha1_run_direct.yaml b/config/samples/databricks_v1alpha1_run_direct.yaml index 274dd34..5132840 100644 --- a/config/samples/databricks_v1alpha1_run_direct.yaml +++ b/config/samples/databricks_v1alpha1_run_direct.yaml @@ -7,7 +7,7 @@ spec: new_cluster: spark_version: 5.3.x-scala2.11 node_type_id: Standard_D3_v2 - num_workers: 10 + num_workers: 3 libraries: - jar: 'dbfs:/my-jar.jar' - maven: