-
Notifications
You must be signed in to change notification settings - Fork 38.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Namespace deletion uses discovery + dynamic client #21400
Merged
k8s-github-robot
merged 4 commits into
kubernetes:master
from
derekwaynecarr:namespace_deletion_discovery
Mar 4, 2016
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
3bda581
Add ability to manage a pool of dynamic clients
derekwaynecarr 41057b0
Move namespace controller to use discovery and dynamic client
derekwaynecarr 773cf73
Add e2e tests to verify more resources are deleted
derekwaynecarr beace2d
Fix incorrect logging string that could cause confusion
derekwaynecarr File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
||
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 dynamic | ||
|
||
import ( | ||
"sync" | ||
|
||
"k8s.io/kubernetes/pkg/api/unversioned" | ||
"k8s.io/kubernetes/pkg/client/restclient" | ||
) | ||
|
||
// ClientPool manages a pool of dynamic clients. | ||
type ClientPool interface { | ||
// ClientForGroupVersion returns a client configured for the specified groupVersion. | ||
ClientForGroupVersion(groupVersion unversioned.GroupVersion) (*Client, error) | ||
} | ||
|
||
// APIPathResolverFunc knows how to convert a groupVersion to its API path. | ||
type APIPathResolverFunc func(groupVersion unversioned.GroupVersion) string | ||
|
||
// LegacyAPIPathResolverFunc can resolve paths properly with the legacy API. | ||
func LegacyAPIPathResolverFunc(groupVersion unversioned.GroupVersion) string { | ||
if len(groupVersion.Group) == 0 { | ||
return "/api" | ||
} | ||
return "/apis" | ||
} | ||
|
||
// clientPoolImpl implements Factory | ||
type clientPoolImpl struct { | ||
lock sync.RWMutex | ||
config *restclient.Config | ||
clients map[unversioned.GroupVersion]*Client | ||
apiPathResolverFunc APIPathResolverFunc | ||
} | ||
|
||
// NewClientPool returns a ClientPool from the specified config | ||
func NewClientPool(config *restclient.Config, apiPathResolverFunc APIPathResolverFunc) ClientPool { | ||
return &clientPoolImpl{ | ||
config: config, | ||
clients: map[unversioned.GroupVersion]*Client{}, | ||
apiPathResolverFunc: apiPathResolverFunc, | ||
} | ||
} | ||
|
||
// ClientForGroupVersion returns a client for the specified groupVersion, creates one if none exists | ||
func (c *clientPoolImpl) ClientForGroupVersion(groupVersion unversioned.GroupVersion) (*Client, error) { | ||
c.lock.Lock() | ||
defer c.lock.Unlock() | ||
|
||
// do we have a client already configured? | ||
if existingClient, found := c.clients[groupVersion]; found { | ||
return existingClient, nil | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This check should come first, before the config manipulation. |
||
|
||
// avoid changing the original config | ||
confCopy := *c.config | ||
conf := &confCopy | ||
|
||
// we need to set the api path based on group version, if no group, default to legacy path | ||
conf.APIPath = c.apiPathResolverFunc(groupVersion) | ||
|
||
// we need to make a client | ||
conf.GroupVersion = &groupVersion | ||
dynamicClient, err := NewClient(conf) | ||
if err != nil { | ||
return nil, err | ||
} | ||
c.clients[groupVersion] = dynamicClient | ||
return dynamicClient, nil | ||
} |
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know it's not, but shouldn't this be in the discovery into?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
opened issue: #21916