Merge pull request #59842 from ixdy/update-rules_go-02-2018

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update bazelbuild/rules_go, kubernetes/repo-infra, and gazelle dependencies **What this PR does / why we need it**: updates our bazelbuild/rules_go dependency in order to bump everything to go1.9.4. I'm separating this effort into two separate PRs, since updating rules_go requires a large cleanup, removing an attribute from most build rules. **Release note**: ```release-note NONE ``` Kubernetes-commit: 96ec3187180b9c1d722756b3ea0984ebe65424dc
2026-04-12 00:00:26 +08:00 · 2018-02-19 22:23:05 -08:00
parent c3de6d02f5 6a86852930
commit a95e9a627a
126 changed files with 1804 additions and 843 deletions
@@ -13,7 +13,6 @@ go_test(
        "roundtrip_test.go",
    ],
    embed = [":go_default_library"],
-    importpath = "k8s.io/apimachinery/pkg/apis/meta/internalversion",
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/fuzzer:go_default_library",
@@ -15,5 +15,6 @@ limitations under the License.
 */

 // +k8s:deepcopy-gen=package
+// +k8s:conversion-gen=k8s.io/apimachinery/pkg/apis/meta/v1

 package internalversion
@@ -1,7 +1,7 @@
 // +build !ignore_autogenerated

 /*
-Copyright 2017 The Kubernetes Authors.
+Copyright 2018 The Kubernetes Authors.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,10 +21,11 @@ limitations under the License.
 package internalversion

 import (
+	unsafe "unsafe"
+
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	unsafe "unsafe"
 )

 func init() {
@@ -53,7 +54,7 @@ func autoConvert_internalversion_List_To_v1_List(in *List, out *v1.List, s conve
 			}
 		}
 	} else {
-		out.Items = make([]runtime.RawExtension, 0)
+		out.Items = nil
 	}
 	return nil
 }
@@ -95,6 +96,8 @@ func autoConvert_internalversion_ListOptions_To_v1_ListOptions(in *ListOptions,
 	out.Watch = in.Watch
 	out.ResourceVersion = in.ResourceVersion
 	out.TimeoutSeconds = (*int64)(unsafe.Pointer(in.TimeoutSeconds))
+	out.Limit = in.Limit
+	out.Continue = in.Continue
 	return nil
 }

@@ -109,5 +112,7 @@ func autoConvert_v1_ListOptions_To_internalversion_ListOptions(in *v1.ListOption
 	out.Watch = in.Watch
 	out.ResourceVersion = in.ResourceVersion
 	out.TimeoutSeconds = (*int64)(unsafe.Pointer(in.TimeoutSeconds))
+	out.Limit = in.Limit
+	out.Continue = in.Continue
 	return nil
 }
@@ -19,7 +19,6 @@ go_test(
        "types_test.go",
    ],
    embed = [":go_default_library"],
-    importpath = "k8s.io/apimachinery/pkg/apis/meta/v1",
    deps = [
        "//vendor/github.com/ghodss/yaml:go_default_library",
        "//vendor/github.com/json-iterator/go:go_default_library",
@@ -95,7 +94,6 @@ filegroup(
 go_test(
    name = "go_default_xtest",
    srcs = ["conversion_test.go"],
-    importpath = "k8s.io/apimachinery/pkg/apis/meta/v1_test",
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -16,7 +16,6 @@ reviewers:
 - janetkuo
 - justinsb
 - ncdc
- timothysc
 - soltysh
 - dims
 - madhusudancs
@@ -375,6 +375,7 @@ message ListOptions {
  optional string resourceVersion = 4;

  // Timeout for the list/watch call.
+  // This limits the duration of the call, regardless of any activity or inactivity.
  // +optional
  optional int64 timeoutSeconds = 5;

@@ -25,34 +25,14 @@ func CloneSelectorAndAddLabel(selector *LabelSelector, labelKey, labelValue stri
 	}

 	// Clone.
-	newSelector := new(LabelSelector)
+	newSelector := selector.DeepCopy()

-	// TODO(madhusudancs): Check if you can use deepCopy_extensions_LabelSelector here.
-	newSelector.MatchLabels = make(map[string]string)
-	if selector.MatchLabels != nil {
-		for key, val := range selector.MatchLabels {
-			newSelector.MatchLabels[key] = val
-		}
+	if newSelector.MatchLabels == nil {
+		newSelector.MatchLabels = make(map[string]string)
 	}
+
 	newSelector.MatchLabels[labelKey] = labelValue

-	if selector.MatchExpressions != nil {
-		newMExps := make([]LabelSelectorRequirement, len(selector.MatchExpressions))
-		for i, me := range selector.MatchExpressions {
-			newMExps[i].Key = me.Key
-			newMExps[i].Operator = me.Operator
-			if me.Values != nil {
-				newMExps[i].Values = make([]string, len(me.Values))
-				copy(newMExps[i].Values, me.Values)
-			} else {
-				newMExps[i].Values = nil
-			}
-		}
-		newSelector.MatchExpressions = newMExps
-	} else {
-		newSelector.MatchExpressions = nil
-	}
-
 	return newSelector
 }

@@ -342,6 +342,7 @@ type ListOptions struct {
 	// +optional
 	ResourceVersion string `json:"resourceVersion,omitempty" protobuf:"bytes,4,opt,name=resourceVersion"`
 	// Timeout for the list/watch call.
+	// This limits the duration of the call, regardless of any activity or inactivity.
 	// +optional
 	TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty" protobuf:"varint,5,opt,name=timeoutSeconds"`

@@ -195,7 +195,7 @@ var map_ListOptions = map[string]string{
 	"includeUninitialized": "If true, partially initialized resources are included in the response.",
 	"watch":                "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
 	"resourceVersion":      "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it's 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv.",
-	"timeoutSeconds":       "Timeout for the list/watch call.",
+	"timeoutSeconds":       "Timeout for the list/watch call. This limits the duration of the call, regardless of any activity or inactivity.",
 	"limit":                "limit is a maximum number of responses to return for a list call. If more items exist, the server will set the `continue` field on the list metadata to a value that can be used with the same initial query to retrieve the next set of results. Setting a limit may return fewer than the requested amount of items (up to zero items) in the event all requested objects are filtered out and clients should only use the presence of the continue field to determine whether more results are available. Servers may choose not to support the limit argument and will return all of the available results. If limit is specified and the continue field is empty, clients may assume that no more results are available. This field is not supported if watch is true.\n\nThe server guarantees that the objects returned when using continue will be identical to issuing a single list call without a limit - that is, no objects created, modified, or deleted after the first request is issued will be included in any subsequent continued requests. This is sometimes referred to as a consistent snapshot, and ensures that a client that is using limit to receive smaller chunks of a very large result can ensure they see all possible objects. If objects are updated during a chunked list the version of the object that was present at the time the first list result was calculated is returned.",
 	"continue":             "The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server the server will respond with a 410 ResourceExpired error indicating the client must restart their list without the continue field. This field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications.",
 }
@@ -13,7 +13,6 @@ go_test(
        "unstructured_list_test.go",
    ],
    embed = [":go_default_library"],
-    importpath = "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
    deps = [
        "//vendor/github.com/stretchr/testify/assert:go_default_library",
        "//vendor/github.com/stretchr/testify/require:go_default_library",