Getting to compile, dep packaging

dataux · Oct 14, 2017 · 99407f8 · 99407f8
1 parent 751d3f4
commit 99407f8
Show file tree

Hide file tree

Showing 13 changed files with 584 additions and 13 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -0,0 +1,152 @@
+
+# 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"
+
+required = ["github.com/googleapis/gax-go"]
+
+[[constraint]]
+  name = "cloud.google.com/go"
+  version = "0.6.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/araddon/dateparse"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/araddon/gou"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/araddon/qlbridge"
+
+[[constraint]]
+  name = "github.com/coreos/etcd"
+  version = "3.1.3"
+
+[[constraint]]
+  name = "github.com/coreos/pkg"
+  version = "3.0.0"
+
+[[constraint]]
+  name = "github.com/go-sql-driver/mysql"
+  version = "1.3.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/gocql/gocql"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/golang/protobuf"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/hailocab/go-hostpool"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/jmoiron/sqlx"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/kr/pretty"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/lytics/cloudstorage"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/lytics/confl"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/lytics/dfa"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/lytics/go-lytics"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/lytics/grid"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/mattbaird/elastigo"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/sony/sonyflake"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.1.4"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/net"
+
+
+[[override]]
+  #branch = "master"  
+  revision = "da06d194a00e19ce00d9011a13931c3f6f6887c7"
+  name = "github.com/googleapis/gax-go"
+
+[[constraint]]
+  #branch = "master"  
+  revision = "b53b38ad8a6435bd399ea76d0fa74f23149cca4e"
+  name = "golang.org/x/oauth2"
+
+[[constraint]]
+  #branch = "master"
+  revision = "dfa61ae24628a06502b9c2805d983b57e89399b5"
+  name = "google.golang.org/api"
+
+[[constraint]]
+  #branch = "master"
+  #version = "1.0.4"
+  revision = "708a7f9f3283aa2d4f6132d287d78683babe55c8"
+  name = "google.golang.org/grpc"
+
+[[constraint]]
+  branch = "v2"
+  name = "gopkg.in/mgo.v2"
+
+# [[constraint]]
+#   branch = "master"
+#   name = "k8s.io/apimachinery"
+
+# [[constraint]]
+#   name = "k8s.io/client-go"
+#   version = "4.0.0"
+
+# [[constraint]]
+#   branch = "master"
+#   name = "k8s.io/apimachinery"
+
+# [[constraint]]
+#   # 10/13/2017 this 4.0.0 no longer works with apimachinery master
+#   # so we are locking to newer version?
+#   name = "k8s.io/client-go"
+#   version = "4.0.0"
+#   #revision = "82aa063804cf055e16e8911250f888bc216e8b61"
diff --git a/backends/kubernetes/README.md → backends/_kube/README.md b/backends/kubernetes/README.md → backends/_kube/README.md
diff --git a/backends/kubernetes/client.go → backends/_kube/client.go b/backends/kubernetes/client.go → backends/_kube/client.go
@@ -11,8 +11,10 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/api/iterator"
 
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
 )
 
 // Objects returns an iterator over the objects in the bucket that match the Query q.

diff --git a/backends/kubernetes/conf/dataux.yaml → backends/_kube/conf/dataux.yaml b/backends/kubernetes/conf/dataux.yaml → backends/_kube/conf/dataux.yaml
diff --git a/backends/kubernetes/dataux.conf → backends/_kube/dataux.conf b/backends/kubernetes/dataux.conf → backends/_kube/dataux.conf
diff --git a/backends/kubernetes/kube_test.go → backends/_kube/kube_test.go b/backends/kubernetes/kube_test.go → backends/_kube/kube_test.go
diff --git a/backends/kubernetes/resultreader.go → backends/_kube/resultreader.go b/backends/kubernetes/resultreader.go → backends/_kube/resultreader.go
diff --git a/backends/kubernetes/source.go → backends/_kube/source.go b/backends/kubernetes/source.go → backends/_kube/source.go
@@ -11,9 +11,11 @@ import (
 
 	u "github.com/araddon/gou"
 
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+
 	"k8s.io/client-go/tools/clientcmd"
 
 	"github.com/araddon/qlbridge/datasource"

diff --git a/backends/kubernetes/sql_to_kube.go → backends/_kube/sql_to_kube.go b/backends/kubernetes/sql_to_kube.go → backends/_kube/sql_to_kube.go
diff --git a/build.sh b/build.sh
@@ -14,16 +14,16 @@ docker rmi -f gcr.io/dataux-io/dataux:latest
 # docker rm -f gcr.io/dataux-io/dataux:v0.15.0
 # docker rmi -f gcr.io/dataux-io/dataux:v0.15.0
 
-docker rm -f gcr.io/dataux-io/dataux:v2017.05.29a
-docker rmi -f gcr.io/dataux-io/dataux:v2017.05.29a
+docker rm -f gcr.io/dataux-io/dataux:v0.15.1
+docker rmi -f gcr.io/dataux-io/dataux:v0.15.1
 
 # if you get auth issues
 #
 #  rm ~/.docker/config.json 
 #  gcloud docker --authorize-only
 
-docker build -t gcr.io/dataux-io/dataux:v2017.05.29a .
-gcloud docker -- push gcr.io/dataux-io/dataux:v2017.05.29a
+docker build -t gcr.io/dataux-io/dataux:v0.15.1 .
+gcloud docker -- push gcr.io/dataux-io/dataux:v0.15.1
 
 docker build -t gcr.io/dataux-io/dataux:latest .
 gcloud docker -- push gcr.io/dataux-io/dataux:latest

diff --git a/main.go b/main.go
@@ -17,10 +17,16 @@ import (
 	_ "github.com/dataux/dataux/backends/cassandra"
 	_ "github.com/dataux/dataux/backends/datastore"
 	_ "github.com/dataux/dataux/backends/elasticsearch"
-	_ "github.com/dataux/dataux/backends/kubernetes"
 	_ "github.com/dataux/dataux/backends/lytics"
 	_ "github.com/dataux/dataux/backends/mongo"
 
+	// I cannot get this working right now, currently
+	// a conflict between etcd &kube dependencies that seems un-resolveable
+	//_ "github.com/dataux/dataux/backends/kubernetes"
+
+	// fake for dep
+	_ "google.golang.org/grpc"
+
 	// Frontend's side-effect imports
 	_ "github.com/dataux/dataux/frontends/mysqlfe"
 

diff --git a/updatepackages.sh b/updatepackages.sh
@@ -1,21 +1,21 @@
 #! /bin/sh
 
-
-
+cd $GOPATH/src/cloud.google.com/go/ && git checkout master && git pull && git checkout v0.15
+cd $GOPATH/src/github.com/PuerkitoBio/purell && git checkout master && git pull
+cd $GOPATH/src/github.com/PuerkitoBio/purell && git checkout master && git pull
 cd $GOPATH/src/github.com/araddon/dateparse && git checkout master && git pull
 cd $GOPATH/src/github.com/araddon/gou && git checkout master && git pull
 #cd $GOPATH/src/github.com/araddon/qlbridge && git checkout master && git pull
+cd $GOPATH/src/github.com/asaskevich/govalidator && git checkout master && git pull
 cd $GOPATH/src/github.com/beorn7/perks && git checkout master && git pull
 cd $GOPATH/src/github.com/bitly/go-hostpool && git checkout master && git pull
-cd $GOPATH/src/github.com/bmizerany/assert && git checkout master && git pull
 # we are pinned to a slightly older version of etcd/bolt until
 #  metafora upgrades
 cd $GOPATH/src/github.com/boltdb/bolt && git checkout master && git pull
 cd $GOPATH/src/github.com/cockroachdb/cmux && git checkout master && git pull
 
-cd $GOPATH/src/github.com/coreos/etcd && git checkout master && git pull && git checkout v3.1.6
+cd $GOPATH/src/github.com/coreos/etcd && git checkout master && git pull && git checkout v3.2.9
 
-cd $GOPATH/src/github.com/coreos/go-etcd && git checkout master && git pull
 cd $GOPATH/src/github.com/coreos/go-semver && git checkout master && git pull
 cd $GOPATH/src/github.com/coreos/go-systemd  && git checkout master && git pull
 cd $GOPATH/src/github.com/coreos/pkg && git checkout master && git pull
@@ -75,8 +75,8 @@ cd $GOPATH/src/golang.org/x/net && git checkout master && git pull
 cd $GOPATH/src/golang.org/x/oauth2 && git checkout master && git pull
 cd $GOPATH/src/google.golang.org/api && git checkout master && git pull
 cd $GOPATH/src/google.golang.org/genproto && git checkout master && git pull
-cd $GOPATH/src/google.golang.org/grpc && git checkout master && git pull && git checkout v1.0.4 # check coreos/etcd for changes glide.yaml
-cd $GOPATH/src/cloud.google.com/go/ && git checkout master && git pull && git checkout v0.6.0 # needed by upstream
+cd $GOPATH/src/google.golang.org/grpc && git checkout master && git pull #&& git checkout v1.0.4 # check coreos/etcd for changes glide.yaml
+
 cd $GOPATH/src/gopkg.in/inf.v0 && git checkout master && git pull
 # this one is a pain, don't update manually, c headers?
 #cd $GOPATH/src/gopkg.in/mgo.v2 && git checkout master && git pull
@@ -85,6 +85,8 @@ cd $GOPATH/src/gopkg.in/yaml.v2 && git checkout master && git pull
 #echo "Fetch k8s.io"
 cd $GOPATH/src/k8s.io/apimachinery && git checkout master && git pull # && git checkout xxx # ??
 cd $GOPATH/src/k8s.io/client-go && git checkout master && git pull # && git checkout xxx # ??
+cd $GOPATH/src/k8s.io/api && git checkout master && git pull # && git checkout xxx # ??
+cd $GOPATH/src/k8s.io/kube-openapi && git checkout master && git pull # && git checkout xxx # ??
 
 #go get -u -v ./...