Switch to go modules (#13) (9eeb6021) · Commits · Docker / Yandex Cloud S3 CSI Controller

.gitlab-ci.yml

+1 −7

Original line number	Diff line number	Diff line
		@@ -5,8 +5,6 @@ image:
		variables:
		DOCKER_HOST: tcp://docker:2375
		DOCKER_DRIVER: overlay2
		GO_PROJECT_BASE: /go/src/github.com/ctrox
		GO_PROJECT_DIR: $GO_PROJECT_BASE/csi-s3

		stages:
		- build
		@@ -14,10 +12,6 @@ stages:

		build:
		stage: build
		before_script:
		- mkdir -p $GO_PROJECT_BASE
		- ln -s $CI_PROJECT_DIR $GO_PROJECT_BASE
		- cd $GO_PROJECT_DIR
		script:
		- make build

		@@ -27,4 +21,4 @@ test:
		services:
		- docker:dind
		script:
		- docker run --rm --privileged -v $(pwd):$GO_PROJECT_DIR --device /dev/fuse ctrox/$CI_PROJECT_NAME:test
		- docker run --rm --privileged -v $(pwd):/app --device /dev/fuse ctrox/csi-s3:test

Gopkg.lock

deleted100644 → 0

+0 −465

Original line number	Diff line number	Diff line
		# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.


		[[projects]]
		digest = "1:e92f5581902c345eb4ceffdcd4a854fb8f73cf436d47d837d1ec98ef1fe0a214"
		name = "github.com/StackExchange/wmi"
		packages = ["."]
		pruneopts = "UT"
		revision = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"
		version = "1.0.0"

		[[projects]]
		digest = "1:df533a8f9784468359b906351182dd8885c2822bc611fa6781df0a9b9fbee252"
		name = "github.com/aws/aws-sdk-go"
		packages = [
		"aws",
		"aws/awserr",
		"aws/awsutil",
		"aws/client",
		"aws/client/metadata",
		"aws/corehandlers",
		"aws/credentials",
		"aws/credentials/ec2rolecreds",
		"aws/credentials/endpointcreds",
		"aws/credentials/stscreds",
		"aws/csm",
		"aws/defaults",
		"aws/ec2metadata",
		"aws/endpoints",
		"aws/request",
		"aws/session",
		"aws/signer/v4",
		"internal/sdkio",
		"internal/sdkrand",
		"internal/sdkuri",
		"internal/shareddefaults",
		"private/protocol",
		"private/protocol/eventstream",
		"private/protocol/eventstream/eventstreamapi",
		"private/protocol/query",
		"private/protocol/query/queryutil",
		"private/protocol/rest",
		"private/protocol/restxml",
		"private/protocol/xml/xmlutil",
		"service/s3",
		"service/sts",
		]
		pruneopts = "UT"
		revision = "94b80148ea4b1b136682116294b151766a3b85c2"
		version = "v1.14.27"

		[[projects]]
		digest = "1:94ffc0947c337d618b6ff5ed9abaddc1217b090c1b3a1ae4739b35b7b25851d5"
		name = "github.com/container-storage-interface/spec"
		packages = ["lib/go/csi"]
		pruneopts = "UT"
		revision = "ed0bb0e1557548aa028307f48728767cfe8f6345"
		version = "v1.0.0"

		[[projects]]
		branch = "master"
		digest = "1:6f9339c912bbdda81302633ad7e99a28dfa5a639c864061f1929510a9a64aa74"
		name = "github.com/dustin/go-humanize"
		packages = ["."]
		pruneopts = "UT"
		revision = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"

		[[projects]]
		digest = "1:fe8a03a8222d5b913f256972933d26d24ad7c8286692a42943bc01633cc8fce3"
		name = "github.com/go-ini/ini"
		packages = ["."]
		pruneopts = "UT"
		revision = "358ee7663966325963d4e8b2e1fbd570c5195153"
		version = "v1.38.1"

		[[projects]]
		digest = "1:64a5a67c69b70c2420e607a8545d674a23778ed9c3e80607bfd17b77c6c87f6a"
		name = "github.com/go-ole/go-ole"
		packages = [
		".",
		"oleutil",
		]
		pruneopts = "UT"
		revision = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"
		version = "v1.2.1"

		[[projects]]
		branch = "master"
		digest = "1:1ba1d79f2810270045c328ae5d674321db34e3aae468eb4233883b473c5c0467"
		name = "github.com/golang/glog"
		packages = ["."]
		pruneopts = "UT"
		revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"

		[[projects]]
		digest = "1:35676c12b04030d448744065729d65e6f1d159447cf4d993e80cc7d4f28bfe20"
		name = "github.com/golang/protobuf"
		packages = [
		"proto",
		"protoc-gen-go/descriptor",
		"ptypes",
		"ptypes/any",
		"ptypes/duration",
		"ptypes/timestamp",
		"ptypes/wrappers",
		]
		pruneopts = "UT"
		revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
		version = "v1.1.0"

		[[projects]]
		branch = "master"
		digest = "1:c19183ee1bc01433c61d026972e83a479816ffb00f29c8d7605b0668d4bdea8c"
		name = "github.com/jacobsa/fuse"
		packages = [
		".",
		"fuseops",
		"fuseutil",
		"internal/buffer",
		"internal/freelist",
		"internal/fusekernel",
		]
		pruneopts = "UT"
		revision = "cd3959611bcb6bb23d49f1598d98f2bf44476805"

		[[projects]]
		branch = "master"
		digest = "1:5c3444689562053b027ef3b96372e306adbe0d7d109b6cdd48d01eb80f8bab14"
		name = "github.com/jinzhu/copier"
		packages = ["."]
		pruneopts = "UT"
		revision = "7e38e58719c33e0d44d585c4ab477a30f8cb82dd"

		[[projects]]
		digest = "1:e22af8c7518e1eab6f2eab2b7d7558927f816262586cd6ed9f349c97a6c285c4"
		name = "github.com/jmespath/go-jmespath"
		packages = ["."]
		pruneopts = "UT"
		revision = "0b12d6b5"

		[[projects]]
		digest = "1:9aa9ceb463bf7fe3de4945f89f8190d3ed4c86847ec7a864b90a5195fdba4244"
		name = "github.com/kahing/goofys"
		packages = [
		"api",
		"internal",
		]
		pruneopts = "UT"
		revision = "943e017724ea820eb4185419ef3c41d6f921a324"
		version = "v0.19.0"

		[[projects]]
		digest = "1:c9ba37d3709f57185b60f587a6282378feaff2aa3cddc28a56770704e3f96b98"
		name = "github.com/kubernetes-csi/csi-test"
		packages = [
		"pkg/sanity",
		"utils",
		]
		pruneopts = "UT"
		revision = "5b1e3786b7c8f7ca514b40e882a0b5dc36e4c842"
		version = "v1.1.0"

		[[projects]]
		branch = "master"
		digest = "1:596505ce72821ef663980f7ce826984a30da406f9356a92c10ac8b44012d549c"
		name = "github.com/kubernetes-csi/drivers"
		packages = ["pkg/csi-common"]
		pruneopts = "UT"
		revision = "c1e71bdcce6e89c8e4ce49f77ecb5e0a1962c716"

		[[projects]]
		digest = "1:95c73c666919be2843b955eafc83f58c136312b74f79c703152f4c4a95fd64dc"
		name = "github.com/minio/minio-go"
		packages = [
		".",
		"pkg/credentials",
		"pkg/encrypt",
		"pkg/s3signer",
		"pkg/s3utils",
		"pkg/set",
		]
		pruneopts = "UT"
		revision = "70799fe8dae6ecfb6c7d7e9e048fce27f23a1992"
		version = "v6.0.5"

		[[projects]]
		branch = "master"
		digest = "1:8eb17c2ec4df79193ae65b621cd1c0c4697db3bc317fe6afdc76d7f2746abd05"
		name = "github.com/mitchellh/go-homedir"
		packages = ["."]
		pruneopts = "UT"
		revision = "3864e76763d94a6df2f9960b16a20a33da9f9a66"

		[[projects]]
		branch = "master"
		digest = "1:d0c95a34e79df79eb96ca870d6b6fc43361d34c9c05495f93a5ad0077f7bbb24"
		name = "github.com/mitchellh/go-ps"
		packages = ["."]
		pruneopts = "UT"
		revision = "4fdf99ab29366514c69ccccddab5dc58b8d84062"

		[[projects]]
		digest = "1:72f35d3e412bc67b121e15ea4c88a3b3da8bcbc2264339e7ffa4a1865799840c"
		name = "github.com/onsi/ginkgo"
		packages = [
		".",
		"config",
		"internal/codelocation",
		"internal/containernode",
		"internal/failer",
		"internal/leafnodes",
		"internal/remote",
		"internal/spec",
		"internal/spec_iterator",
		"internal/specrunner",
		"internal/suite",
		"internal/testingtproxy",
		"internal/writer",
		"reporters",
		"reporters/stenographer",
		"reporters/stenographer/support/go-colorable",
		"reporters/stenographer/support/go-isatty",
		"types",
		]
		pruneopts = "UT"
		revision = "fa5fabab2a1bfbd924faf4c067d07ae414e2aedf"
		version = "v1.5.0"

		[[projects]]
		digest = "1:d0c2c4e2d0006cd28c220a549cda1de8e67abc65ed4c572421492bbf0492ceaf"
		name = "github.com/onsi/gomega"
		packages = [
		".",
		"format",
		"internal/assertion",
		"internal/asyncassertion",
		"internal/oraclematcher",
		"internal/testingtsupport",
		"matchers",
		"matchers/support/goraph/bipartitegraph",
		"matchers/support/goraph/edge",
		"matchers/support/goraph/node",
		"matchers/support/goraph/util",
		"types",
		]
		pruneopts = "UT"
		revision = "62bff4df71bdbc266561a0caee19f0594b17c240"
		version = "v1.4.0"

		[[projects]]
		digest = "1:bc2cfc85e2d84e825de87a09c8b05c2bcac704b7169c8b05004c382d993775e0"
		name = "github.com/shirou/gopsutil"
		packages = [
		"internal/common",
		"mem",
		]
		pruneopts = "UT"
		revision = "4a180b209f5f494e5923cfce81ea30ba23915877"
		version = "v2.18.06"

		[[projects]]
		digest = "1:c3addbf9fe72664f65b519d0d629fc59e63d3112f927375a30b12ab8bb047ae8"
		name = "github.com/sirupsen/logrus"
		packages = [
		".",
		"hooks/syslog",
		]
		pruneopts = "UT"
		revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
		version = "v1.0.5"

		[[projects]]
		digest = "1:b24d38b282bacf9791408a080f606370efa3d364e4b5fd9ba0f7b87786d3b679"
		name = "github.com/urfave/cli"
		packages = ["."]
		pruneopts = "UT"
		revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"
		version = "v1.20.0"

		[[projects]]
		branch = "master"
		digest = "1:57fc8065a25e45bda6925e55b69a8ea2eb2e449d0bb69643346e70afd2f7d2ed"
		name = "golang.org/x/crypto"
		packages = [
		"argon2",
		"blake2b",
		"ssh/terminal",
		]
		pruneopts = "UT"
		revision = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"

		[[projects]]
		branch = "master"
		digest = "1:381804744ed1ae8c716cc963a95f242d804fe1f559f2c4cdfc94e4eccd478058"
		name = "golang.org/x/net"
		packages = [
		"context",
		"html",
		"html/atom",
		"html/charset",
		"http/httpguts",
		"http2",
		"http2/hpack",
		"idna",
		"internal/timeseries",
		"trace",
		]
		pruneopts = "UT"
		revision = "d0887baf81f4598189d4e12a37c6da86f0bba4d0"

		[[projects]]
		branch = "master"
		digest = "1:1da9d2022068957b5a7080b0f94d3d81bdba624a5ce7467912bd6d4330ba2c3f"
		name = "golang.org/x/sys"
		packages = [
		"cpu",
		"unix",
		"windows",
		]
		pruneopts = "UT"
		revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"

		[[projects]]
		digest = "1:436b24586f8fee329e0dd65fd67c817681420cda1d7f934345c13fe78c212a73"
		name = "golang.org/x/text"
		packages = [
		"collate",
		"collate/build",
		"encoding",
		"encoding/charmap",
		"encoding/htmlindex",
		"encoding/internal",
		"encoding/internal/identifier",
		"encoding/japanese",
		"encoding/korean",
		"encoding/simplifiedchinese",
		"encoding/traditionalchinese",
		"encoding/unicode",
		"internal/colltab",
		"internal/gen",
		"internal/tag",
		"internal/triegen",
		"internal/ucd",
		"internal/utf8internal",
		"language",
		"runes",
		"secure/bidirule",
		"transform",
		"unicode/bidi",
		"unicode/cldr",
		"unicode/norm",
		"unicode/rangetable",
		]
		pruneopts = "UT"
		revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
		version = "v0.3.0"

		[[projects]]
		branch = "master"
		digest = "1:601e63e7d4577f907118bec825902505291918859d223bce015539e79f1160e3"
		name = "google.golang.org/genproto"
		packages = ["googleapis/rpc/status"]
		pruneopts = "UT"
		revision = "2731d4fa720b67f9fe38e9051a2a9b38e4609260"

		[[projects]]
		digest = "1:2dab32a43451e320e49608ff4542fdfc653c95dcc35d0065ec9c6c3dd540ed74"
		name = "google.golang.org/grpc"
		packages = [
		".",
		"balancer",
		"balancer/base",
		"balancer/roundrobin",
		"codes",
		"connectivity",
		"credentials",
		"encoding",
		"encoding/proto",
		"grpclog",
		"internal",
		"internal/backoff",
		"internal/channelz",
		"internal/grpcrand",
		"keepalive",
		"metadata",
		"naming",
		"peer",
		"resolver",
		"resolver/dns",
		"resolver/passthrough",
		"stats",
		"status",
		"tap",
		"transport",
		]
		pruneopts = "UT"
		revision = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"
		version = "v1.13.0"

		[[projects]]
		digest = "1:fe8a03a8222d5b913f256972933d26d24ad7c8286692a42943bc01633cc8fce3"
		name = "gopkg.in/ini.v1"
		packages = ["."]
		pruneopts = "UT"
		revision = "358ee7663966325963d4e8b2e1fbd570c5195153"
		version = "v1.38.1"

		[[projects]]
		digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202"
		name = "gopkg.in/yaml.v2"
		packages = ["."]
		pruneopts = "UT"
		revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
		version = "v2.2.1"

		[[projects]]
		branch = "master"
		digest = "1:f5fb6c4c9e14909a66efe7d3e49403234cd52523eb3997c5753a880635e8be2d"
		name = "k8s.io/apimachinery"
		packages = ["pkg/util/sets"]
		pruneopts = "UT"
		revision = "705cfa51a97f837a6599d463e2e206ad65903b60"

		[[projects]]
		digest = "1:a52efec378f1475a8ba2e034416b0fcc9de22ab6e0f8890f8af2820118d8d4a7"
		name = "k8s.io/kubernetes"
		packages = [
		"pkg/util/file",
		"pkg/util/io",
		"pkg/util/mount",
		"pkg/util/nsenter",
		]
		pruneopts = "UT"
		revision = "91e7b4fd31fcd3d5f436da26c980becec37ceefe"
		version = "v1.11.0"

		[[projects]]
		branch = "master"
		digest = "1:867d98a27033c52150eb4c01ca0f9be938d3010e9a4909ea3a881a83c3ac1b3f"
		name = "k8s.io/utils"
		packages = ["exec"]
		pruneopts = "UT"
		revision = "ab9069044f32ba0c6da081bb46bb0b12e3862c21"

		[solve-meta]
		analyzer-name = "dep"
		analyzer-version = 1
		input-imports = [
		"github.com/container-storage-interface/spec/lib/go/csi",
		"github.com/golang/glog",
		"github.com/kahing/goofys/api",
		"github.com/kubernetes-csi/csi-test/pkg/sanity",
		"github.com/kubernetes-csi/drivers/pkg/csi-common",
		"github.com/minio/minio-go",
		"github.com/mitchellh/go-ps",
		"github.com/onsi/ginkgo",
		"github.com/onsi/gomega",
		"golang.org/x/net/context",
		"google.golang.org/grpc/codes",
		"google.golang.org/grpc/status",
		"gopkg.in/ini.v1",
		"k8s.io/kubernetes/pkg/util/mount",
		]
		solver-name = "gps-cdcl"
		solver-version = 1

Gopkg.toml

deleted100644 → 0

+0 −47

Original line number	Diff line number	Diff line
		[[constraint]]
		name = "github.com/container-storage-interface/spec"
		version = "1.0.0"

		[[constraint]]
		branch = "master"
		name = "github.com/golang/glog"

		[[constraint]]
		name = "github.com/kahing/goofys"
		version = "0.19.0"

		[[constraint]]
		name = "github.com/kubernetes-csi/csi-test"
		version = "v1.0.2"

		[[constraint]]
		branch = "master"
		name = "github.com/kubernetes-csi/drivers"

		[[constraint]]
		name = "github.com/minio/minio-go"
		version = "6.0.5"

		[[constraint]]
		branch = "master"
		name = "golang.org/x/net"

		[[constraint]]
		name = "google.golang.org/grpc"
		version = "1.13.0"

		[[constraint]]
		name = "k8s.io/kubernetes"
		version = "1.11.0"

		[prune]
		go-tests = true
		unused-packages = true

		[[constraint]]
		name = "gopkg.in/ini.v1"
		version = "1.38.1"

		[[constraint]]
		branch = "master"
		name = "github.com/mitchellh/go-ps"

Makefile

+2 −3

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		# limitations under the License.
		.PHONY: test build container push clean

		PROJECT_DIR=/go/src/github.com/ctrox/csi-s3
		PROJECT_DIR=/app
		REGISTRY_NAME=ctrox
		IMAGE_NAME=csi-s3
		IMAGE_VERSION=1.0.1-alpha
		@@ -21,11 +21,10 @@ IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION)
		TEST_IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):test

		build:
		if [ ! -d ./vendor ]; then dep ensure -vendor-only; fi
		CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o _output/s3driver ./cmd/s3driver
		test:
		docker build -t $(TEST_IMAGE_TAG) -f test/Dockerfile .
		docker run --rm --privileged -v $(PWD):$(PROJECT_DIR):ro --device /dev/fuse $(TEST_IMAGE_TAG)
		docker run --rm --privileged -v $(PWD):$(PROJECT_DIR) --device /dev/fuse $(TEST_IMAGE_TAG)
		container: build
		docker build -t $(IMAGE_TAG) -f cmd/s3driver/Dockerfile .
		push: container

