diff --git a/go.mod b/go.mod index b4331125da..4b37814e34 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,6 @@ go 1.12 //replace k8s.io/kubernetes => k8s.io/kubernetes v1.15.3 //replace k8s.io/api => k8s.io/api kubernetes-1.15.3 //replace k8s.io/apimachinery => k8s.io/apimachinery kubernetes-1.15.3 -//replace k8s.io/apiserver => k8s.io/apiserver kubernetes-1.15.3 -//replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver kubernetes-1.15.3 //replace k8s.io/client-go => k8s.io/client-go kubernetes-1.15.3 //replace k8s.io/cloud-provider => k8s.io/cloud-provider kubernetes-1.15.3 //replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers kubernetes-1.15.3 @@ -18,15 +16,13 @@ replace k8s.io/api => k8s.io/api v0.0.0-20190819141258-3544db3b9e44 replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d -replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190819142446-92cc630367d0 - -replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190819143637-0dbe462fe92d - replace k8s.io/client-go => k8s.io/client-go v0.0.0-20190819141724-e14f31a72a77 replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190819145148-d91c85d212d5 // Dependencies we don't really need, except that kubernetes specifies them as v0.0.0 which confuses go.mod +//replace k8s.io/apiserver => k8s.io/apiserver kubernetes-1.15.3 +//replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver kubernetes-1.15.3 //replace k8s.io/kube-scheduler => k8s.io/kube-scheduler kubernetes-1.15.3 //replace k8s.io/kube-proxy => k8s.io/kube-proxy kubernetes-1.15.3 //replace k8s.io/cri-api => k8s.io/cri-api kubernetes-1.15.3 @@ -42,6 +38,10 @@ replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190819145148-d91 //replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager kubernetes-1.15.3 //replace k8s.io/code-generator => k8s.io/code-generator kubernetes-1.15.3 +replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190819142446-92cc630367d0 + +replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190819143637-0dbe462fe92d + replace k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190819144524-827174bad5e8 replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190819144027-541433d7ce35 @@ -128,7 +128,6 @@ require ( gopkg.in/yaml.v2 v2.2.2 k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 - k8s.io/apiserver v0.0.0 k8s.io/cli-runtime v0.0.0 k8s.io/client-go v0.0.0 k8s.io/helm v2.9.0+incompatible diff --git a/hack/.packages b/hack/.packages index e5f2aab603..03923b85b6 100644 --- a/hack/.packages +++ b/hack/.packages @@ -110,6 +110,7 @@ k8s.io/kops/pkg/model/vspheremodel k8s.io/kops/pkg/pki k8s.io/kops/pkg/pkiutil k8s.io/kops/pkg/pretty +k8s.io/kops/pkg/rbac k8s.io/kops/pkg/resources k8s.io/kops/pkg/resources/ali k8s.io/kops/pkg/resources/aws diff --git a/nodeup/pkg/model/BUILD.bazel b/nodeup/pkg/model/BUILD.bazel index 0670503c34..04a3bd1580 100644 --- a/nodeup/pkg/model/BUILD.bazel +++ b/nodeup/pkg/model/BUILD.bazel @@ -52,6 +52,7 @@ go_library( "//pkg/kubemanifest:go_default_library", "//pkg/pki:go_default_library", "//pkg/pkiutil:go_default_library", + "//pkg/rbac:go_default_library", "//pkg/systemd:go_default_library", "//pkg/tokens:go_default_library", "//pkg/try:go_default_library", @@ -71,7 +72,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", - "//vendor/k8s.io/apiserver/pkg/authentication/user:go_default_library", "//vendor/k8s.io/client-go/util/cert:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library", diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go index 2fee943886..33b711e27f 100644 --- a/nodeup/pkg/model/kubelet.go +++ b/nodeup/pkg/model/kubelet.go @@ -27,15 +27,14 @@ import ( "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" - "k8s.io/klog" v1 "k8s.io/api/core/v1" - "k8s.io/apiserver/pkg/authentication/user" - + "k8s.io/klog" "k8s.io/kops/nodeup/pkg/distros" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/flagbuilder" "k8s.io/kops/pkg/pki" + "k8s.io/kops/pkg/rbac" "k8s.io/kops/pkg/systemd" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" @@ -644,7 +643,7 @@ func (b *KubeletBuilder) buildMasterKubeletKubeconfig() (*nodetasks.File, error) template.Subject = pkix.Name{ CommonName: fmt.Sprintf("system:node:%s", nodeName), - Organization: []string{user.NodesGroup}, + Organization: []string{rbac.NodesGroup}, } // https://tools.ietf.org/html/rfc5280#section-4.2.1.3 diff --git a/pkg/model/BUILD.bazel b/pkg/model/BUILD.bazel index 462375470b..84b7f52907 100644 --- a/pkg/model/BUILD.bazel +++ b/pkg/model/BUILD.bazel @@ -31,6 +31,7 @@ go_library( "//pkg/model/iam:go_default_library", "//pkg/model/resources:go_default_library", "//pkg/pki:go_default_library", + "//pkg/rbac:go_default_library", "//pkg/tokens:go_default_library", "//upup/pkg/fi:go_default_library", "//upup/pkg/fi/cloudup/alitasks:go_default_library", @@ -48,7 +49,6 @@ go_library( "//vendor/github.com/ghodss/yaml:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/apiserver/pkg/authentication/user:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/legacy-cloud-providers/aws:go_default_library", ], diff --git a/pkg/model/pki.go b/pkg/model/pki.go index d088537c1f..a71eb0806b 100644 --- a/pkg/model/pki.go +++ b/pkg/model/pki.go @@ -20,12 +20,11 @@ import ( "fmt" "strings" + "k8s.io/kops/pkg/rbac" "k8s.io/kops/pkg/tokens" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/fitasks" "k8s.io/kops/util/pkg/vfs" - - "k8s.io/apiserver/pkg/authentication/user" ) // PKIModelBuilder configures PKI keypairs, as well as tokens @@ -60,7 +59,7 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error { c.AddTask(&fitasks.Keypair{ Name: fi.String("kubelet"), Lifecycle: b.Lifecycle, - Subject: "o=" + user.NodesGroup + ",cn=kubelet", + Subject: "o=" + rbac.NodesGroup + ",cn=kubelet", Type: "client", Signer: defaultCA, Format: format, @@ -84,7 +83,7 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error { t := &fitasks.Keypair{ Name: fi.String("kube-scheduler"), Lifecycle: b.Lifecycle, - Subject: "cn=" + user.KubeScheduler, + Subject: "cn=" + rbac.KubeScheduler, Type: "client", Signer: defaultCA, Format: format, @@ -96,7 +95,7 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error { t := &fitasks.Keypair{ Name: fi.String("kube-proxy"), Lifecycle: b.Lifecycle, - Subject: "cn=" + user.KubeProxy, + Subject: "cn=" + rbac.KubeProxy, Type: "client", Signer: defaultCA, Format: format, @@ -108,7 +107,7 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error { t := &fitasks.Keypair{ Name: fi.String("kube-controller-manager"), Lifecycle: b.Lifecycle, - Subject: "cn=" + user.KubeControllerManager, + Subject: "cn=" + rbac.KubeControllerManager, Type: "client", Signer: defaultCA, Format: format, @@ -203,7 +202,7 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error { t := &fitasks.Keypair{ Name: fi.String("kubecfg"), Lifecycle: b.Lifecycle, - Subject: "o=" + user.SystemPrivilegedGroup + ",cn=kubecfg", + Subject: "o=" + rbac.SystemPrivilegedGroup + ",cn=kubecfg", Type: "client", Signer: defaultCA, Format: format, @@ -250,7 +249,7 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error { t := &fitasks.Keypair{ Name: fi.String("kops"), Lifecycle: b.Lifecycle, - Subject: "o=" + user.SystemPrivilegedGroup + ",cn=kops", + Subject: "o=" + rbac.SystemPrivilegedGroup + ",cn=kops", Type: "client", Signer: defaultCA, Format: format, diff --git a/pkg/rbac/BUILD.bazel b/pkg/rbac/BUILD.bazel new file mode 100644 index 0000000000..ecaa710ae6 --- /dev/null +++ b/pkg/rbac/BUILD.bazel @@ -0,0 +1,8 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["wellknown.go"], + importpath = "k8s.io/kops/pkg/rbac", + visibility = ["//visibility:public"], +) diff --git a/pkg/rbac/wellknown.go b/pkg/rbac/wellknown.go new file mode 100644 index 0000000000..8cb0aba756 --- /dev/null +++ b/pkg/rbac/wellknown.go @@ -0,0 +1,34 @@ +/* +Copyright 2019 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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package rbac + +// well-known user and group names +// Copied from k8s.io/apiserver; we don't want to depend on that any more +const ( + SystemPrivilegedGroup = "system:masters" + NodesGroup = "system:nodes" + AllUnauthenticated = "system:unauthenticated" + AllAuthenticated = "system:authenticated" + + Anonymous = "system:anonymous" + APIServerUser = "system:apiserver" + + // core kubernetes process identities + KubeProxy = "system:kube-proxy" + KubeControllerManager = "system:kube-controller-manager" + KubeScheduler = "system:kube-scheduler" +) diff --git a/vendor/k8s.io/apiserver/LICENSE b/vendor/k8s.io/apiserver/LICENSE deleted file mode 100644 index d645695673..0000000000 --- a/vendor/k8s.io/apiserver/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/vendor/k8s.io/apiserver/pkg/authentication/user/BUILD.bazel b/vendor/k8s.io/apiserver/pkg/authentication/user/BUILD.bazel deleted file mode 100644 index 065963079b..0000000000 --- a/vendor/k8s.io/apiserver/pkg/authentication/user/BUILD.bazel +++ /dev/null @@ -1,12 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "user.go", - ], - importmap = "k8s.io/kops/vendor/k8s.io/apiserver/pkg/authentication/user", - importpath = "k8s.io/apiserver/pkg/authentication/user", - visibility = ["//visibility:public"], -) diff --git a/vendor/k8s.io/apiserver/pkg/authentication/user/doc.go b/vendor/k8s.io/apiserver/pkg/authentication/user/doc.go deleted file mode 100644 index 3d87fd72ca..0000000000 --- a/vendor/k8s.io/apiserver/pkg/authentication/user/doc.go +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2014 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. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package user contains utilities for dealing with simple user exchange in the auth -// packages. The user.Info interface defines an interface for exchanging that info. -package user // import "k8s.io/apiserver/pkg/authentication/user" diff --git a/vendor/k8s.io/apiserver/pkg/authentication/user/user.go b/vendor/k8s.io/apiserver/pkg/authentication/user/user.go deleted file mode 100644 index f02dc39ecb..0000000000 --- a/vendor/k8s.io/apiserver/pkg/authentication/user/user.go +++ /dev/null @@ -1,83 +0,0 @@ -/* -Copyright 2014 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. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package user - -// Info describes a user that has been authenticated to the system. -type Info interface { - // GetName returns the name that uniquely identifies this user among all - // other active users. - GetName() string - // GetUID returns a unique value for a particular user that will change - // if the user is removed from the system and another user is added with - // the same name. - GetUID() string - // GetGroups returns the names of the groups the user is a member of - GetGroups() []string - - // GetExtra can contain any additional information that the authenticator - // thought was interesting. One example would be scopes on a token. - // Keys in this map should be namespaced to the authenticator or - // authenticator/authorizer pair making use of them. - // For instance: "example.org/foo" instead of "foo" - // This is a map[string][]string because it needs to be serializeable into - // a SubjectAccessReviewSpec.authorization.k8s.io for proper authorization - // delegation flows - // In order to faithfully round-trip through an impersonation flow, these keys - // MUST be lowercase. - GetExtra() map[string][]string -} - -// DefaultInfo provides a simple user information exchange object -// for components that implement the UserInfo interface. -type DefaultInfo struct { - Name string - UID string - Groups []string - Extra map[string][]string -} - -func (i *DefaultInfo) GetName() string { - return i.Name -} - -func (i *DefaultInfo) GetUID() string { - return i.UID -} - -func (i *DefaultInfo) GetGroups() []string { - return i.Groups -} - -func (i *DefaultInfo) GetExtra() map[string][]string { - return i.Extra -} - -// well-known user and group names -const ( - SystemPrivilegedGroup = "system:masters" - NodesGroup = "system:nodes" - AllUnauthenticated = "system:unauthenticated" - AllAuthenticated = "system:authenticated" - - Anonymous = "system:anonymous" - APIServerUser = "system:apiserver" - - // core kubernetes process identities - KubeProxy = "system:kube-proxy" - KubeControllerManager = "system:kube-controller-manager" - KubeScheduler = "system:kube-scheduler" -) diff --git a/vendor/modules.txt b/vendor/modules.txt index 1a0eb842a3..d7bbf073a2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -598,8 +598,6 @@ k8s.io/apimachinery/pkg/util/remotecommand k8s.io/apimachinery/pkg/apis/meta/internalversion k8s.io/apimachinery/pkg/util/httpstream/spdy k8s.io/apimachinery/third_party/forked/golang/netutil -# k8s.io/apiserver v0.0.0 => k8s.io/apiserver v0.0.0-20190819142446-92cc630367d0 -k8s.io/apiserver/pkg/authentication/user # k8s.io/cli-runtime v0.0.0 => k8s.io/cli-runtime v0.0.0-20190819144027-541433d7ce35 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/resource