Merge pull request #123 from upmc-enterprises/podAnnotation18

Implement pod anotations for 1.8 / Upgrade client-go and deps

Gopkg.toml

@@ -0,0 +1,54 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  name = "github.com/Sirupsen/logrus"
+  version = "1.0.4"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/golang/glog"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/heptiolabs/healthcheck"
+
+[[constraint]]
+  name = "github.com/prometheus/client_golang"
+  version = "0.8.0"
+
+[[constraint]]
+  branch="release-1.8"
+  name = "k8s.io/api"
+
+[[constraint]]
+  branch="release-1.8"
+  name = "k8s.io/apimachinery"
+
+[[constraint]]
+  name = "k8s.io/client-go"
+  version = "5.0.1"
+
+[[constraint]]
+  name = "k8s.io/kubernetes"
+  version = "1.8.5"

Makefile

@@ -3,7 +3,7 @@
 
 .PHONY: all build container push clean test
 
-TAG ?= 0.0.9
+TAG ?= 0.0.10
 PREFIX ?= upmcenterprises
 pkgs = $(shell go list ./... | grep -v /vendor/ | grep -v /test/)
 # go source files, ignore vendor directory

cmd/operator/main.go

@@ -45,7 +45,7 @@ import (
 )
 
 var (
-	appVersion = "0.0.9"
+	appVersion = "0.0.10"
 
 	printVersion bool
 	baseImage    string

example/example-es-cluster-minikube.yaml

@@ -5,16 +5,16 @@ metadata:
 spec:
   kibana:
     image: upmcenterprises/kibana:5.3.1
-  #cerebro:
-  #  image: upmcenterprises/cerebro:0.6.8
-  elastic-search-image: upmcenterprises/docker-elasticsearch-kubernetes:5.3.1
+  cerebro:
+   image: upmcenterprises/cerebro:0.6.8
+  elastic-search-image: upmcenterprises/docker-elasticsearch-kubernetes:5.6.4_1
   client-node-replicas: 1
   master-node-replicas: 1
   data-node-replicas: 3
   network-host: 0.0.0.0
   zones: []
   data-volume-size: 10Gi
-  java-options: "-Xms256m -Xmx256m"
+  java-options: "-Xms512m -Xmx512m"
   snapshot:
     scheduler-enabled: false
     bucket-name: elasticsnapshots99

example/example-es-cluster.yaml

@@ -7,6 +7,7 @@ spec:
     image: upmcenterprises/kibana:5.3.1
   cerebro:
     image: upmcenterprises/cerebro:0.6.8
+  elastic-search-image: upmcenterprises/docker-elasticsearch-kubernetes:5.6.4_1
   client-node-replicas: 3
   master-node-replicas: 2
   data-node-replicas: 3

hack/dep-save.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+dep ensure $@
+dep prune
+
+# remove files we don't want
+find vendor \( -name BUILD -o -name .travis.yml -o -name '*_test.go' \) -exec rm {} \;