go.mod

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		module github.com/ctrox/csi-s3/cmd/s3driver

		require (
		github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
		github.com/aws/aws-sdk-go v1.14.27 // indirect
		github.com/container-storage-interface/spec v1.0.0
		github.com/ctrox/csi-s3 v0.0.0-20190228183403-83723f4be096
		github.com/go-ini/ini v1.38.1 // indirect
		github.com/go-ole/go-ole v1.2.1 // indirect
		github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
		github.com/golang/protobuf v1.1.0 // indirect
		github.com/jacobsa/fuse v0.0.0-20180417054321-cd3959611bcb // indirect
		github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 // indirect
		github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 // indirect
		github.com/kahing/go-xattr v1.1.1 // indirect
		github.com/kahing/goofys v0.19.0
		github.com/kubernetes-csi/csi-test v1.1.0
		github.com/kubernetes-csi/drivers v0.0.0-20181207022357-c1e71bdcce6e
		github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 // indirect
		github.com/minio/minio-go v6.0.5+incompatible
		github.com/mitchellh/go-homedir v0.0.0-20180523094522-3864e76763d9 // indirect
		github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936
		github.com/onsi/ginkgo v1.5.0
		github.com/onsi/gomega v1.4.0
		github.com/shirou/gopsutil v0.0.0-20180625081143-4a180b209f5f // indirect
		github.com/sirupsen/logrus v1.0.5 // indirect
		github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa // indirect
		github.com/spf13/afero v1.2.1 // indirect
		github.com/stretchr/testify v1.3.0 // indirect
		github.com/urfave/cli v1.20.0 // indirect
		golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8 // indirect
		golang.org/x/net v0.0.0-20180712202826-d0887baf81f4
		golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 // indirect
		golang.org/x/sys v0.0.0-20180715085529-ac767d655b30 // indirect
		google.golang.org/genproto v0.0.0-20180716172848-2731d4fa720b // indirect
		google.golang.org/grpc v1.13.0
		gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
		gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
		gopkg.in/ini.v1 v1.38.1
		gopkg.in/yaml.v2 v2.2.1 // indirect
		k8s.io/apimachinery v0.0.0-20180714051327-705cfa51a97f // indirect
		k8s.io/klog v0.2.0 // indirect
		k8s.io/kubernetes v1.13.4
		k8s.io/utils v0.0.0-20180703210027-ab9069044f32 // indirect
		)