From a2444c43d8bae2855aed81c64189af95a5c55221 Mon Sep 17 00:00:00 2001 From: Sunil Arora Date: Tue, 17 Jul 2018 13:25:11 -0700 Subject: [PATCH] updated the controller-tools dependencies --- cmd/Gopkg.lock | 2 +- .../controller-tools/pkg/scaffold/project/gopkg.go | 5 +++++ .../controller-tools/pkg/scaffold/resource/types.go | 4 ++-- .../test/pkg/apis/creatures/v2alpha1/kraken_types.go | 4 ++-- .../test/pkg/apis/crew/v1/firstmate_types.go | 4 ++-- .../test/pkg/apis/ship/v1beta1/frigate_types.go | 4 ++-- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cmd/Gopkg.lock b/cmd/Gopkg.lock index 20695fde65..e540e1e41b 100644 --- a/cmd/Gopkg.lock +++ b/cmd/Gopkg.lock @@ -204,7 +204,7 @@ "pkg/scaffold/resource", "pkg/util" ] - revision = "cf6c0f0d997b161c6e4f54a4fe597e2c74f0d566" + revision = "dd7e475702b6eec1fd430001a8f210e9e7281c5f" [solve-meta] analyzer-name = "dep" diff --git a/cmd/vendor/sigs.k8s.io/controller-tools/pkg/scaffold/project/gopkg.go b/cmd/vendor/sigs.k8s.io/controller-tools/pkg/scaffold/project/gopkg.go index c75b5a0dbc..8f3c663a56 100644 --- a/cmd/vendor/sigs.k8s.io/controller-tools/pkg/scaffold/project/gopkg.go +++ b/cmd/vendor/sigs.k8s.io/controller-tools/pkg/scaffold/project/gopkg.go @@ -315,4 +315,9 @@ revision="f53464b8b84b4507805a0b033a8377b225163fea" name = "github.com/thockin/logr" source = "https://github.com/directxman12/logr.git" branch = "features/structed" + +# For dependency below: Refer to issue https://github.com/golang/dep/issues/1799 +[[override]] +name = "gopkg.in/fsnotify.v1" +source = "https://github.com/fsnotify/fsnotify.git" ` diff --git a/cmd/vendor/sigs.k8s.io/controller-tools/pkg/scaffold/resource/types.go b/cmd/vendor/sigs.k8s.io/controller-tools/pkg/scaffold/resource/types.go index 033e3dc69c..5152e26b8d 100644 --- a/cmd/vendor/sigs.k8s.io/controller-tools/pkg/scaffold/resource/types.go +++ b/cmd/vendor/sigs.k8s.io/controller-tools/pkg/scaffold/resource/types.go @@ -64,13 +64,13 @@ import ( // {{.Resource.Kind}}Spec defines the desired state of {{.Resource.Kind}} type {{.Resource.Kind}}Spec struct { // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster - // Important: Run "kubebuilder generate" to regenerate code after modifying this file + // Important: Run "make" to regenerate code after modifying this file } // {{.Resource.Kind}}Status defines the observed state of {{.Resource.Kind}} type {{.Resource.Kind}}Status struct { // INSERT ADDITIONAL STATUS FIELD - define observed state of cluster - // Important: Run "kubebuilder generate" to regenerate code after modifying this file + // Important: Run "make" to regenerate code after modifying this file } // +genclient diff --git a/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/creatures/v2alpha1/kraken_types.go b/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/creatures/v2alpha1/kraken_types.go index bc28feac2e..ddb55734a3 100644 --- a/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/creatures/v2alpha1/kraken_types.go +++ b/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/creatures/v2alpha1/kraken_types.go @@ -26,13 +26,13 @@ import ( // KrakenSpec defines the desired state of Kraken type KrakenSpec struct { // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster - // Important: Run "kubebuilder generate" to regenerate code after modifying this file + // Important: Run "make" to regenerate code after modifying this file } // KrakenStatus defines the observed state of Kraken type KrakenStatus struct { // INSERT ADDITIONAL STATUS FIELD - define observed state of cluster - // Important: Run "kubebuilder generate" to regenerate code after modifying this file + // Important: Run "make" to regenerate code after modifying this file } // +genclient diff --git a/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/crew/v1/firstmate_types.go b/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/crew/v1/firstmate_types.go index 8342a76b27..a493761d59 100644 --- a/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/crew/v1/firstmate_types.go +++ b/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/crew/v1/firstmate_types.go @@ -26,13 +26,13 @@ import ( // FirstMateSpec defines the desired state of FirstMate type FirstMateSpec struct { // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster - // Important: Run "kubebuilder generate" to regenerate code after modifying this file + // Important: Run "make" to regenerate code after modifying this file } // FirstMateStatus defines the observed state of FirstMate type FirstMateStatus struct { // INSERT ADDITIONAL STATUS FIELD - define observed state of cluster - // Important: Run "kubebuilder generate" to regenerate code after modifying this file + // Important: Run "make" to regenerate code after modifying this file } // +genclient diff --git a/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/ship/v1beta1/frigate_types.go b/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/ship/v1beta1/frigate_types.go index 4c4f72f169..8c49704a4a 100644 --- a/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/ship/v1beta1/frigate_types.go +++ b/cmd/vendor/sigs.k8s.io/controller-tools/test/pkg/apis/ship/v1beta1/frigate_types.go @@ -26,13 +26,13 @@ import ( // FrigateSpec defines the desired state of Frigate type FrigateSpec struct { // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster - // Important: Run "kubebuilder generate" to regenerate code after modifying this file + // Important: Run "make" to regenerate code after modifying this file } // FrigateStatus defines the observed state of Frigate type FrigateStatus struct { // INSERT ADDITIONAL STATUS FIELD - define observed state of cluster - // Important: Run "kubebuilder generate" to regenerate code after modifying this file + // Important: Run "make" to regenerate code after modifying this file } // +genclient