Compare commits

...

5 Commits

Author SHA1 Message Date
Kubernetes Publisher
fb6fb2bdec Update dependencies to v0.21.1-rc.0 tag 2021-04-08 19:27:43 +00:00
Kubernetes Publisher
307e3a38a1 Merge pull request #100718 from dims/automated-cherry-pick-of-#100606-#100660-upstream-release-1.21-take-2
Automated cherry pick of #100606 #100660 upstream release 1.21

Kubernetes-commit: 1b217e53de7348da4785624b419a2eea5151d03d
2021-04-01 15:22:02 +00:00
Davanum Srinivas
a124236e6c Common auth plugins should always be available
Whether `providerless` is present or not, the OIDC plugin
should be available.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

Kubernetes-commit: 2b71b5349a0744b16a367eb7ac7a44f9ae2079aa
2021-03-30 06:09:56 -04:00
Davanum Srinivas
ac49e87f5a providerless tag for client-go auth plugins
Signed-off-by: Davanum Srinivas <davanum@gmail.com>

Kubernetes-commit: c77bf835b8409da66d4f2a220c92a902d0888f9c
2021-03-28 20:05:32 -04:00
Kubernetes Publisher
6be0785e0e Merge pull request #100156 from ehashman/issue-100155
Upgrade klog to avoid panics crashing components

Kubernetes-commit: 998f218606a149048e7b564ef27478bacab0f90f
2021-03-29 11:25:28 +00:00
5 changed files with 36 additions and 12 deletions

6
Godeps/Godeps.json generated
View File

@@ -476,11 +476,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "ec4ebef5b234"
"Rev": "v0.21.1-rc.0"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "ae8b5f5092d3"
"Rev": "v0.21.1-rc.0"
},
{
"ImportPath": "k8s.io/gengo",
@@ -488,7 +488,7 @@
},
{
"ImportPath": "k8s.io/klog/v2",
"Rev": "v2.5.0"
"Rev": "v2.8.0"
},
{
"ImportPath": "k8s.io/kube-openapi",

9
go.mod
View File

@@ -27,8 +27,8 @@ require (
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.21.1-rc.0
k8s.io/apimachinery v0.21.1-rc.0
k8s.io/klog/v2 v2.8.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/structured-merge-diff/v4 v4.1.0
@@ -36,7 +36,6 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/api => k8s.io/api v0.21.1-rc.0
k8s.io/apimachinery => k8s.io/apimachinery v0.21.1-rc.0
)

2
go.sum
View File

@@ -431,6 +431,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.21.1-rc.0/go.mod h1:AqW9tzAjFgyYw3b6Q4w14ddjhqluV2fsm+06+epzgW4=
k8s.io/apimachinery v0.21.1-rc.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=

View File

@@ -17,9 +17,6 @@ limitations under the License.
package auth
import (
// Initialize all known client auth plugins.
_ "k8s.io/client-go/plugin/pkg/client/auth/azure"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
// Initialize common client auth plugins.
_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
_ "k8s.io/client-go/plugin/pkg/client/auth/openstack"
)

View File

@@ -0,0 +1,26 @@
// +build !providerless
/*
Copyright 2016 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 auth
import (
// Initialize client auth plugins for cloud providers.
_ "k8s.io/client-go/plugin/pkg/client/auth/azure"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
_ "k8s.io/client-go/plugin/pkg/client/auth/openstack"
)