github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89645 from andyzhangx/azure-kube-client

Browse Source 
chore: expose azure.KubeClient
This commit is contained in:
Kubernetes Prow Robot 2020-03-30 08:22:46 -07:00 committed by GitHub
commit fce286e227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/legacy-cloud-providers/azure/azure.go
View File

@ -262,7 +262,7 @@ type Cloud struct {
// routeCIDRs holds cache for route CIDRs. // routeCIDRs holds cache for route CIDRs.
routeCIDRs map[string]string routeCIDRs map[string]string
kubeClient clientset.Interface KubeClient clientset.Interface
eventBroadcaster record.EventBroadcaster eventBroadcaster record.EventBroadcaster
eventRecorder record.EventRecorder eventRecorder record.EventRecorder
routeUpdater *delayedRouteUpdater routeUpdater *delayedRouteUpdater
@ -639,9 +639,9 @@ func parseConfig(configReader io.Reader) (*Config, error) {
// Initialize passes a Kubernetes clientBuilder interface to the cloud provider // Initialize passes a Kubernetes clientBuilder interface to the cloud provider
func (az *Cloud) Initialize(clientBuilder cloudprovider.ControllerClientBuilder, stop <-chan struct{}) { func (az *Cloud) Initialize(clientBuilder cloudprovider.ControllerClientBuilder, stop <-chan struct{}) {
az.kubeClient = clientBuilder.ClientOrDie("azure-cloud-provider") az.KubeClient = clientBuilder.ClientOrDie("azure-cloud-provider")
az.eventBroadcaster = record.NewBroadcaster() az.eventBroadcaster = record.NewBroadcaster()
az.eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: az.kubeClient.CoreV1().Events("")}) az.eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: az.KubeClient.CoreV1().Events("")})
az.eventRecorder = az.eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "azure-cloud-provider"}) az.eventRecorder = az.eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "azure-cloud-provider"})
az.InitializeCloudFromSecret() az.InitializeCloudFromSecret()
} }

2
staging/src/k8s.io/legacy-cloud-providers/azure/azure_config.go
View File

@ -69,7 +69,7 @@ func (az *Cloud) getConfigFromSecret() (*Config, error) {
return nil, nil return nil, nil
} }
secret, err := az.kubeClient.CoreV1().Secrets(cloudConfigNamespace).Get(context.TODO(), cloudConfigSecretName, metav1.GetOptions{}) secret, err := az.KubeClient.CoreV1().Secrets(cloudConfigNamespace).Get(context.TODO(), cloudConfigSecretName, metav1.GetOptions{})
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get secret %s: %v", cloudConfigSecretName, err) return nil, fmt.Errorf("failed to get secret %s: %v", cloudConfigSecretName, err)
} }

4
staging/src/k8s.io/legacy-cloud-providers/azure/azure_config_test.go
View File

@ -134,7 +134,7 @@ func TestGetConfigFromSecret(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
az := &Cloud{ az := &Cloud{
kubeClient: fakeclient.NewSimpleClientset(), KubeClient: fakeclient.NewSimpleClientset(),
} }
if test.existingConfig != nil { if test.existingConfig != nil {
az.Config = *test.existingConfig az.Config = *test.existingConfig
@ -154,7 +154,7 @@ func TestGetConfigFromSecret(t *testing.T) {
"cloud-config": secretData, "cloud-config": secretData,
} }
} }
_, err := az.kubeClient.CoreV1().Secrets(cloudConfigNamespace).Create(context.TODO(), secret, metav1.CreateOptions{}) _, err := az.KubeClient.CoreV1().Secrets(cloudConfigNamespace).Create(context.TODO(), secret, metav1.CreateOptions{})
assert.NoError(t, err, test.name) assert.NoError(t, err, test.name)
} }