Kubernetes version v1.7.10-beta.0 file updates

Kubernetes-commit: 4631d1da81a0e42ba5744676250a191d0c6106c9
Kubernetes version v1.7.9 file updates
2026-07-01 06:25:55 +00:00 · 2017-10-19 10:52:16 +02:00 · 2018-01-11 07:31:28 +00:00 · 2018-01-11 07:31:28 +00:00 · 2017-10-09 11:01:41 +02:00 · 2017-10-05 10:28:33 +02:00
4 changed files with 69 additions and 58 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
  "ImportPath": "k8s.io/client-go",
-  "GoVersion": "go1.8",
+  "GoVersion": "go1.9",
  "GodepVersion": "v79",
  "Packages": [
    "./..."
@@ -312,211 +312,211 @@
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/fields",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/labels",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/openapi",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/selection",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/types",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/json",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/net",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/rand",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/version",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/watch",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    }
  ]
 }
--- a/discovery/restmapper.go
+++ b/discovery/restmapper.go
@@ -96,8 +96,19 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V
 				if !resource.Namespaced {
 					scope = meta.RESTScopeRoot
 				}
-				versionMapper.Add(gv.WithKind(resource.Kind), scope)
-				// TODO only do this if it supports listing
+
+				// this is for legacy resources and servers which don't list singular forms.  For those we must still guess.
+				if len(resource.SingularName) == 0 {
+					versionMapper.Add(gv.WithKind(resource.Kind), scope)
+					// TODO this is producing unsafe guesses that don't actually work, but it matches previous behavior
+					versionMapper.Add(gv.WithKind(resource.Kind+"List"), scope)
+					continue
+				}
+
+				plural := gv.WithResource(resource.Name)
+				singular := gv.WithResource(resource.SingularName)
+				versionMapper.AddSpecific(gv.WithKind(resource.Kind), plural, singular, scope)
+				// TODO this is producing unsafe guesses that don't actually work, but it matches previous behavior
 				versionMapper.Add(gv.WithKind(resource.Kind+"List"), scope)
 			}
 			// TODO why is this type not in discovery (at least for "v1")
--- a/pkg/apis/rbac/helpers.go
+++ b/pkg/apis/rbac/helpers.go
@@ -346,7 +346,7 @@ func NewRoleBindingForClusterRole(roleName, namespace string) *RoleBindingBuilde
 // Groups adds the specified groups as the subjects of the RoleBinding.
 func (r *RoleBindingBuilder) Groups(groups ...string) *RoleBindingBuilder {
 	for _, group := range groups {
-		r.RoleBinding.Subjects = append(r.RoleBinding.Subjects, Subject{Kind: GroupKind, Name: group})
+		r.RoleBinding.Subjects = append(r.RoleBinding.Subjects, Subject{Kind: GroupKind, APIGroup: GroupName, Name: group})
 	}
 	return r
 }
