Skip to content

Commit

Permalink
Fix syntax based on vet output
Browse files Browse the repository at this point in the history
  • Loading branch information
Etienne Tremel committed Oct 11, 2018
1 parent 7e863b4 commit b233090
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ build.docker:
dist:
mkdir -p $(DIST)
GOOS=linux GOARCH=amd64 go build -o $(BINARY) -ldflags $(LDFLAGS) main.go
tar -zcvf $(DIST)/helm-convert$(VERSION).tar.gz $(BINARY) README.md LICENSE plugin.yaml
tar -zcvf $(DIST)/helm-convert_linux_$(VERSION).tar.gz $(BINARY) README.md LICENSE plugin.yaml
GOOS=darwin GOARCH=amd64 go build -o $(BINARY) -ldflags $(LDFLAGS) main.go
tar -zcvf $(DIST)/helm-convert$(VERSION).tar.gz $(BINARY) README.md LICENSE plugin.yaml
tar -zcvf $(DIST)/helm-convert_darwin_$(VERSION).tar.gz $(BINARY) README.md LICENSE plugin.yaml
GOOS=windows GOARCH=amd64 go build -o $(BINARY).exe -ldflags $(LDFLAGS) main.go
tar -zcvf $(DIST)/helm-convert$(VERSION).tar.gz $(BINARY).exe README.md LICENSE plugin.yaml
tar -zcvf $(DIST)/helm-convert_windows_$(VERSION).tar.gz $(BINARY).exe README.md LICENSE plugin.yaml

.PHONY: test-all
test-all: vet lint test
Expand Down
36 changes: 18 additions & 18 deletions cmd/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,17 +145,17 @@ func (k *convertCmd) run() error {

// load chart
chartRequested, err := h.LoadChart(&helm.LoadChartConfig{
k.repoURL,
k.username,
k.password,
k.chart,
k.version,
k.depUp,
k.verify,
k.keyring,
k.certFile,
k.keyFile,
k.caFile,
RepoURL: k.repoURL,
Username: k.username,
Password: k.password,
Chart: k.chart,
Version: k.version,
DepUp: k.depUp,
Verify: k.verify,
Keyring: k.keyring,
CertFile: k.certFile,
KeyFile: k.keyFile,
CaFile: k.caFile,
})
if err != nil {
return prettyError(err)
Expand All @@ -173,13 +173,13 @@ func (k *convertCmd) run() error {

// render charts with given values
renderedManifests, err := h.RenderChart(&helm.RenderChartConfig{
chartRequested,
k.name,
k.namespace,
k.valueFiles,
k.values,
k.stringValues,
k.fileValues,
ChartRequested: chartRequested,
Name: k.name,
Namespace: k.namespace,
ValueFiles: k.valueFiles,
Values: k.values,
StringValues: k.stringValues,
FileValues: k.fileValues,
})
if err != nil {
return prettyError(err)
Expand Down

0 comments on commit b233090

Please sign in to comment.