Skip to content

Commit b613514

Browse files
cofyccofyc
committed
switch to standard go project layout
1 parent aaa1880 commit b613514

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+64
-102
lines changed

Diff for: ‎Makefile

+26-8
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,24 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
ifeq ($(REGISTRY),)
16+
REGISTRY = quay.io/external_storage
17+
endif
18+
19+
ifeq ($(VERSION),)
20+
VERSION = latest
21+
endif
22+
23+
ifeq ($(GOVERSION),)
24+
GOVERSION = 1.11.1
25+
endif
26+
27+
IMAGE = $(REGISTRY)/local-volume-provisioner:$(VERSION)
28+
MUTABLE_IMAGE = $(REGISTRY)/local-volume-provisioner:latest
29+
1530
all: provisioner
1631
.PHONY: all
1732

18-
test:
19-
cd provisioner; make test
20-
.PHONY: test
21-
2233
verify:
2334
./hack/verify-all.sh
2435
.PHONY: verify
@@ -32,13 +43,20 @@ release:
3243
.PHONY: release
3344

3445
provisioner:
35-
cd provisioner; make container
46+
docker build -t $(MUTABLE_IMAGE) --build-arg GOVERSION=${GOVERSION} -f deployment/docker/Dockerfile .
47+
docker tag $(MUTABLE_IMAGE) $(IMAGE)
3648
.PHONY: provisioner
3749

38-
push:
39-
cd provisioner; make push
50+
push: provisioner
51+
docker push $(IMAGE)
52+
docker push $(MUTABLE_IMAGE)
4053
.PHONY: push
4154

55+
test: provisioner
56+
go test ./cmd/... ./pkg/...
57+
docker run --privileged -v $(PWD)/deployment/docker/test.sh:/test.sh --entrypoint bash quay.io/external_storage/local-volume-provisioner:latest /test.sh
58+
.PHONY: test
59+
4260
clean:
61+
rm -f deployment/docker/local-volume-provisioner
4362
.PHONY: clean
44-
cd provisioner; make clean

Diff for: ‎provisioner/RELEASE.md renamed to ‎RELEASE.md

Diff for: ‎provisioner/TODO.md renamed to ‎TODO.md

Diff for: ‎provisioner/cmd/main.go renamed to ‎cmd/local-volume-provisioner/main.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ import (
2727
"github.com/prometheus/client_golang/prometheus"
2828
"github.com/prometheus/client_golang/prometheus/promhttp"
2929
"k8s.io/klog"
30-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/common"
31-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/controller"
32-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/deleter"
33-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/metrics"
34-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/metrics/collectors"
30+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
31+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/controller"
32+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/deleter"
33+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/metrics"
34+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/metrics/collectors"
3535

3636
"k8s.io/api/core/v1"
3737
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

Diff for: ‎utils/update-helm-values-pre-v2.2.0/README.md renamed to ‎cmd/utils/update-helm-values-pre-v2.2.0/README.md

Diff for: ‎utils/update-helm-values-pre-v2.2.0/main.go renamed to ‎cmd/utils/update-helm-values-pre-v2.2.0/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/golang/glog"
2525
"k8s.io/apimachinery/pkg/util/sets"
26-
"sigs.k8s.io/sig-storage-local-static-provisioner/utils/update-helm-values-pre-v2.2.0/pkg/chartutil"
26+
"sigs.k8s.io/sig-storage-local-static-provisioner/cmd/utils/update-helm-values-pre-v2.2.0/pkg/chartutil"
2727
)
2828

2929
var (

Diff for: ‎utils/update-helm-values-pre-v2.2.0/main_test.go renamed to ‎cmd/utils/update-helm-values-pre-v2.2.0/main_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/sig-storage-local-static-provisioner/utils/update-helm-values-pre-v2.2.0/pkg/chartutil"
22+
"sigs.k8s.io/sig-storage-local-static-provisioner/cmd/utils/update-helm-values-pre-v2.2.0/pkg/chartutil"
2323
)
2424

