diff --git a/Jenkinsfile b/Jenkinsfile index 5ed04bc35..f7f28a6ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -62,7 +62,7 @@ pipeline { } } steps { - sh 'build/run make -j\$(nproc) mod' + sh 'build/run make -j\$(nproc) mod.check' sh 'build/run make -j\$(nproc) build.all' } } diff --git a/Makefile b/Makefile index e11638f75..57dffa54c 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,6 @@ SERVER_PACKAGES = $(GO_PROJECT)/cmd/rook $(GO_PROJECT)/cmd/rookflex # tests packages that will be compiled into binaries TEST_PACKAGES = $(GO_PROJECT)/tests/integration -LONGHAUL_TEST_PACKAGES = $(GO_PROJECT)/tests/longhaul # the root go project GO_PROJECT=github.com/rook/rook @@ -80,7 +79,6 @@ GO_LDFLAGS=$(LDFLAGS) GO_TAGS=$(TAGS) GO_TEST_PACKAGES=$(TEST_PACKAGES) -GO_LONGHAUL_TEST_PACKAGES=$(LONGHAUL_TEST_PACKAGES) GO_TEST_FLAGS=$(TESTFLAGS) GO_TEST_SUITE=$(SUITE) GO_TEST_FILTER=$(TESTFILTER) @@ -145,10 +143,11 @@ fmt: codegen: @build/codegen/codegen.sh -mod: go.mod +mod.check: go.mod.check mod.update: go.mod.update clean: + @$(MAKE) go.mod.clean @$(MAKE) -C images clean @rm -fr $(OUTPUT_DIR) $(WORK_DIR) @@ -162,7 +161,7 @@ csv-ceph: @cluster/olm/ceph/generate-rook-csv.sh $(CSV_VERSION) $(CSV_PLATFORM) $(ROOK_OP_VERSION) .PHONY: all build.common cross.build.parallel -.PHONY: build build.all install test check vet fmt codegen mod clean distclean prune +.PHONY: build build.all install test check vet fmt codegen mod.check clean distclean prune # ==================================================================================== # Help @@ -187,8 +186,9 @@ Targets: prune Prune cached artifacts. test Runs unit tests. test-integration Runs integration tests. - mod Check / Tidy current modules. + mod.check Check / Tidy current modules. mod.update Update all modules. + vendor.check Checks if vendor dependencies changed. vet Runs lint checks on go sources. Options: diff --git a/build/codegen/codegen.sh b/build/codegen/codegen.sh index 259c7ebbd..15af558eb 100755 --- a/build/codegen/codegen.sh +++ b/build/codegen/codegen.sh @@ -17,7 +17,7 @@ # shellcheck disable=SC2086,SC2089,SC2090 # Disables quote checks, which is needed because of the SED variable here. -KUBE_CODE_GEN_VERSION="kubernetes-1.17.1" +KUBE_CODE_GEN_VERSION="kubernetes-1.17.2" scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/build/makelib/golang.mk b/build/makelib/golang.mk index f0ad6420a..16723965b 100644 --- a/build/makelib/golang.mk +++ b/build/makelib/golang.mk @@ -124,7 +124,7 @@ go.init: go.build: @echo === go build $(PLATFORM) $(foreach p,$(GO_STATIC_PACKAGES),@CGO_ENABLED=0 $(GO) build -v -i -o $(GO_OUT_DIR)/$(lastword $(subst /, ,$(p)))$(GO_OUT_EXT) $(GO_STATIC_FLAGS) $(p)${\n}) - $(foreach p,$(GO_TEST_PACKAGES) $(GO_LONGHAUL_TEST_PACKAGES),@CGO_ENABLED=0 $(GO) test -v -i -c -o $(GO_TEST_OUTPUT)/$(lastword $(subst /, ,$(p)))$(GO_OUT_EXT) $(GO_STATIC_FLAGS) $(p)${\n}) + $(foreach p,$(GO_TEST_PACKAGES),@CGO_ENABLED=0 $(GO) test -v -i -c -o $(GO_TEST_OUTPUT)/$(lastword $(subst /, ,$(p)))$(GO_OUT_EXT) $(GO_STATIC_FLAGS) $(p)${\n}) .PHONY: go.install go.install: @@ -163,15 +163,21 @@ go.fmt: $(GOFMT) go.validate: go.vet go.fmt -.PHONY: go.mod -go.mod: $(DEP) +.PHONY: go.mod.update +go.mod.update: + @echo === updating modules + @$(GOHOST) get -u ./... + +.PHONY: go.mod.check +go.mod.check: @echo === ensuring modules are tidied @$(GOHOST) mod tidy -.PHONY: go.mod.update -go.mod.update: $(DEP) - @echo === updating modules - @$(GOHOST) get -u ./... +.PHONY: go.mod.clean +go.mod.clean: + @echo === cleaning modules cache + @sudo rm -fr $(WORK_DIR)/cross_pkg + @$(GOHOST) clean -modcache $(GOLINT): @echo === installing golint @@ -190,4 +196,4 @@ $(GOJUNIT): @echo === installing go-junit-report @mkdir -p $(TOOLS_HOST_DIR)/tmp @GOPATH=$(TOOLS_HOST_DIR)/tmp GOBIN=$(TOOLS_HOST_DIR) $(GOHOST) get github.com/jstemmer/go-junit-report - @rm -fr $(TOOLS_HOST_DIR)/tmp + @$(GOHOST) clean -modcache diff --git a/build/release/README.md b/build/release/README.md index 293ff3252..0b6985226 100644 --- a/build/release/README.md +++ b/build/release/README.md @@ -21,7 +21,7 @@ The maintainers have the responsibility of ensuring this criteria is met. * All issues in the project board are in the "Done" column, with the exception of issues we are planning to include in a possible upcoming minor release. * Pending release notes have been authored and cover all notable features and changes in the release. * Codebase Hygiene - * Dependencies in the vendor tree as well as the vendor lock file are up to date (`make mod`). + * Dependencies in the `go.mod` file as well as the `go.sum` file are up to date (`make mod.check`). * Generated code is up to date and in sync with the types in each API group (`make codegen`). * Documentation * The Quickstart guides for each storage provider have been tested thoroughly and completely. diff --git a/go.mod b/go.mod index 867875aa9..ad0ece99b 100644 --- a/go.mod +++ b/go.mod @@ -25,13 +25,13 @@ require ( github.com/stretchr/testify v1.4.0 github.com/yanniszark/go-nodetool v0.0.0-20191206125106-cd8f91fa16be gopkg.in/ini.v1 v1.51.1 // indirect - k8s.io/api v0.17.3 + k8s.io/api v0.17.2 k8s.io/apiextensions-apiserver v0.15.7 - k8s.io/apimachinery v0.17.3 - k8s.io/apiserver v0.17.3 + k8s.io/apimachinery v0.17.2 + k8s.io/apiserver v0.17.2 k8s.io/client-go v12.0.0+incompatible k8s.io/kube-controller-manager v0.0.0 - k8s.io/kubernetes v1.17.1 + k8s.io/kubernetes v1.17.2 k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 sigs.k8s.io/controller-runtime v0.4.0 sigs.k8s.io/sig-storage-lib-external-provisioner v4.1.0+incompatible @@ -40,28 +40,28 @@ require ( // This looks "horrible", but is due to the Rook including k8s.io/kubernetes directly which is not recommended, // ee https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505725449 replace ( - k8s.io/api => k8s.io/api v0.17.0 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.0 - k8s.io/apimachinery => k8s.io/apimachinery v0.17.0 - k8s.io/apiserver => k8s.io/apiserver v0.17.0 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.0 - k8s.io/client-go => k8s.io/client-go v0.17.0 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.0 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.0 - k8s.io/code-generator => k8s.io/code-generator v0.17.0 - k8s.io/component-base => k8s.io/component-base v0.17.3 - k8s.io/cri-api => k8s.io/cri-api v0.17.0 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.0 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.0 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.0 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.0 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.0 - k8s.io/kubectl => k8s.io/kubectl v0.17.0 - k8s.io/kubelet => k8s.io/kubelet v0.17.0 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.0 - k8s.io/metrics => k8s.io/metrics v0.17.0 - k8s.io/node-api => k8s.io/node-api v0.17.0 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.0 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.0 - k8s.io/sample-controller => k8s.io/sample-controller v0.17.0 + k8s.io/api => k8s.io/api v0.17.2 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.2 + k8s.io/apimachinery => k8s.io/apimachinery v0.17.2 + k8s.io/apiserver => k8s.io/apiserver v0.17.2 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.2 + k8s.io/client-go => k8s.io/client-go v0.17.2 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.2 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.2 + k8s.io/code-generator => k8s.io/code-generator v0.17.2 + k8s.io/component-base => k8s.io/component-base v0.17.2 + k8s.io/cri-api => k8s.io/cri-api v0.17.2 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.2 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.2 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.2 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.2 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.2 + k8s.io/kubectl => k8s.io/kubectl v0.17.2 + k8s.io/kubelet => k8s.io/kubelet v0.17.2 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.2 + k8s.io/metrics => k8s.io/metrics v0.17.2 + k8s.io/node-api => k8s.io/node-api v0.17.2 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.2 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.2 + k8s.io/sample-controller => k8s.io/sample-controller v0.17.2 ) diff --git a/go.sum b/go.sum index b66681b88..0dc5e36b2 100644 --- a/go.sum +++ b/go.sum @@ -894,25 +894,25 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -k8s.io/api v0.17.0 h1:H9d/lw+VkZKEVIUc8F3wgiQ+FUXTTr21M87jXLU7yqM= -k8s.io/api v0.17.0/go.mod h1:npsyOePkeP0CPwyGfXDHxvypiYMJxBWAMpQxCaJ4ZxI= -k8s.io/apiextensions-apiserver v0.17.0 h1:+XgcGxqaMztkbbvsORgCmHIb4uImHKvTjNyu7b8gRnA= -k8s.io/apiextensions-apiserver v0.17.0/go.mod h1:XiIFUakZywkUl54fVXa7QTEHcqQz9HG55nHd1DCoHj8= -k8s.io/apimachinery v0.17.0 h1:xRBnuie9rXcPxUkDizUsGvPf1cnlZCFu210op7J7LJo= -k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= -k8s.io/apiserver v0.17.0 h1:XhUix+FKFDcBygWkQNp7wKKvZL030QUlH1o8vFeSgZA= -k8s.io/apiserver v0.17.0/go.mod h1:ABM+9x/prjINN6iiffRVNCBR2Wk7uY4z+EtEGZD48cg= -k8s.io/cli-runtime v0.17.0/go.mod h1:1E5iQpMODZq2lMWLUJELwRu2MLWIzwvMgDBpn3Y81Qo= -k8s.io/client-go v0.17.0 h1:8QOGvUGdqDMFrm9sD6IUFl256BcffynGoe80sxgTEDg= -k8s.io/client-go v0.17.0/go.mod h1:TYgR6EUHs6k45hb6KWjVD6jFZvJV4gHDikv/It0xz+k= -k8s.io/cloud-provider v0.17.0 h1:BQZPD1Ja/vnTOj1GKI9/wSpd3qgIDZp9q2NAS3568Ac= -k8s.io/cloud-provider v0.17.0/go.mod h1:Ze4c3w2C0bRsjkBUoHpFi+qWe3ob1wI2/7cUn+YQIDE= -k8s.io/cluster-bootstrap v0.17.0/go.mod h1:KnxktBWGyKlBDaHLC8zzu0EPt/HJ9Lcs7bNM2WvUHSs= -k8s.io/code-generator v0.17.0/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= -k8s.io/component-base v0.17.3 h1:hQzTSshY14aLSR6WGIYvmw+w+u6V4d+iDR2iDGMrlUg= -k8s.io/component-base v0.17.3/go.mod h1:GeQf4BrgelWm64PXkIXiPh/XS0hnO42d9gx9BtbZRp8= -k8s.io/cri-api v0.17.0/go.mod h1:BzAkbBHHp81d+aXzbiIcUbilLkbXa40B8mUHOk6EX3s= -k8s.io/csi-translation-lib v0.17.0/go.mod h1:HEF7MEz7pOLJCnxabi45IPkhSsE/KmxPQksuCrHKWls= +k8s.io/api v0.17.2 h1:NF1UFXcKN7/OOv1uxdRz3qfra8AHsPav5M93hlV9+Dc= +k8s.io/api v0.17.2/go.mod h1:BS9fjjLc4CMuqfSO8vgbHPKMt5+SF0ET6u/RVDihTo4= +k8s.io/apiextensions-apiserver v0.17.2 h1:cP579D2hSZNuO/rZj9XFRzwJNYb41DbNANJb6Kolpss= +k8s.io/apiextensions-apiserver v0.17.2/go.mod h1:4KdMpjkEjjDI2pPfBA15OscyNldHWdBCfsWMDWAmSTs= +k8s.io/apimachinery v0.17.2 h1:hwDQQFbdRlpnnsR64Asdi55GyCaIP/3WQpMmbNBeWr4= +k8s.io/apimachinery v0.17.2/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= +k8s.io/apiserver v0.17.2 h1:NssVvPALll6SSeNgo1Wk1h2myU1UHNwmhxV0Oxbcl8Y= +k8s.io/apiserver v0.17.2/go.mod h1:lBmw/TtQdtxvrTk0e2cgtOxHizXI+d0mmGQURIHQZlo= +k8s.io/cli-runtime v0.17.2/go.mod h1:aa8t9ziyQdbkuizkNLAw3qe3srSyWh9zlSB7zTqRNPI= +k8s.io/client-go v0.17.2 h1:ndIfkfXEGrNhLIgkr0+qhRguSD3u6DCmonepn1O6NYc= +k8s.io/client-go v0.17.2/go.mod h1:QAzRgsa0C2xl4/eVpeVAZMvikCn8Nm81yqVx3Kk9XYI= +k8s.io/cloud-provider v0.17.2 h1:5JVAaJ3JIlaXlOqAX/LkdnXPl1UlcjHMPbepo8LFcyo= +k8s.io/cloud-provider v0.17.2/go.mod h1:9rEcGqEsUFHxC83oMUGBcsXTBpRVNVPX/U+nyQJTvHU= +k8s.io/cluster-bootstrap v0.17.2/go.mod h1:qiazpAM05fjAc+PEkrY8HSUhKlJSMBuLnVUSO6nvZL4= +k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= +k8s.io/component-base v0.17.2 h1:0XHf+cerTvL9I5Xwn9v+0jmqzGAZI7zNydv4tL6Cw6A= +k8s.io/component-base v0.17.2/go.mod h1:zMPW3g5aH7cHJpKYQ/ZsGMcgbsA/VyhEugF3QT1awLs= +k8s.io/cri-api v0.17.2/go.mod h1:BzAkbBHHp81d+aXzbiIcUbilLkbXa40B8mUHOk6EX3s= +k8s.io/csi-translation-lib v0.17.2/go.mod h1:NrhnhXJg/V6cHRTdPbmxvBuV3rJSqXsdLBE5JSRzcVI= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM= @@ -922,9 +922,9 @@ k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ= k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/kube-aggregator v0.17.0/go.mod h1:Vw104PtCEuT12WTVuhRFWCHXGiVqXsTzFtrvoaHxpk4= -k8s.io/kube-controller-manager v0.17.0 h1:xgq8qSFuVflTFmUVJJxvshk1atVwp1iiK9pkjDqb5oQ= -k8s.io/kube-controller-manager v0.17.0/go.mod h1:uewKsjSm/Kggbn+BmimupXDDEikKQv6rX8ShiLiuXTw= +k8s.io/kube-aggregator v0.17.2/go.mod h1:8xQTzaH0GrcKPiSB4YYWwWbeQ0j/4zRsbQt8usEMbRg= +k8s.io/kube-controller-manager v0.17.2 h1:YqE2AM6YzSppRHjmxHSZn6FiXNy6hTpRPEa2SYpHV5s= +k8s.io/kube-controller-manager v0.17.2/go.mod h1:xznSbCHdVODF5StxiBMh3s6HenyCBdsedazlsh6/J3M= k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20190722073852-5e22f3d471e6 h1:s9IxTKe9GwDH0S/WaX62nFYr0or32DsTWex9AileL7U= k8s.io/kube-openapi v0.0.0-20190722073852-5e22f3d471e6/go.mod h1:RZvgC8MSN6DjiMV6oIfEE9pDL9CYXokkfaCKZeHm3nc= @@ -932,16 +932,16 @@ k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJD k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/kube-proxy v0.17.0/go.mod h1:pecyGyajk667mTTCT0vMP7Oh3bQMUHvEW+Z5pZUjYxU= -k8s.io/kube-scheduler v0.17.0/go.mod h1:mZVsEg++qnq6xWm9DTh2bw9v2i9XPdkEQGDafcjG6PE= -k8s.io/kubectl v0.17.0/go.mod h1:jIPrUAW656Vzn9wZCCe0PC+oTcu56u2HgFD21Xbfk1s= -k8s.io/kubelet v0.17.0/go.mod h1:e/JBCxucKuEV6JO6zYW+e72ib9eMsGO2Fah3iT5tiiI= -k8s.io/kubernetes v1.17.1 h1:pHzPDwbQ7mhO/rHWRLWyEWEx69XgK3441/39956SKNs= -k8s.io/kubernetes v1.17.1/go.mod h1:NbNV+69yL3eKiKDJ+ZEjqOplN3BFXKBeunzkoOy8WLo= -k8s.io/legacy-cloud-providers v0.17.0/go.mod h1:DdzaepJ3RtRy+e5YhNtrCYwlgyK87j/5+Yfp0L9Syp8= -k8s.io/metrics v0.17.0/go.mod h1:EH1D3YAwN6d7bMelrElnLhLg72l/ERStyv2SIQVt6Do= +k8s.io/kube-proxy v0.17.2/go.mod h1:PVY+Cqds8qa/TLEqiSgDPgwWBiRHYjeS4kvp/C5dYjc= +k8s.io/kube-scheduler v0.17.2/go.mod h1:BlP/p3YDLgsEIshEj4gbGjV11j4BQjNx7vbwRcLGnI8= +k8s.io/kubectl v0.17.2/go.mod h1:y4rfLV0n6aPmvbRCqZQjvOp3ezxsFgpqL+zF5jH/lxk= +k8s.io/kubelet v0.17.2/go.mod h1:XUOu5Fcnkx44FP13w5etBrn2GhK4D02CUcFA8tLtUKU= +k8s.io/kubernetes v1.17.2 h1:g1UFZqFQsYx88xMUks4PKC6tsNcekxe0v06fcVGRwVE= +k8s.io/kubernetes v1.17.2/go.mod h1:NbNV+69yL3eKiKDJ+ZEjqOplN3BFXKBeunzkoOy8WLo= +k8s.io/legacy-cloud-providers v0.17.2/go.mod h1:a/qbE67VbTzWOemWfqH0wlcX31zxt4UOxFqZuBltY9Q= +k8s.io/metrics v0.17.2/go.mod h1:3TkNHET4ROd+NfzNxkjoVfQ0Ob4iZnaHmSEA4vYpwLw= k8s.io/repo-infra v0.0.1-alpha.1/go.mod h1:wO1t9WaB99V80ljbeENTnayuEEwNZt7gECYh/CEyOJ8= -k8s.io/sample-apiserver v0.17.0/go.mod h1:SAkguNIe/gJik7VlkFu62oGlWltW3c0mAP9WQYUMEJo= +k8s.io/sample-apiserver v0.17.2/go.mod h1:JLhi1DSBMlKAckfVdV1YNuz49EKNlfSflW+6LVDf1Mo= k8s.io/system-validators v1.0.4/go.mod h1:HgSgTg4NAGNoYYjKsUyk52gdNi2PVDswQ9Iyn66R7NI= k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= @@ -964,10 +964,6 @@ sigs.k8s.io/controller-runtime v0.4.0 h1:wATM6/m+3w8lj8FXNaO6Fs/rq/vqoOjO1Q116Z9 sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns= sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a/go.mod h1:8SNGuj163x/sMwydREj7ld5mIMJu1cDanIfnx6xsU70= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= -sigs.k8s.io/sig-storage-lib-external-provisioner v3.1.0+incompatible h1:1QXsfYQ9YjqJCyMcyCsN1qGKmbzNxYIL6NtC2wjglK8= -sigs.k8s.io/sig-storage-lib-external-provisioner v3.1.0+incompatible/go.mod h1:qhqLyNwJC49PoUalmtzYb4s9fT8HOMBTLbTY1QoVOqI= -sigs.k8s.io/sig-storage-lib-external-provisioner v4.0.1+incompatible h1:Wc09EvmeiMCZf7UlasU0W2Rn4GVX/b+Lus4UwmUBvD4= -sigs.k8s.io/sig-storage-lib-external-provisioner v4.0.1+incompatible/go.mod h1:qhqLyNwJC49PoUalmtzYb4s9fT8HOMBTLbTY1QoVOqI= sigs.k8s.io/sig-storage-lib-external-provisioner v4.1.0+incompatible h1:pp7GUmQZKI57EjGnjkY88V4QbVuMpkw/ijKXqL67EsI= sigs.k8s.io/sig-storage-lib-external-provisioner v4.1.0+incompatible/go.mod h1:qhqLyNwJC49PoUalmtzYb4s9fT8HOMBTLbTY1QoVOqI= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e h1:4Z09Hglb792X0kfOBBJUPFEyvVfQWrYT/l8h5EKA6JQ= diff --git a/images/cross/Dockerfile b/images/cross/Dockerfile index fd0e301bb..15909d886 100644 --- a/images/cross/Dockerfile +++ b/images/cross/Dockerfile @@ -37,8 +37,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # install golang from the official repo -RUN GO_VERSION=1.13.5 && \ - GO_HASH=512103d7ad296467814a6e3f635631bd35574cab3369a97a323c9a585ccaa569 && \ +RUN GO_VERSION=1.13.8 && \ + GO_HASH=0567734d558aef19112f2b2873caa0c600f1b4a5827930eb5a7f35235219e9d8 && \ curl -fsSL https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz -o golang.tar.gz && \ echo "${GO_HASH} golang.tar.gz" | sha256sum -c - && \ tar -C /usr/local -xzf golang.tar.gz && \ diff --git a/main b/main deleted file mode 100755 index 3bff985f8..000000000 Binary files a/main and /dev/null differ diff --git a/pkg/operator/k8sutil/configmap_test.go b/pkg/operator/k8sutil/configmap_test.go index 6e2aa240a..5f4321452 100644 --- a/pkg/operator/k8sutil/configmap_test.go +++ b/pkg/operator/k8sutil/configmap_test.go @@ -92,6 +92,7 @@ func TestGetOperatorSetting(t *testing.T) { assert.Equal(t, envSettingValue, setting) // ConfigMap is found + os.Setenv("POD_NAMESPACE", testNamespace) _, err = k8s.CoreV1().ConfigMaps(testNamespace).Create(cm) assert.NoError(t, err) diff --git a/tests/README.md b/tests/README.md index ebb0071a9..f0624226b 100644 --- a/tests/README.md +++ b/tests/README.md @@ -97,7 +97,7 @@ tests/scripts/helm.sh up #### 3. Run integration tests: Integration tests can be run using tests binary `_output/tests/${platform}/integration` that is generated during build time e.g.: ``` -_output/tests/${platform}/integration/integration -test.v +_output/tests/${platform}/integration -test.v ``` ### Test parameters