github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #48077 from liggitt/kubefed-discovery-cache 

Automatic merge from submit-queue (batch tested with PRs 44058, 48085, 48077, 48076, 47823)

Retry finding RBAC version if not found in discovery cache

Alternate to https://github.com/kubernetes/kubernetes/pull/47995

xref #47977

The caching discovery client can indicate whether it used fresh discovery data. `kubefed init` should invalidate and recheck if it doesn't find an RBAC API group

```release-note
`kubefed init` correctly checks for RBAC API enablement.
```
pull/6/head
Kubernetes Submit Queue 2017-06-26 15:29:29 -07:00 committed by GitHub
parent a3df4bf764 dc4f46b85a
commit babd565908
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
federation/pkg/kubefed/util/BUILD
View File

@ -24,6 +24,7 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
"//vendor/k8s.io/client-go/discovery:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
"//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library", "//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library",

20
federation/pkg/kubefed/util/util.go
View File

@ -23,6 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/client-go/discovery"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@ -263,6 +264,21 @@ func GetVersionedClientForRBACOrFail(hostFactory cmdutil.Factory) (client.Interf
if err != nil { if err != nil {
return nil, err return nil, err
} }
rbacVersion, err := getRBACVersion(discoveryclient)
if err != nil && !discoveryclient.Fresh() {
discoveryclient.Invalidate()
rbacVersion, err = getRBACVersion(discoveryclient)
}
if err != nil {
return nil, err
}
return hostFactory.ClientSetForVersion(rbacVersion)
}
func getRBACVersion(discoveryclient discovery.CachedDiscoveryInterface) (*schema.GroupVersion, error) {
groupList, err := discoveryclient.ServerGroups() groupList, err := discoveryclient.ServerGroups()
if err != nil { if err != nil {
return nil, fmt.Errorf("Couldn't get clientset to create RBAC roles in the host cluster: %v", err) return nil, fmt.Errorf("Couldn't get clientset to create RBAC roles in the host cluster: %v", err)
@ -275,7 +291,7 @@ func GetVersionedClientForRBACOrFail(hostFactory cmdutil.Factory) (client.Interf
if err != nil { if err != nil {
return nil, err return nil, err
} }
return hostFactory.ClientSetForVersion(&gv) return &gv, nil
} }
for _, version := range g.Versions { for _, version := range g.Versions {
if version.GroupVersion != "" { if version.GroupVersion != "" {
@ -283,7 +299,7 @@ func GetVersionedClientForRBACOrFail(hostFactory cmdutil.Factory) (client.Interf
if err != nil { if err != nil {
return nil, err return nil, err
} }
return hostFactory.ClientSetForVersion(&gv) return &gv, nil
} }
} }
} }