VOL-2265 test go.mod and vendor consistency;
Update dependencies to resolve `410 Gone` errors when fetching modules
Change-Id: If0bdbc1b6d629ce819b9fa4701c016df812f92d5
diff --git a/vendor/k8s.io/api/admissionregistration/v1beta1/generated.pb.go b/vendor/k8s.io/api/admissionregistration/v1beta1/generated.pb.go
index b7ab68a..9c3742e 100644
--- a/vendor/k8s.io/api/admissionregistration/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/admissionregistration/v1beta1/generated.pb.go
@@ -37,16 +37,21 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/apps/v1/generated.pb.go b/vendor/k8s.io/api/apps/v1/generated.pb.go
index 5b29f43..89bc75f 100644
--- a/vendor/k8s.io/api/apps/v1/generated.pb.go
+++ b/vendor/k8s.io/api/apps/v1/generated.pb.go
@@ -55,19 +55,25 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
+ math "math"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import io "io"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/apps/v1beta1/generated.pb.go b/vendor/k8s.io/api/apps/v1beta1/generated.pb.go
index 9353047..d2d4918 100644
--- a/vendor/k8s.io/api/apps/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/apps/v1beta1/generated.pb.go
@@ -48,21 +48,27 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
+ math "math"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-import io "io"
+ k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
+
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/apps/v1beta2/generated.pb.go b/vendor/k8s.io/api/apps/v1beta2/generated.pb.go
index fc1efbc..05f47d5 100644
--- a/vendor/k8s.io/api/apps/v1beta2/generated.pb.go
+++ b/vendor/k8s.io/api/apps/v1beta2/generated.pb.go
@@ -58,21 +58,27 @@
*/
package v1beta2
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
+ math "math"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-import io "io"
+ k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
+
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/auditregistration/v1alpha1/generated.pb.go b/vendor/k8s.io/api/auditregistration/v1alpha1/generated.pb.go
index f540a03..8acf47d 100644
--- a/vendor/k8s.io/api/auditregistration/v1alpha1/generated.pb.go
+++ b/vendor/k8s.io/api/auditregistration/v1alpha1/generated.pb.go
@@ -35,14 +35,19 @@
*/
package v1alpha1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import strings "strings"
-import reflect "reflect"
+ proto "github.com/gogo/protobuf/proto"
-import io "io"
+ math "math"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/authentication/v1/generated.pb.go b/vendor/k8s.io/api/authentication/v1/generated.pb.go
index 4e7f28d..f7248e1 100644
--- a/vendor/k8s.io/api/authentication/v1/generated.pb.go
+++ b/vendor/k8s.io/api/authentication/v1/generated.pb.go
@@ -36,18 +36,23 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
+ proto "github.com/gogo/protobuf/proto"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ math "math"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
-import io "io"
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/authentication/v1beta1/generated.pb.go b/vendor/k8s.io/api/authentication/v1beta1/generated.pb.go
index 5f34e76..245d278 100644
--- a/vendor/k8s.io/api/authentication/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/authentication/v1beta1/generated.pb.go
@@ -32,16 +32,21 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/authorization/v1/generated.pb.go b/vendor/k8s.io/api/authorization/v1/generated.pb.go
index fc6a25f..03040aa 100644
--- a/vendor/k8s.io/api/authorization/v1/generated.pb.go
+++ b/vendor/k8s.io/api/authorization/v1/generated.pb.go
@@ -41,16 +41,21 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/authorization/v1beta1/generated.pb.go b/vendor/k8s.io/api/authorization/v1beta1/generated.pb.go
index 7cce98e..9769af1 100644
--- a/vendor/k8s.io/api/authorization/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/authorization/v1beta1/generated.pb.go
@@ -41,16 +41,21 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/autoscaling/v1/generated.pb.go b/vendor/k8s.io/api/autoscaling/v1/generated.pb.go
index 950e933..82c3938 100644
--- a/vendor/k8s.io/api/autoscaling/v1/generated.pb.go
+++ b/vendor/k8s.io/api/autoscaling/v1/generated.pb.go
@@ -46,19 +46,25 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_api_resource "k8s.io/apimachinery/pkg/api/resource"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ math "math"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_apimachinery_pkg_api_resource "k8s.io/apimachinery/pkg/api/resource"
-import io "io"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/autoscaling/v2beta1/generated.pb.go b/vendor/k8s.io/api/autoscaling/v2beta1/generated.pb.go
index b6a5f35..ecb5ee7 100644
--- a/vendor/k8s.io/api/autoscaling/v2beta1/generated.pb.go
+++ b/vendor/k8s.io/api/autoscaling/v2beta1/generated.pb.go
@@ -43,19 +43,25 @@
*/
package v2beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_api_resource "k8s.io/apimachinery/pkg/api/resource"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ math "math"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_apimachinery_pkg_api_resource "k8s.io/apimachinery/pkg/api/resource"
-import io "io"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/autoscaling/v2beta2/generated.pb.go b/vendor/k8s.io/api/autoscaling/v2beta2/generated.pb.go
index 816fea9..1007d27 100644
--- a/vendor/k8s.io/api/autoscaling/v2beta2/generated.pb.go
+++ b/vendor/k8s.io/api/autoscaling/v2beta2/generated.pb.go
@@ -46,19 +46,25 @@
*/
package v2beta2
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_api_resource "k8s.io/apimachinery/pkg/api/resource"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ math "math"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_apimachinery_pkg_api_resource "k8s.io/apimachinery/pkg/api/resource"
-import io "io"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/batch/v1/generated.pb.go b/vendor/k8s.io/api/batch/v1/generated.pb.go
index 3aa32b5..8f4cc88 100644
--- a/vendor/k8s.io/api/batch/v1/generated.pb.go
+++ b/vendor/k8s.io/api/batch/v1/generated.pb.go
@@ -32,17 +32,23 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/batch/v1beta1/generated.pb.go b/vendor/k8s.io/api/batch/v1beta1/generated.pb.go
index 36342a3..524b7b2 100644
--- a/vendor/k8s.io/api/batch/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/batch/v1beta1/generated.pb.go
@@ -33,17 +33,23 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/batch/v2alpha1/generated.pb.go b/vendor/k8s.io/api/batch/v2alpha1/generated.pb.go
index 4d9ba5c..e6f17cc 100644
--- a/vendor/k8s.io/api/batch/v2alpha1/generated.pb.go
+++ b/vendor/k8s.io/api/batch/v2alpha1/generated.pb.go
@@ -33,17 +33,23 @@
*/
package v2alpha1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/certificates/v1beta1/generated.pb.go b/vendor/k8s.io/api/certificates/v1beta1/generated.pb.go
index 19bf225..8b6964c 100644
--- a/vendor/k8s.io/api/certificates/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/certificates/v1beta1/generated.pb.go
@@ -33,16 +33,21 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/coordination/v1/generated.pb.go b/vendor/k8s.io/api/coordination/v1/generated.pb.go
index 349c685..1a87eaf 100644
--- a/vendor/k8s.io/api/coordination/v1/generated.pb.go
+++ b/vendor/k8s.io/api/coordination/v1/generated.pb.go
@@ -30,16 +30,21 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/coordination/v1beta1/generated.pb.go b/vendor/k8s.io/api/coordination/v1beta1/generated.pb.go
index aa57e9d..62493ae 100644
--- a/vendor/k8s.io/api/coordination/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/coordination/v1beta1/generated.pb.go
@@ -30,16 +30,21 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/core/v1/generated.pb.go b/vendor/k8s.io/api/core/v1/generated.pb.go
index 79ecb26..a22473e 100644
--- a/vendor/k8s.io/api/core/v1/generated.pb.go
+++ b/vendor/k8s.io/api/core/v1/generated.pb.go
@@ -225,22 +225,29 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_api_resource "k8s.io/apimachinery/pkg/api/resource"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-import k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime"
+ proto "github.com/gogo/protobuf/proto"
-import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
+ math "math"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ k8s_io_apimachinery_pkg_api_resource "k8s.io/apimachinery/pkg/api/resource"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-import io "io"
+ k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime"
+
+ k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
+
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/events/v1beta1/generated.pb.go b/vendor/k8s.io/api/events/v1beta1/generated.pb.go
index bb0c881..bbaa909 100644
--- a/vendor/k8s.io/api/events/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/events/v1beta1/generated.pb.go
@@ -30,16 +30,21 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/extensions/v1beta1/generated.pb.go b/vendor/k8s.io/api/extensions/v1beta1/generated.pb.go
index 4439535..ed7a9e6 100644
--- a/vendor/k8s.io/api/extensions/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/extensions/v1beta1/generated.pb.go
@@ -84,21 +84,27 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
+ math "math"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-import io "io"
+ k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
+
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/networking/v1/generated.pb.go b/vendor/k8s.io/api/networking/v1/generated.pb.go
index 86bd80c..52a86e3 100644
--- a/vendor/k8s.io/api/networking/v1/generated.pb.go
+++ b/vendor/k8s.io/api/networking/v1/generated.pb.go
@@ -35,20 +35,25 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
+ math "math"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
-import io "io"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/networking/v1beta1/generated.pb.go b/vendor/k8s.io/api/networking/v1beta1/generated.pb.go
index 14430cb..90b9434 100644
--- a/vendor/k8s.io/api/networking/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/networking/v1beta1/generated.pb.go
@@ -37,14 +37,19 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import strings "strings"
-import reflect "reflect"
+ proto "github.com/gogo/protobuf/proto"
-import io "io"
+ math "math"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/node/v1alpha1/generated.pb.go b/vendor/k8s.io/api/node/v1alpha1/generated.pb.go
index 16f5af9..e9c502a 100644
--- a/vendor/k8s.io/api/node/v1alpha1/generated.pb.go
+++ b/vendor/k8s.io/api/node/v1alpha1/generated.pb.go
@@ -30,14 +30,19 @@
*/
package v1alpha1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import strings "strings"
-import reflect "reflect"
+ proto "github.com/gogo/protobuf/proto"
-import io "io"
+ math "math"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/node/v1beta1/generated.pb.go b/vendor/k8s.io/api/node/v1beta1/generated.pb.go
index 27251a8..a2f213b 100644
--- a/vendor/k8s.io/api/node/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/node/v1beta1/generated.pb.go
@@ -29,14 +29,19 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import strings "strings"
-import reflect "reflect"
+ proto "github.com/gogo/protobuf/proto"
-import io "io"
+ math "math"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/policy/v1beta1/generated.pb.go b/vendor/k8s.io/api/policy/v1beta1/generated.pb.go
index b0fe972..a2b8398 100644
--- a/vendor/k8s.io/api/policy/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/policy/v1beta1/generated.pb.go
@@ -46,21 +46,27 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
+ math "math"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-import io "io"
+ k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr"
+
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/rbac/v1/generated.pb.go b/vendor/k8s.io/api/rbac/v1/generated.pb.go
index 708db32..3236cee 100644
--- a/vendor/k8s.io/api/rbac/v1/generated.pb.go
+++ b/vendor/k8s.io/api/rbac/v1/generated.pb.go
@@ -39,16 +39,21 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/rbac/v1alpha1/generated.pb.go b/vendor/k8s.io/api/rbac/v1alpha1/generated.pb.go
index e035b33..355196b 100644
--- a/vendor/k8s.io/api/rbac/v1alpha1/generated.pb.go
+++ b/vendor/k8s.io/api/rbac/v1alpha1/generated.pb.go
@@ -39,16 +39,21 @@
*/
package v1alpha1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/rbac/v1beta1/generated.pb.go b/vendor/k8s.io/api/rbac/v1beta1/generated.pb.go
index 904a6e7..b1e9839 100644
--- a/vendor/k8s.io/api/rbac/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/rbac/v1beta1/generated.pb.go
@@ -39,16 +39,21 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/scheduling/v1/generated.pb.go b/vendor/k8s.io/api/scheduling/v1/generated.pb.go
index bed5f2f..9a29909 100644
--- a/vendor/k8s.io/api/scheduling/v1/generated.pb.go
+++ b/vendor/k8s.io/api/scheduling/v1/generated.pb.go
@@ -29,16 +29,21 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/scheduling/v1alpha1/generated.pb.go b/vendor/k8s.io/api/scheduling/v1alpha1/generated.pb.go
index 3fedb7d..59dbb5e 100644
--- a/vendor/k8s.io/api/scheduling/v1alpha1/generated.pb.go
+++ b/vendor/k8s.io/api/scheduling/v1alpha1/generated.pb.go
@@ -29,16 +29,21 @@
*/
package v1alpha1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/scheduling/v1beta1/generated.pb.go b/vendor/k8s.io/api/scheduling/v1beta1/generated.pb.go
index 58bbf83..d5d9e5a 100644
--- a/vendor/k8s.io/api/scheduling/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/scheduling/v1beta1/generated.pb.go
@@ -29,16 +29,21 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/settings/v1alpha1/generated.pb.go b/vendor/k8s.io/api/settings/v1alpha1/generated.pb.go
index c842131..6cb51a8 100644
--- a/vendor/k8s.io/api/settings/v1alpha1/generated.pb.go
+++ b/vendor/k8s.io/api/settings/v1alpha1/generated.pb.go
@@ -30,16 +30,21 @@
*/
package v1alpha1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ proto "github.com/gogo/protobuf/proto"
-import strings "strings"
-import reflect "reflect"
+ math "math"
-import io "io"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/storage/v1/generated.pb.go b/vendor/k8s.io/api/storage/v1/generated.pb.go
index 96bba05..da9d917 100644
--- a/vendor/k8s.io/api/storage/v1/generated.pb.go
+++ b/vendor/k8s.io/api/storage/v1/generated.pb.go
@@ -35,18 +35,23 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ proto "github.com/gogo/protobuf/proto"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ math "math"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import io "io"
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/storage/v1alpha1/generated.pb.go b/vendor/k8s.io/api/storage/v1alpha1/generated.pb.go
index 3289641..8630937 100644
--- a/vendor/k8s.io/api/storage/v1alpha1/generated.pb.go
+++ b/vendor/k8s.io/api/storage/v1alpha1/generated.pb.go
@@ -33,18 +33,23 @@
*/
package v1alpha1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ proto "github.com/gogo/protobuf/proto"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ math "math"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import io "io"
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/api/storage/v1beta1/generated.pb.go b/vendor/k8s.io/api/storage/v1beta1/generated.pb.go
index d76a35e..802f05a 100644
--- a/vendor/k8s.io/api/storage/v1beta1/generated.pb.go
+++ b/vendor/k8s.io/api/storage/v1beta1/generated.pb.go
@@ -42,18 +42,23 @@
*/
package v1beta1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_api_core_v1 "k8s.io/api/core/v1"
+ proto "github.com/gogo/protobuf/proto"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ math "math"
-import strings "strings"
-import reflect "reflect"
+ k8s_io_api_core_v1 "k8s.io/api/core/v1"
-import io "io"
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/generated.pb.go b/vendor/k8s.io/apimachinery/pkg/api/resource/generated.pb.go
index 9d7835b..1b2cb05 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/generated.pb.go
+++ b/vendor/k8s.io/apimachinery/pkg/api/resource/generated.pb.go
@@ -28,9 +28,13 @@
*/
package resource
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
+
+ proto "github.com/gogo/protobuf/proto"
+
+ math "math"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
index c8ff6e3..034eaaa 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
+++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
@@ -72,21 +72,27 @@
*/
package v1
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime"
+ proto "github.com/gogo/protobuf/proto"
-import time "time"
-import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
+ math "math"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+ k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime"
-import strings "strings"
-import reflect "reflect"
+ time "time"
-import io "io"
+ k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
+
+ github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go b/vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go
index 9b15989..5781b2c 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go
+++ b/vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go
@@ -30,14 +30,19 @@
*/
package runtime
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import strings "strings"
-import reflect "reflect"
+ proto "github.com/gogo/protobuf/proto"
-import io "io"
+ math "math"
+
+ strings "strings"
+
+ reflect "reflect"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go b/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go
index 28a61d5..c93861c 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go
+++ b/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go
@@ -27,9 +27,13 @@
*/
package schema
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
+
+ proto "github.com/gogo/protobuf/proto"
+
+ math "math"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go b/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go
index 48dd7d9..1ac96c9 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go
+++ b/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go
@@ -28,11 +28,15 @@
*/
package intstr
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+ fmt "fmt"
-import io "io"
+ proto "github.com/gogo/protobuf/proto"
+
+ math "math"
+
+ io "io"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
diff --git a/vendor/k8s.io/client-go/tools/reference/ref.go b/vendor/k8s.io/client-go/tools/reference/ref.go
index 573d948..442a991 100644
--- a/vendor/k8s.io/client-go/tools/reference/ref.go
+++ b/vendor/k8s.io/client-go/tools/reference/ref.go
@@ -19,8 +19,6 @@
import (
"errors"
"fmt"
- "net/url"
- "strings"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
@@ -30,8 +28,7 @@
var (
// Errors that could be returned by GetReference.
- ErrNilObject = errors.New("can't reference a nil object")
- ErrNoSelfLink = errors.New("selfLink was empty, can't make reference")
+ ErrNilObject = errors.New("can't reference a nil object")
)
// GetReference returns an ObjectReference which refers to the given
@@ -47,20 +44,6 @@
return ref, nil
}
- gvk := obj.GetObjectKind().GroupVersionKind()
-
- // if the object referenced is actually persisted, we can just get kind from meta
- // if we are building an object reference to something not yet persisted, we should fallback to scheme
- kind := gvk.Kind
- if len(kind) == 0 {
- // TODO: this is wrong
- gvks, _, err := scheme.ObjectKinds(obj)
- if err != nil {
- return nil, err
- }
- kind = gvks[0].Kind
- }
-
// An object that implements only List has enough metadata to build a reference
var listMeta metav1.Common
objectMeta, err := meta.Accessor(obj)
@@ -73,29 +56,29 @@
listMeta = objectMeta
}
- // if the object referenced is actually persisted, we can also get version from meta
- version := gvk.GroupVersion().String()
- if len(version) == 0 {
- selfLink := listMeta.GetSelfLink()
- if len(selfLink) == 0 {
- return nil, ErrNoSelfLink
- }
- selfLinkUrl, err := url.Parse(selfLink)
+ gvk := obj.GetObjectKind().GroupVersionKind()
+
+ // If object meta doesn't contain data about kind and/or version,
+ // we are falling back to scheme.
+ //
+ // TODO: This doesn't work for CRDs, which are not registered in scheme.
+ if gvk.Empty() {
+ gvks, _, err := scheme.ObjectKinds(obj)
if err != nil {
return nil, err
}
- // example paths: /<prefix>/<version>/*
- parts := strings.Split(selfLinkUrl.Path, "/")
- if len(parts) < 4 {
- return nil, fmt.Errorf("unexpected self link format: '%v'; got version '%v'", selfLink, version)
+ if len(gvks) == 0 || gvks[0].Empty() {
+ return nil, fmt.Errorf("unexpected gvks registered for object %T: %v", obj, gvks)
}
- if parts[1] == "api" {
- version = parts[2]
- } else {
- version = parts[2] + "/" + parts[3]
- }
+ // TODO: The same object can be registered for multiple group versions
+ // (although in practise this doesn't seem to be used).
+ // In such case, the version set may not be correct.
+ gvk = gvks[0]
}
+ kind := gvk.Kind
+ version := gvk.GroupVersion().String()
+
// only has list metadata
if objectMeta == nil {
return &v1.ObjectReference{