@@ -354,7 +354,7 @@ func (r *RoleBindingBuilder) Groups(groups ...string) *RoleBindingBuilder {
 // Users adds the specified users as the subjects of the RoleBinding.
 func (r *RoleBindingBuilder) Users(users ...string) *RoleBindingBuilder {
 	for _, user := range users {
-		r.RoleBinding.Subjects = append(r.RoleBinding.Subjects, Subject{Kind: UserKind, Name: user})
+		r.RoleBinding.Subjects = append(r.RoleBinding.Subjects, Subject{Kind: UserKind, APIGroup: GroupName, Name: user})
 	}
 	return r
 }
--- a/pkg/version/base.go
+++ b/pkg/version/base.go
@@ -51,7 +51,7 @@ var (
 	// semantic version is a git hash, but the version itself is no
 	// longer the direct output of "git describe", but a slight
 	// translation to be semver compliant.
-	gitVersion   string = "v1.7.7-beta.0+$Format:%h$"
+	gitVersion   string = "v1.7.10-beta.0+$Format:%h$"
 	gitCommit    string = "$Format:%H$"    // sha1 from git, output of $(git rev-parse HEAD)
 	gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty"
Author	SHA1	Message	Date
Wojciech Tyczynski	8f5148371f	Kubernetes version v1.7.10-beta.0 file updates Kubernetes-commit: 4631d1da81a0e42ba5744676250a191d0c6106c9	2017-10-19 10:52:16 +02:00
Wojciech Tyczynski	fd3197e637	Kubernetes version v1.7.9 file updates Kubernetes-commit: 7f63532e4ff4fbc7cacd96f6a95b50a49a2dc41b	2018-01-11 07:31:28 +00:00
Kubernetes Publisher	c41ddd7cda	Merge pull request #53583 from sttts/automated-cherry-pick-of-#52710-upstream-release-1.7 Automatic merge from submit-queue. Automated cherry pick of #52710 upstream release 1.7 This is necessary to consistently publish the release-1.7 branch of the staging/ repos, compare https://github.com/kubernetes/kubernetes/pull/52710. Kubernetes-commit: 5314e9bafc2a2ed0cb8de2bebe1b5e84b6b3c9ff	2018-01-11 07:31:28 +00:00
Dr. Stefan Schimanski	3c01efff33	Update staging godeps Kubernetes-commit: 2fea4e7b25a33eb956fdd62a305176d5349472bd	2017-10-09 11:01:41 +02:00
Wojciech Tyczynski	a7bf9ff51a	Kubernetes version v1.7.9-beta.0 file updates Kubernetes-commit: 3eab0f1d670f77b88ea83178760c170d4a903a49	2017-10-05 10:28:33 +02:00
Wojciech Tyczynski	411a703154	Kubernetes version v1.7.8 file updates Kubernetes-commit: bc6162cc70b4a39a7f39391564e0dd0be60b39e9	2017-10-05 08:33:26 +02:00
Kubernetes Publisher	84c85820d1	Merge pull request #53299 from enj/automated-cherry-pick-of-#53239-upstream-release-1.7 Automatic merge from submit-queue. Automated cherry pick of #53239 Cherry pick of #53239 on release-1.7. #53239: Correct APIGroup for RoleBindingBuilder Subjects Kubernetes-commit: 1a4c2bfb8e06eb64c8c3e05657a25fb3a6e6789b	2018-01-11 07:30:57 +00:00
Kubernetes Publisher	caa80039ae	Merge pull request #52545 from liggitt/automated-cherry-pick-of-#50012-upstream-release-1.7 Automatic merge from submit-queue. Automated cherry pick of #50012 Cherry pick of #50012 on release-1.7. #50012: use specified discovery information if possible ```release-note custom resources that use unconventional pluralization now work properly with kubectl ``` Kubernetes-commit: dd388c7e9bb7e85257424761541e57a297d89de9	2018-01-11 07:30:57 +00:00
Monis Khan	837e260942	Correct APIGroup for RoleBindingBuilder Subjects This change corrects RoleBindingBuilder to use the RBAC API group with users and groups as subjects (service accounts use the empty string since they are in the legacy core group). This is based on the defaulting in pkg/apis/rbac/v1/defaults.go#SetDefaults_Subject. This is required because the bootstrap RBAC data is built with these helpers and does not go through defaulting, whereas the data retrieved from the server has already gone through defaulting. This can lead to the reconciliation code incorrectly adding duplicate subjects because it believes that they are missing (since the API groups do not match). Signed-off-by: Monis Khan <mkhan@redhat.com> Kubernetes-commit: 974991b1800fcc7136e28584c729f867582f0752	2017-09-28 21:49:52 -04:00
Chao Xu	9734a791af	Kubernetes version v1.7.8-beta.0 file updates Kubernetes-commit: 81b52bda7cecd1db17bc3ba85118ab4074bb32c7	2017-09-29 03:18:37 +02:00
Chao Xu	0853ea9489	Kubernetes version v1.7.7 file updates Kubernetes-commit: 8e1552342355496b62754e61ad5f802a0f3f1fa7	2017-09-29 01:54:17 +02:00
deads2k	6c2dc43bda	use specified discovery information if possible Kubernetes-commit: dc55e3f76b392fadddd34f88c4a72f73e9f30cf6	2017-08-02 08:42:33 -04:00