refactor(kubernetes): enhance AccessControlClientset and streamline Manager and Kubernetes structs #503
+280
−121
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…anager and Kubernetes structs Signed-off-by: Marc Nuri <[email protected]>
manusa
force-pushed
the
refactor/kubernetes-manager
branch
from
b1e7b0b to
6148224
Compare
Cali0707
reviewed
Nov 25, 2025
Comment on lines
+60
to
+71
| func (k *Kubernetes) ToDiscoveryClient() (discovery.CachedDiscoveryInterface, error) { | ||
| return k.AccessControlClientset().DiscoveryClient(), nil | ||
| } | ||
|
|
||
| func (k *Kubernetes) ToRESTMapper() (meta.RESTMapper, error) { | ||
| return k.AccessControlClientset().RESTMapper(), nil | ||
| } | ||
|
|
||
| // ToRESTConfig returns the rest.Config object (genericclioptions.RESTClientGetter) | ||
| func (k *Kubernetes) ToRESTConfig() (*rest.Config, error) { | ||
| return k.AccessControlClientset().cfg, nil | ||
| } |
Collaborator
There was a problem hiding this comment.
@manusa do we want to keep the error in the return types here? I understand changing that would be a breaking change downstream, but I think long term it could simplify our code somewhat if we don't anticipate changes re-introducing the error value here
| derived, err := NewAccessControlClientset(m.staticConfig, clientcmd.NewDefaultClientConfig(clientCmdApiConfig, nil), derivedCfg) | ||
| if err != nil { | ||
| if m.staticConfig.RequireOAuth { | ||
| klog.Errorf("failed to get kubeconfig: %v", err) |
| ctx := context.WithValue(s.T().Context(), HeaderKey("Authorization"), "Bearer aiTana-julIA") | ||
| derived, err := badManager.Derived(ctx) | ||
| s.Require().NoErrorf(err, "expected no error when RequireOAuth=false, got: %v", err) | ||
| s.Equal(derived.accessControlClientSet, badManager.accessControlClientset, "expected original clientset when RawConfig fails and RequireOAuth=false") |
Collaborator
There was a problem hiding this comment.
nit: use the getter method here
Suggested change
| s.Equal(derived.accessControlClientSet, badManager.accessControlClientset, "expected original clientset when RawConfig fails and RequireOAuth=false") | |
| s.Equal(derived.AccessControlClientset(), badManager.AccessControlClientset(), "expected original clientset when RawConfig fails and RequireOAuth=false") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Simplifies the relationship between the
Manager,Kubernetes, andAccessControlClientsettypes.The changes reduce indirection and move functionality to more appropriate locations.
Kubernetesno longer wraps aManagerwhich could be confusing especially for the derived scenarios.Mangershould only concern with the lifecycle management and the derived instance creation (wip).All access to the cluster should be done from a derived
Kubernetesinstance (wip).