2525
func TestUpgrade(t *testing.T) {

Diff for: ‎utils/update-helm-values-pre-v2.2.0/pkg/chartutil/values.go renamed to ‎cmd/utils/update-helm-values-pre-v2.2.0/pkg/chartutil/values.go

File renamed without changes.

Diff for: ‎utils/update-pv-to-beta/Makefile renamed to ‎cmd/utils/update-pv-to-beta/Makefile

File renamed without changes.

Diff for: ‎utils/update-pv-to-beta/README.md renamed to ‎cmd/utils/update-pv-to-beta/README.md

Diff for: ‎utils/update-pv-to-beta/deployment/docker/Dockerfile renamed to ‎cmd/utils/update-pv-to-beta/deployment/docker/Dockerfile

File renamed without changes.

Diff for: ‎utils/update-pv-to-beta/deployment/kubernetes/admin-account.yaml renamed to ‎cmd/utils/update-pv-to-beta/deployment/kubernetes/admin-account.yaml

File renamed without changes.

Diff for: ‎utils/update-pv-to-beta/deployment/kubernetes/update-pv-to-beta.yaml renamed to ‎cmd/utils/update-pv-to-beta/deployment/kubernetes/update-pv-to-beta.yaml

File renamed without changes.

Diff for: ‎utils/update-pv-to-beta/update_pv_na_to_beta.go renamed to ‎cmd/utils/update-pv-to-beta/update_pv_na_to_beta.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323

2424
"github.com/golang/glog"
25-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/common"
25+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
2626

2727
"k8s.io/api/core/v1"
2828
"k8s.io/apimachinery/pkg/api/errors"

Diff for: ‎provisioner/deployment/docker/Dockerfile renamed to ‎deployment/docker/Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ ARG GOVERSION=1.11.1
1616
FROM golang:$GOVERSION-alpine as builder
1717
WORKDIR /go/src/sigs.k8s.io/sig-storage-local-static-provisioner
1818
ADD . .
19-
RUN cd provisioner; \
20-
CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o local-volume-provisioner ./cmd
19+
RUN CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o local-volume-provisioner ./cmd/local-volume-provisioner
2120

2221
# For security, we use kubernetes community maintained debian base image.
2322
# https://github.com/kubernetes/kubernetes/blob/master/build/debian-base/
@@ -31,6 +30,6 @@ RUN apt-get update \
3130
e2fsprogs \
3231
bash
3332

34-
COPY --from=builder /go/src/sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/local-volume-provisioner /local-provisioner
35-
ADD provisioner/deployment/docker/scripts /scripts
33+
COPY --from=builder /go/src/sigs.k8s.io/sig-storage-local-static-provisioner/local-volume-provisioner /local-provisioner
34+
ADD deployment/docker/scripts /scripts
3635
ENTRYPOINT ["/local-provisioner"]

Diff for: ‎provisioner/deployment/docker/scripts/blkdiscard.sh renamed to ‎deployment/docker/scripts/blkdiscard.sh

File renamed without changes.

Diff for: ‎provisioner/deployment/docker/scripts/common.sh renamed to ‎deployment/docker/scripts/common.sh

File renamed without changes.

Diff for: ‎provisioner/deployment/docker/scripts/dd_zero.sh renamed to ‎deployment/docker/scripts/dd_zero.sh

File renamed without changes.

Diff for: ‎provisioner/deployment/docker/scripts/fsclean.sh renamed to ‎deployment/docker/scripts/fsclean.sh

File renamed without changes.

Diff for: ‎provisioner/deployment/docker/scripts/quick_reset.sh renamed to ‎deployment/docker/scripts/quick_reset.sh

File renamed without changes.

Diff for: ‎provisioner/deployment/docker/scripts/shred.sh renamed to ‎deployment/docker/scripts/shred.sh

File renamed without changes.

Diff for: ‎provisioner/deployment/docker/test.sh renamed to ‎deployment/docker/test.sh

File renamed without changes.

Diff for: ‎provisioner/deployment/kubernetes/example/default_example_provisioner_generated.yaml renamed to ‎deployment/kubernetes/example/default_example_provisioner_generated.yaml

File renamed without changes.

Diff for: ‎provisioner/deployment/kubernetes/example/default_example_service.yaml renamed to ‎deployment/kubernetes/example/default_example_service.yaml

File renamed without changes.

Diff for: ‎provisioner/deployment/kubernetes/example/default_example_storageclass.yaml renamed to ‎deployment/kubernetes/example/default_example_storageclass.yaml

File renamed without changes.

Diff for: ‎provisioner/README.md renamed to ‎docs/provisioner.md

Diff for: ‎provisioner/pkg/cache/cache.go renamed to ‎pkg/cache/cache.go

File renamed without changes.

Diff for: ‎provisioner/pkg/common/common.go renamed to ‎pkg/common/common.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626

2727
"github.com/ghodss/yaml"
2828
"k8s.io/klog"
29-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/cache"
30-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/util"
29+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/cache"
30+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/util"
3131

3232
"hash/fnv"
3333

Diff for: ‎provisioner/pkg/common/common_test.go renamed to ‎pkg/common/common_test.go

File renamed without changes.

Diff for: ‎provisioner/pkg/controller/controller.go renamed to ‎pkg/controller/controller.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323

2424
"k8s.io/klog"
2525

26-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/cache"
27-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/common"
28-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/deleter"
29-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/discovery"
30-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/populator"
31-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/util"
26+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/cache"
27+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
28+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/deleter"
29+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/discovery"
30+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/populator"
31+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/util"
3232

3333
"k8s.io/api/core/v1"
3434
"k8s.io/apimachinery/pkg/util/wait"

Diff for: ‎provisioner/pkg/deleter/deleter.go renamed to ‎pkg/deleter/deleter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"time"
2727

2828
"k8s.io/klog"
29-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/common"
30-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/metrics"
29+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
30+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/metrics"
3131

3232
"k8s.io/api/core/v1"
3333
"k8s.io/apimachinery/pkg/api/errors"

Diff for: ‎provisioner/pkg/deleter/deleter_test.go renamed to ‎pkg/deleter/deleter_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"testing"
2525
"time"
2626

27-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/cache"
28-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/common"
29-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/util"
27+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/cache"
28+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
29+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/util"
3030

3131
batch_v1 "k8s.io/api/batch/v1"
3232
"k8s.io/api/core/v1"

Diff for: ‎provisioner/pkg/deleter/jobcontroller.go renamed to ‎pkg/deleter/jobcontroller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"time"
2222

2323
"k8s.io/klog"
24-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/common"
24+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
2525

2626
batch_v1 "k8s.io/api/batch/v1"
2727
apiv1 "k8s.io/api/core/v1"

Diff for: ‎provisioner/pkg/deleter/proctable.go renamed to ‎pkg/deleter/proctable.go

File renamed without changes.

Diff for: ‎provisioner/pkg/discovery/discovery.go renamed to ‎pkg/discovery/discovery.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ import (
2424
"time"
2525

2626
"k8s.io/klog"
27-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/common"
28-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/metrics"
27+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
28+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/metrics"
2929

3030
"k8s.io/api/core/v1"
3131
storagev1listers "k8s.io/client-go/listers/storage/v1"
3232
"k8s.io/client-go/tools/cache"
3333
esUtil "sigs.k8s.io/sig-storage-lib-external-provisioner/util"
34-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/deleter"
34+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/deleter"
3535
)
3636

3737
// Discoverer finds available volumes and creates PVs for them

Diff for: ‎provisioner/pkg/discovery/discovery_test.go renamed to ‎pkg/discovery/discovery_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424

2525
"k8s.io/klog"
2626
esUtil "sigs.k8s.io/sig-storage-lib-external-provisioner/util"
27-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/cache"
28-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/common"
29-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/deleter"
30-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/util"
27+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/cache"
28+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
29+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/deleter"
30+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/util"
3131

3232
"k8s.io/api/core/v1"
3333
storagev1 "k8s.io/api/storage/v1"

Diff for: ‎provisioner/pkg/metrics/collectors/proc_table_collector.go renamed to ‎pkg/metrics/collectors/proc_table_collector.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package collectors
1818

1919
import (
2020
"github.com/prometheus/client_golang/prometheus"
21-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/deleter"
22-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/metrics"
21+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/deleter"
22+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/metrics"
2323
)
2424

2525
var (

Diff for: ‎provisioner/pkg/metrics/collectors/proc_table_collector_test.go renamed to ‎pkg/metrics/collectors/proc_table_collector_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"testing"
2222

2323
"github.com/prometheus/client_golang/prometheus/testutil"
24-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/deleter"
24+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/deleter"
2525
)
2626

2727
func newUint64Pointer(i uint64) *uint64 {

Diff for: ‎provisioner/pkg/metrics/metrics.go renamed to ‎pkg/metrics/metrics.go

File renamed without changes.

Diff for: ‎provisioner/pkg/metrics/metrics_test.go renamed to ‎pkg/metrics/metrics_test.go

File renamed without changes.

Diff for: ‎provisioner/pkg/populator/populator.go renamed to ‎pkg/populator/populator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package populator
1818

1919
import (
2020
"k8s.io/klog"
21-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/common"
21+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
2222

2323
"k8s.io/api/core/v1"
2424
"k8s.io/client-go/tools/cache"

Diff for: ‎provisioner/pkg/util/api_util.go renamed to ‎pkg/util/api_util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package util
1919
import (
2020
"time"
2121

22-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/metrics"
22+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/metrics"
2323

2424
batch_v1 "k8s.io/api/batch/v1"
2525
"k8s.io/api/core/v1"

Diff for: ‎provisioner/pkg/util/volume_util.go renamed to ‎pkg/util/volume_util.go

File renamed without changes.

Diff for: ‎provisioner/pkg/util/volume_util_linux.go renamed to ‎pkg/util/volume_util_linux.go

File renamed without changes.

Diff for: ‎provisioner/pkg/util/volume_util_unsupported.go renamed to ‎pkg/util/volume_util_unsupported.go

File renamed without changes.

Diff for: ‎provisioner/Makefile

-55
This file was deleted.

Diff for: ‎test/e2e/e2e_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import (
4242
"k8s.io/klog"
4343
"k8s.io/kubernetes/test/e2e/framework"
4444
"k8s.io/kubernetes/test/e2e/storage/utils"
45-
"sigs.k8s.io/sig-storage-local-static-provisioner/provisioner/pkg/common"
45+
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
4646
)
4747

4848
const (

0 commit comments

Comments
 (0)