Merge pull request #88 from pravega/issue-85-zookeeper-latest

Issue-89: Fix windows cross compile error and zk default image
pravega · Oct 10, 2019 · 62ee0e3 · 62ee0e3
2 parents 2c9d271 + 0df1c39
commit 62ee0e3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 go:
-- '1.10'
+- '1.12'
 - tip
 sudo: required
 env:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.10.1-alpine3.7 as go-builder
+FROM golang:1.12.10-alpine3.10 as go-builder
 
 ARG PROJECT_NAME=zookeeper-operator
 ARG REPO_PATH=github.com/pravega/$PROJECT_NAME

diff --git a/README.md b/README.md
@@ -136,7 +136,7 @@ $ kubectl delete -f deploy/all_ns
 ### Build the operator image
 
 Requirements:
-  - Go 1.10+
+  - Go 1.12+
 
 Use the `make` command to build the Zookeeper operator image.
 
@@ -157,7 +157,7 @@ REPOSITORY                    TAG              IMAGE ID        CREATED         S
 
 pravega/zookeeper-operator    0.1.1-3-dirty    2b2d5bcbedf5    10 minutes ago  41.7MB
 
-pravega/zookeeper-operator    latest           2b2d5bcbedf5    10 minutes ago  41.7MB 
+pravega/zookeeper-operator    latest           2b2d5bcbedf5    10 minutes ago  41.7MB
 
 ```
 Optionally push it to a Docker registry.

diff --git a/pkg/apis/zookeeper/v1beta1/zookeepercluster_types.go b/pkg/apis/zookeeper/v1beta1/zookeepercluster_types.go
@@ -13,7 +13,7 @@ package v1beta1
 import (
 	"fmt"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -25,7 +25,7 @@ const (
 
 	// DefaultZkContainerVersion is the default tag used for for the zookeeper
 	// container
-	DefaultZkContainerVersion = "0.2.3"
+	DefaultZkContainerVersion = "latest"
 
 	// DefaultZkContainerPolicy is the default container pull policy used
 	DefaultZkContainerPolicy = "Always"