Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

switch dep to go mod and upgrade go version #67

Merged
merged 2 commits into from
Mar 23, 2020
Merged

switch dep to go mod and upgrade go version #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d95486f
switch dep to go mod and upgrade go version
u2takey Feb 12, 2020
7ac59bc
add compatibility with dep for semantic versioning
u2takey Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions .Gopkg.toml
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
language: go
go_import_path: sigs.k8s.io/sig-storage-lib-external-provisioner
go:
- 1.11.1
- 1.13.7
services: docker
install:
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
script:
- make verify
- make test
Expand Down
14 changes: 4 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
all: verify test

dep:
cp .Gopkg.toml Gopkg.toml
-dep init
dep ensure
go mod tidy

verify: dep
go get -u github.com/alecthomas/gometalinter
gometalinter --install
# todo gometalinter is DEPRECATED, Use https://github.com/golangci/golangci-lint
GO111MODULE=off go get -u github.com/alecthomas/gometalinter
GO111MODULE=off gometalinter --install
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be enhanced to get a fixed version of gometalinter while you are touching this code? Like depending on "master" for Kubernetes, depending on master of gometalinter (or golangci-lint) has the risk that changes in those project(s) break this project.

I know that this is more complicated because (for reasons that I don't understand) go get in non-module mode doesn't support specifying a version, but perhaps it works when adding it as module and then building?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with GO111MODULE=off its not easy, but we can fix it later by replacing with golangci-lint. In fact gometalinter is DEPRECATED, so its 'fixed'.

repo-infra/verify/verify-go-src.sh -v
repo-infra/verify/verify-boilerplate.sh

Expand All @@ -30,9 +29,4 @@ test: dep
go test ./allocator

clean:
rm -rf ./vendor
rm -rf ./Gopkg.toml
rm -rf ./Gopkg.lock
rm -rf ./examples/hostpath-provisioner/vendor
rm -rf ./examples/hostpath-provisioner/Gopkg.lock
rm -rf ./test/e2e/kubernetes
2 changes: 1 addition & 1 deletion allocator/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package allocator // import "sigs.k8s.io/sig-storage-lib-external-provisioner/allocator"
package allocator // import "sigs.k8s.io/sig-storage-lib-external-provisioner/v5/allocator"
4 changes: 2 additions & 2 deletions controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ import (
ref "k8s.io/client-go/tools/reference"
"k8s.io/client-go/util/workqueue"
glog "k8s.io/klog"
"sigs.k8s.io/sig-storage-lib-external-provisioner/controller/metrics"
"sigs.k8s.io/sig-storage-lib-external-provisioner/util"
"sigs.k8s.io/sig-storage-lib-external-provisioner/v5/controller/metrics"
"sigs.k8s.io/sig-storage-lib-external-provisioner/v5/util"
)

// annClass annotation represents the storage class associated with a resource:
Expand Down
2 changes: 1 addition & 1 deletion controller/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controller // import "sigs.k8s.io/sig-storage-lib-external-provisioner/controller"
package controller // import "sigs.k8s.io/sig-storage-lib-external-provisioner/v5/controller"
2 changes: 1 addition & 1 deletion controller/metrics/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package metrics // import "sigs.k8s.io/sig-storage-lib-external-provisioner/controller/metrics"
package metrics // import "sigs.k8s.io/sig-storage-lib-external-provisioner/v5/controller/metrics"
50 changes: 0 additions & 50 deletions examples/hostpath-provisioner/Gopkg.toml
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions examples/hostpath-provisioner/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ IMAGE?=hostpath-provisioner
all: dep hostpath-provisioner image

dep:
-dep init
dep ensure
go mod tidy

hostpath-provisioner:
CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o hostpath-provisioner .
Expand All @@ -27,6 +26,4 @@ image: hostpath-provisioner
docker build -t $(IMAGE) -f Dockerfile.scratch .

clean:
rm -rf vendor
rm -rf Gopkg.lock
rm -rf hostpath-provisioner
16 changes: 16 additions & 0 deletions examples/hostpath-provisioner/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module sigs.k8s.io/kubernetes-sigs/sig-storage-lib-external-provisioner/examples/hostpath-provisioner

go 1.13

require (
github.com/miekg/dns v1.1.27 // indirect
github.com/prometheus/client_golang v1.4.1 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
k8s.io/api v0.17.3
k8s.io/apimachinery v0.17.3
k8s.io/client-go v0.0.0-20200131194156-19522ff28802 // release-14.0
k8s.io/klog v1.0.0
k8s.io/utils v0.0.0-20200124190032-861946025e34 // indirect
sigs.k8s.io/sig-storage-lib-external-provisioner v4.0.1+incompatible
)
Loading