Merge pull request #452 from timothysc/1.10

1.10
vmware-tanzu · Jun 27, 2018 · bcd0d9d · bcd0d9d
2 parents f93d497 + cc0fbd3
commit bcd0d9d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.9-alpine3.6
+FROM golang:1.10-alpine
 MAINTAINER Timothy St. Clair "tstclair@heptio.com"
 
 RUN apk add --no-cache ca-certificates bash

diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ ifneq ($(VERBOSE),)
 VERBOSE_FLAG = -v
 endif
 BUILDMNT = /go/src/$(GOTARGET)
-BUILD_IMAGE ?= golang:1.9-alpine3.6
+BUILD_IMAGE ?= golang:1.10-alpine
 BUILDCMD = CGO_ENABLED=0 go build -o $(TARGET) $(VERBOSE_FLAG) -ldflags "-X github.com/heptio/sonobuoy/pkg/buildinfo.Version=$(GIT_VERSION)"
 BUILD = $(BUILDCMD) $(GOTARGET)
 

diff --git a/cmd/sonobuoy/app/run.go b/cmd/sonobuoy/app/run.go
@@ -95,7 +95,7 @@ func submitSonobuoyRun(cmd *cobra.Command, args []string) {
 	}
 
 	if !runflags.skipPreflight {
-		if errs := sbc.PreflightChecks(&ops.PreflightConfig{runflags.namespace}); len(errs) > 0 {
+		if errs := sbc.PreflightChecks(&ops.PreflightConfig{Namespace: runflags.namespace}); len(errs) > 0 {
 			errlog.LogError(errors.New("Preflight checks failed"))
 			for _, err := range errs {
 				errlog.LogError(err)