Skip to content

Commit 5be9726

Browse files
committed
Use in-cluster config for k8s access
Signed-off-by: Arda Güçlü <[email protected]>
1 parent 1aa0176 commit 5be9726

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

pkg/kubernetes/kubernetes.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package kubernetes
22

33
import (
44
"context"
5-
"errors"
65
"strings"
76

87
"k8s.io/apimachinery/pkg/runtime"
@@ -146,9 +145,6 @@ func (m *Manager) ToRESTMapper() (meta.RESTMapper, error) {
146145
func (m *Manager) Derived(ctx context.Context) (*Kubernetes, error) {
147146
authorization, ok := ctx.Value(OAuthAuthorizationHeader).(string)
148147
if !ok || !strings.HasPrefix(authorization, "Bearer ") {
149-
if m.staticConfig.RequireOAuth {
150-
return nil, errors.New("oauth token required")
151-
}
152148
return &Kubernetes{manager: m}, nil
153149
}
154150
klog.V(5).Infof("%s header found (Bearer), using provided bearer token", OAuthAuthorizationHeader)
@@ -172,10 +168,6 @@ func (m *Manager) Derived(ctx context.Context) (*Kubernetes, error) {
172168
}
173169
clientCmdApiConfig, err := m.clientCmdConfig.RawConfig()
174170
if err != nil {
175-
if m.staticConfig.RequireOAuth {
176-
klog.Errorf("failed to get kubeconfig: %v", err)
177-
return nil, errors.New("failed to get kubeconfig")
178-
}
179171
return &Kubernetes{manager: m}, nil
180172
}
181173
clientCmdApiConfig.AuthInfos = make(map[string]*clientcmdapi.AuthInfo)
@@ -186,10 +178,6 @@ func (m *Manager) Derived(ctx context.Context) (*Kubernetes, error) {
186178
}}
187179
derived.manager.accessControlClientSet, err = NewAccessControlClientset(derived.manager.cfg, derived.manager.staticConfig)
188180
if err != nil {
189-
if m.staticConfig.RequireOAuth {
190-
klog.Errorf("failed to get kubeconfig: %v", err)
191-
return nil, errors.New("failed to get kubeconfig")
192-
}
193181
return &Kubernetes{manager: m}, nil
194182
}
195183
derived.manager.discoveryClient = memory.NewMemCacheClient(derived.manager.accessControlClientSet.DiscoveryClient())
@@ -199,10 +187,6 @@ func (m *Manager) Derived(ctx context.Context) (*Kubernetes, error) {
199187
)
200188
derived.manager.dynamicClient, err = dynamic.NewForConfig(derived.manager.cfg)
201189
if err != nil {
202-
if m.staticConfig.RequireOAuth {
203-
klog.Errorf("failed to initialize dynamic client: %v", err)
204-
return nil, errors.New("failed to initialize dynamic client")
205-
}
206190
return &Kubernetes{manager: m}, nil
207191
}
208192
return derived, nil

pkg/mcp/mcp.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,6 @@ func NewTextResult(content string, err error) *mcp.CallToolResult {
160160
}
161161

162162
func contextFunc(ctx context.Context, r *http.Request) context.Context {
163-
// Get the standard Authorization header (OAuth compliant)
164-
authHeader := r.Header.Get(string(internalk8s.OAuthAuthorizationHeader))
165-
if authHeader != "" {
166-
return context.WithValue(ctx, internalk8s.OAuthAuthorizationHeader, authHeader)
167-
}
168-
169163
// Fallback to custom header for backward compatibility
170164
customAuthHeader := r.Header.Get(string(internalk8s.CustomAuthorizationHeader))
171165
if customAuthHeader != "" {

0 commit comments

Comments
 (0)