Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
b258bbad
Commit
b258bbad
authored
Jul 23, 2018
by
Pengfei Ni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement PersistentVolumeLabel admission controller for AzureDisk
parent
87c58833
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
52 additions
and
1 deletion
+52
-1
admission.go
...pkg/admission/storage/persistentvolume/label/admission.go
+52
-1
No files found.
plugin/pkg/admission/storage/persistentvolume/label/admission.go
View file @
b258bbad
...
@@ -28,6 +28,7 @@ import (
...
@@ -28,6 +28,7 @@ import (
api
"k8s.io/kubernetes/pkg/apis/core"
api
"k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
"k8s.io/kubernetes/pkg/cloudprovider/providers/azure"
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/features"
kubeapiserveradmission
"k8s.io/kubernetes/pkg/kubeapiserver/admission"
kubeapiserveradmission
"k8s.io/kubernetes/pkg/kubeapiserver/admission"
...
@@ -58,6 +59,7 @@ type persistentVolumeLabel struct {
...
@@ -58,6 +59,7 @@ type persistentVolumeLabel struct {
ebsVolumes
aws
.
Volumes
ebsVolumes
aws
.
Volumes
cloudConfig
[]
byte
cloudConfig
[]
byte
gceCloudProvider
*
gce
.
GCECloud
gceCloudProvider
*
gce
.
GCECloud
azureProvider
*
azure
.
Cloud
}
}
var
_
admission
.
MutationInterface
=
&
persistentVolumeLabel
{}
var
_
admission
.
MutationInterface
=
&
persistentVolumeLabel
{}
...
@@ -69,7 +71,7 @@ var _ kubeapiserveradmission.WantsCloudConfig = &persistentVolumeLabel{}
...
@@ -69,7 +71,7 @@ var _ kubeapiserveradmission.WantsCloudConfig = &persistentVolumeLabel{}
// As a side effect, the cloud provider may block invalid or non-existent volumes.
// As a side effect, the cloud provider may block invalid or non-existent volumes.
func
newPersistentVolumeLabel
()
*
persistentVolumeLabel
{
func
newPersistentVolumeLabel
()
*
persistentVolumeLabel
{
// DEPRECATED: cloud-controller-manager will now start NewPersistentVolumeLabelController
// DEPRECATED: cloud-controller-manager will now start NewPersistentVolumeLabelController
// which does exactly what this admission controller used to do. So once GCE
and AWS
can
// which does exactly what this admission controller used to do. So once GCE
, AWS and AZURE
can
// run externally, we can remove this admission controller.
// run externally, we can remove this admission controller.
glog
.
Warning
(
"PersistentVolumeLabel admission controller is deprecated. "
+
glog
.
Warning
(
"PersistentVolumeLabel admission controller is deprecated. "
+
"Please remove this controller from your configuration files and scripts."
)
"Please remove this controller from your configuration files and scripts."
)
...
@@ -123,6 +125,13 @@ func (l *persistentVolumeLabel) Admit(a admission.Attributes) (err error) {
...
@@ -123,6 +125,13 @@ func (l *persistentVolumeLabel) Admit(a admission.Attributes) (err error) {
}
}
volumeLabels
=
labels
volumeLabels
=
labels
}
}
if
volume
.
Spec
.
AzureDisk
!=
nil
{
labels
,
err
:=
l
.
findAzureDiskLabels
(
volume
)
if
err
!=
nil
{
return
admission
.
NewForbidden
(
a
,
fmt
.
Errorf
(
"error querying AzureDisk volume %s: %v"
,
volume
.
Spec
.
AzureDisk
.
DiskName
,
err
))
}
volumeLabels
=
labels
}
requirements
:=
make
([]
api
.
NodeSelectorRequirement
,
0
)
requirements
:=
make
([]
api
.
NodeSelectorRequirement
,
0
)
if
len
(
volumeLabels
)
!=
0
{
if
len
(
volumeLabels
)
!=
0
{
...
@@ -272,3 +281,45 @@ func (l *persistentVolumeLabel) getGCECloudProvider() (*gce.GCECloud, error) {
...
@@ -272,3 +281,45 @@ func (l *persistentVolumeLabel) getGCECloudProvider() (*gce.GCECloud, error) {
}
}
return
l
.
gceCloudProvider
,
nil
return
l
.
gceCloudProvider
,
nil
}
}
// getAzureCloudProvider returns the Azure cloud provider, for use for querying volume labels
func
(
l
*
persistentVolumeLabel
)
getAzureCloudProvider
()
(
*
azure
.
Cloud
,
error
)
{
l
.
mutex
.
Lock
()
defer
l
.
mutex
.
Unlock
()
if
l
.
azureProvider
==
nil
{
var
cloudConfigReader
io
.
Reader
if
len
(
l
.
cloudConfig
)
>
0
{
cloudConfigReader
=
bytes
.
NewReader
(
l
.
cloudConfig
)
}
cloudProvider
,
err
:=
cloudprovider
.
GetCloudProvider
(
"azure"
,
cloudConfigReader
)
if
err
!=
nil
||
cloudProvider
==
nil
{
return
nil
,
err
}
azureProvider
,
ok
:=
cloudProvider
.
(
*
azure
.
Cloud
)
if
!
ok
{
// GetCloudProvider has gone very wrong
return
nil
,
fmt
.
Errorf
(
"error retrieving GCE cloud provider"
)
}
l
.
azureProvider
=
azureProvider
}
return
l
.
azureProvider
,
nil
}
func
(
l
*
persistentVolumeLabel
)
findAzureDiskLabels
(
volume
*
api
.
PersistentVolume
)
(
map
[
string
]
string
,
error
)
{
// Ignore any volumes that are being provisioned
if
volume
.
Spec
.
AzureDisk
.
DiskName
==
vol
.
ProvisionedVolumeName
{
return
nil
,
nil
}
provider
,
err
:=
l
.
getAzureCloudProvider
()
if
err
!=
nil
{
return
nil
,
err
}
if
provider
==
nil
{
return
nil
,
fmt
.
Errorf
(
"unable to build Azure cloud provider for AzureDisk"
)
}
return
provider
.
GetAzureDiskLabels
(
volume
.
Spec
.
AzureDisk
.
DataDiskURI
)
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment