Skip to content

Commit

Permalink
update k8s dependency to stable version (#230)
Browse files Browse the repository at this point in the history 
* update k8s dependency to stable version

* now the dependency for k8s is not the release version and this causes problems for #215, because the code-generator is outdated but the latest version for kubernetes 1.8.X fixes problem.
  • Loading branch information
@wackxu @jlewi
wackxu authored and jlewi committed Dec 18, 2017
1 parent c8bcb9d commit 5ada743
Show file tree
Hide file tree
Showing 4,270 changed files with 556,000 additions and 555,617 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 5 additions & 5 deletions cmd/tf_operator/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ import (
"github.com/tensorflow/k8s/pkg/controller"
"github.com/tensorflow/k8s/pkg/util"
"github.com/tensorflow/k8s/pkg/util/k8sutil"
"github.com/tensorflow/k8s/pkg/util/k8sutil/election"
"github.com/tensorflow/k8s/pkg/util/k8sutil/election/resourcelock"
"github.com/tensorflow/k8s/version"
election "k8s.io/client-go/tools/leaderelection"
"k8s.io/client-go/tools/leaderelection/resourcelock"

log "github.com/golang/glog"

"io/ioutil"

"github.com/tensorflow/k8s/pkg/spec"
"k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/record"
)

Expand Down Expand Up @@ -123,11 +123,11 @@ func main() {
// TODO: replace with to client-go once leader election pacakge is imported
// see https://github.com/kubernetes/client-go/issues/28
rl := &resourcelock.EndpointsLock{
EndpointsMeta: v1.ObjectMeta{
EndpointsMeta: metav1.ObjectMeta{
Namespace: namespace,
Name: "tf-operator",
},
Client: k8sutil.MustNewKubeClient(),
Client: k8sutil.MustNewKubeClient().CoreV1(),
LockConfig: resourcelock.ResourceLockConfig{
Identity: id,
EventRecorder: &record.FakeRecorder{},
Expand Down
158 changes: 82 additions & 76 deletions glide.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 5 additions & 9 deletions glide.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,10 @@ ignore:
- github.com/tensorflow/k8s
import:
- package: k8s.io/client-go
version: v4.0.0-beta.0
version: v5.0.0
- package: k8s.io/api
version: fe29995db37613b9c5b2a647544cf627bfa8d299
- package: k8s.io/apimachinery
version: abe34e4f5b4413c282a83011892cbeea5b32223b
version: 019ae5ada31de202164b118aee88ee2d14075c31
- package: k8s.io/apiextensions-apiserver
version: 6d8c23d2e66ce61e2a7e34f92e8eb3eec13279fa
- package: github.com/pkg/errors
version: v0.8.0
- package: github.com/pborman/uuid
version: v1.0
- package: golang.org/x/net
- package: golang.org/x/time
version: kubernetes-1.8.4
Loading

0 comments on commit 5ada743

Please sign in to comment.