rancher/steve
1
0
Fork 0
mirror of https://github.com/rancher/steve.git synced 2025-09-03 08:25:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50 from ebauman/v1.24.0

Browse Source
This commit is contained in:
Kinara Shah
2022-06-24 15:44:43 -07:00
committed by GitHub
parent 22b03d364d 3ccc837e84
commit d26d34631a
4 changed files with 429 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/auth/cli/webhookcli.go
View File

@@ -1,6 +1,7 @@
package cli
import (
"k8s.io/client-go/tools/clientcmd"
"os"
"time"
@@ -38,7 +39,12 @@ func (w *WebhookConfig) WebhookMiddleware() (auth.Middleware, error) {
config = tempFile
}
return auth.NewWebhookMiddleware(time.Duration(w.CacheTTLSeconds)*time.Second, config)
kubeConfig, err := clientcmd.BuildConfigFromFlags("", config)
if err != nil {
return nil, err
}
return auth.NewWebhookMiddleware(time.Duration(w.CacheTTLSeconds)*time.Second, kubeConfig)
}
func Flags(config *WebhookConfig) []cli.Flag {

9
pkg/auth/filter.go
View File

@@ -2,6 +2,7 @@ package auth
import (
"io/ioutil"
"k8s.io/client-go/rest"
"net/http"
"strings"
"time"
@@ -82,8 +83,8 @@ func WebhookConfigForURL(url string) (string, error) {
return tmpFile.Name(), clientcmd.WriteToFile(config, tmpFile.Name())
}
func NewWebhookAuthenticator(cacheTTL time.Duration, kubeConfigFile string) (Authenticator, error) {
wh, err := webhook.New(kubeConfigFile, "v1", nil, WebhookBackoff, nil)
func NewWebhookAuthenticator(cacheTTL time.Duration, kubeConfig *rest.Config) (Authenticator, error) {
wh, err := webhook.New(kubeConfig, "v1", nil, WebhookBackoff)
if err != nil {
return nil, err
}
@@ -99,8 +100,8 @@ func NewWebhookAuthenticator(cacheTTL time.Duration, kubeConfigFile string) (Aut
}, nil
}
func NewWebhookMiddleware(cacheTTL time.Duration, kubeConfigFile string) (Middleware, error) {
auth, err := NewWebhookAuthenticator(cacheTTL, kubeConfigFile)
func NewWebhookMiddleware(cacheTTL time.Duration, kubeConfig *rest.Config) (Middleware, error) {
auth, err := NewWebhookAuthenticator(cacheTTL, kubeConfig)
if err != nil {
return nil, err
}