Merge pull request #47 from jetstack-experimental/update-deps

Update Kubernetes deps to use release-1.8 branches

Gopkg.toml

@@ -29,26 +29,22 @@ required = [
  "k8s.io/code-generator/cmd/lister-gen",
 ]
 
-[[constraint]]
- name = "github.com/Sirupsen/logrus"
- revision = "v0.6.2-10-g51fe59a"
-
 [[constraint]]
  name = "k8s.io/client-go"
- branch = "master"
+ branch = "release-5.0"
 
 [[constraint]]
  name = "k8s.io/apimachinery"
- branch = "master"
+ branch = "release-1.8"
 
 [[constraint]]
  name = "k8s.io/api"
- branch = "master"
+ branch = "release-1.8"
 
 [[constraint]]
  name = "k8s.io/apiserver"
- branch = "master"
+ branch = "release-1.8"
 
-[[override]]
- name = "google.golang.org/grpc"
- version = "=1.2.1"
+[[constraint]]
+ name = "k8s.io/code-generator"
+ branch = "release-1.8"

Makefile

@@ -44,7 +44,7 @@ generate: .generate_files
 
 verify: .hack_verify go_verify
 
-.hack_verify: .generate_exes
+.hack_verify:
  @echo Running repo-infra verify scripts
  @echo Running href checker:
  @${HACK_DIR}/verify-links.sh
@@ -94,43 +94,7 @@ go_fmt:
 
 # This section contains the code generation stuff
 #################################################
-.generate_exes: \
- $(BINDIR)/defaulter-gen \
- $(BINDIR)/deepcopy-gen \
- $(BINDIR)/conversion-gen \
- $(BINDIR)/client-gen \
- $(BINDIR)/lister-gen \
- $(BINDIR)/informer-gen
- touch $@
-
-$(BINDIR)/%:
- go build -o $@ ./vendor/k8s.io/code-generator/cmd/$*
-
-# Regenerate all files if the gen exes changed or any "types.go" files changed
-.generate_files: .generate_exes $(TYPES_FILES)
- # Generate defaults
- $(BINDIR)/defaulter-gen \
- --v 1 --logtostderr \
- --go-header-file "$(HACK_DIR)/boilerplate.go.txt" \
- --input-dirs "$(NAVIGATOR_PKG)/pkg/apis/navigator" \
- --input-dirs "$(NAVIGATOR_PKG)/pkg/apis/navigator/v1alpha1" \
- --extra-peer-dirs "$(NAVIGATOR_PKG)/pkg/apis/navigator" \
- --extra-peer-dirs "$(NAVIGATOR_PKG)/pkg/apis/navigator/v1alpha1" \
- --output-file-base "zz_generated.defaults"
- # Generate deep copies
- $(BINDIR)/deepcopy-gen \
- --v 1 --logtostderr \
- --go-header-file "$(HACK_DIR)/boilerplate.go.txt" \
- --input-dirs "$(NAVIGATOR_PKG)/pkg/apis/navigator" \
- --input-dirs "$(NAVIGATOR_PKG)/pkg/apis/navigator/v1alpha1" \
- --bounding-dirs "github.com/openshift/open-service-broker-sdk" \
- --output-file-base zz_generated.deepcopy
- # Generate conversions
- $(BINDIR)/conversion-gen \
- --v 1 --logtostderr \
- --go-header-file "$(HACK_DIR)/boilerplate.go.txt" \
- --input-dirs "$(NAVIGATOR_PKG)/pkg/apis/navigator" \
- --input-dirs "$(NAVIGATOR_PKG)/pkg/apis/navigator/v1alpha1" \
- --output-file-base zz_generated.conversion
+# Regenerate all files if any "types.go" files changed
+.generate_files: $(TYPES_FILES)
  # generate all pkg/client contents
  $(HACK_DIR)/update-client-gen.sh

cmd/apiserver/start.go

@@ -30,8 +30,8 @@ import (
 
  "github.com/jetstack-experimental/navigator/pkg/apis/navigator/v1alpha1"
  "github.com/jetstack-experimental/navigator/pkg/apiserver"
- clientset "github.com/jetstack-experimental/navigator/pkg/client/clientset_generated/internalclientset"
- informers "github.com/jetstack-experimental/navigator/pkg/client/informers_generated/internalversion"
+ clientset "github.com/jetstack-experimental/navigator/pkg/client/clientset/internalversion"
+ informers "github.com/jetstack-experimental/navigator/pkg/client/informers/internalversion"
 )
 
 const defaultEtcdPathPrefix = "/registry/navigator.jetstack.io"
@@ -104,7 +104,7 @@ func (o NavigatorServerOptions) Config() (*apiserver.Config, error) {
  return nil, fmt.Errorf("error creating self-signed certificates: %v", err)
  }
 
- serverConfig := genericapiserver.NewConfig(apiserver.Codecs)
+ serverConfig := genericapiserver.NewRecommendedConfig(apiserver.Codecs)
  if err := o.RecommendedOptions.ApplyTo(serverConfig); err != nil {
  return nil, err
  }

cmd/controller/app/controller.go

@@ -18,8 +18,8 @@ import (
  "k8s.io/client-go/tools/record"
 
  "github.com/jetstack-experimental/navigator/cmd/controller/app/options"
- clientset "github.com/jetstack-experimental/navigator/pkg/client/clientset_generated/clientset"
- intscheme "github.com/jetstack-experimental/navigator/pkg/client/clientset_generated/clientset/scheme"
+ clientset "github.com/jetstack-experimental/navigator/pkg/client/clientset/versioned"
+ intscheme "github.com/jetstack-experimental/navigator/pkg/client/clientset/versioned/scheme"
  "github.com/jetstack-experimental/navigator/pkg/controllers"
  "github.com/jetstack-experimental/navigator/pkg/kube"
 )