Skip to content

Commit

Permalink
Reorganize repo structure for helm 3 version
Browse files Browse the repository at this point in the history
  • Loading branch information
Mateusz Kubaczyk committed Dec 15, 2019
1 parent 2f8c366 commit 0982ecb
Show file tree
Hide file tree
Showing 46 changed files with 671 additions and 636 deletions.
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.circleci
keys
vendor
.gitignore
.idea
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@
*.world1
helmsman
helmsman.exe
keys
keys/*
!tests/secrets/keys
!cmd/**/*
.helmsman-tmp
1 change: 1 addition & 0 deletions .version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v3.0.0-beta1
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ARG GLOBAL_HELM_DIFF_VERSION
ENV KUBE_VERSION=$GLOBAL_KUBE_VERSION
ENV HELM_VERSION=$GLOBAL_HELM_VERSION
ENV HELM_DIFF_VERSION=$GLOBAL_HELM_DIFF_VERSION
WORKDIR /go/src/helmsman
WORKDIR /go/src/github.com/Praqma/helmsman
COPY scripts/ /tmp/
RUN sh /tmp/setup.sh \
&& apk --no-cache add dep
Expand All @@ -35,4 +35,4 @@ ENV HELM_VERSION=$GLOBAL_HELM_VERSION
ENV HELM_DIFF_VERSION=$GLOBAL_HELM_DIFF_VERSION
COPY scripts/ /tmp/
RUN sh /tmp/setup.sh
COPY --from=builder /go/src/helmsman/helmsman /bin/helmsman
COPY --from=builder /go/src/github.com/Praqma/helmsman/helmsman /bin/helmsman
91 changes: 43 additions & 48 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
# go-tests = true
# unused-packages = true

ignored = ["github.com/Praqma/helmsman"]

[[constraint]]
version = "0.3.0"
name = "github.com/Azure/azure-storage-blob-go"
Expand Down
11 changes: 5 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ clean: ## Remove build artifacts
.PHONY: clean

fmt: ## Reformat package sources
@go fmt
@go fmt ./...
.PHONY: fmt

dependencies: ## Ensure all the necessary dependencies
Expand All @@ -73,12 +73,12 @@ dep: $(SRCDIR) ## Ensure vendors with dep

dep-update: $(SRCDIR) ## Ensure vendors with dep
@cd $(PRJDIR) && \
dep ensure --update
dep ensure -v --update
.PHONY: dep-update

build: dep ## Build the package
@cd $(PRJDIR) && \
go build -ldflags '-X main.version="${TAG}-${DATE}" -extldflags "-static"'
go build -o helmsman -ldflags '-X main.version="${TAG}-${DATE}" -extldflags "-static"' cmd/helmsman/main.go

generate:
@go generate #${PKGS}
Expand All @@ -87,7 +87,7 @@ generate:
check: $(SRCDIR) fmt
@cd $(PRJDIR) && \
dep check && \
go vet #${PKGS}
go vet ./...
.PHONY: check

repo:
Expand All @@ -96,8 +96,7 @@ repo:
.PHONY: repo

test: dep check repo ## Run unit tests
@cd $(PRJDIR) && \
go test -v -cover -p=1 -args -f example.toml
@go test -v -cover -p=1 ./... -args -f ../../examples/example.toml
.PHONY: test

cross: dep ## Create binaries for all OSs
Expand Down
9 changes: 9 additions & 0 deletions cmd/helmsman/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package main

import (
"github.com/Praqma/helmsman/internal/app"
)

func main() {
app.Main()
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion bindata.go → internal/app/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0982ecb

Please sign in to comment.