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
f5b319c0
Commit
f5b319c0
authored
May 28, 2019
by
andyzhangx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add azure file CSI translation feature gate
fix build error fix gofmt error
parent
da4a822c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
1 deletion
+14
-1
kube_features.go
pkg/features/kube_features.go
+7
-0
BUILD
pkg/volume/azure_file/BUILD
+2
-0
azure_file.go
pkg/volume/azure_file/azure_file.go
+4
-1
translate.go
staging/src/k8s.io/csi-translation-lib/translate.go
+1
-0
No files found.
pkg/features/kube_features.go
View file @
f5b319c0
...
@@ -423,6 +423,12 @@ const (
...
@@ -423,6 +423,12 @@ const (
// Enables the Azure Disk in-tree driver to Azure Disk Driver migration feature.
// Enables the Azure Disk in-tree driver to Azure Disk Driver migration feature.
CSIMigrationAzureDisk
featuregate
.
Feature
=
"CSIMigrationAzureDisk"
CSIMigrationAzureDisk
featuregate
.
Feature
=
"CSIMigrationAzureDisk"
// owner: @andyzhangx
// alpha: v1.15
//
// Enables the Azure File in-tree driver to Azure File Driver migration feature.
CSIMigrationAzureFile
featuregate
.
Feature
=
"CSIMigrationAzureFile"
// owner: @RobertKrawitz
// owner: @RobertKrawitz
// beta: v1.15
// beta: v1.15
//
//
...
@@ -503,6 +509,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
...
@@ -503,6 +509,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
CSIMigrationGCE
:
{
Default
:
false
,
PreRelease
:
featuregate
.
Alpha
},
CSIMigrationGCE
:
{
Default
:
false
,
PreRelease
:
featuregate
.
Alpha
},
CSIMigrationAWS
:
{
Default
:
false
,
PreRelease
:
featuregate
.
Alpha
},
CSIMigrationAWS
:
{
Default
:
false
,
PreRelease
:
featuregate
.
Alpha
},
CSIMigrationAzureDisk
:
{
Default
:
false
,
PreRelease
:
featuregate
.
Alpha
},
CSIMigrationAzureDisk
:
{
Default
:
false
,
PreRelease
:
featuregate
.
Alpha
},
CSIMigrationAzureFile
:
{
Default
:
false
,
PreRelease
:
featuregate
.
Alpha
},
RunAsGroup
:
{
Default
:
true
,
PreRelease
:
featuregate
.
Beta
},
RunAsGroup
:
{
Default
:
true
,
PreRelease
:
featuregate
.
Beta
},
CSIMigrationOpenStack
:
{
Default
:
false
,
PreRelease
:
featuregate
.
Alpha
},
CSIMigrationOpenStack
:
{
Default
:
false
,
PreRelease
:
featuregate
.
Alpha
},
VolumeSubpath
:
{
Default
:
true
,
PreRelease
:
featuregate
.
GA
},
VolumeSubpath
:
{
Default
:
true
,
PreRelease
:
featuregate
.
GA
},
...
...
pkg/volume/azure_file/BUILD
View file @
f5b319c0
...
@@ -16,6 +16,7 @@ go_library(
...
@@ -16,6 +16,7 @@ go_library(
],
],
importpath = "k8s.io/kubernetes/pkg/volume/azure_file",
importpath = "k8s.io/kubernetes/pkg/volume/azure_file",
deps = [
deps = [
"//pkg/features:go_default_library",
"//pkg/util/mount:go_default_library",
"//pkg/util/mount:go_default_library",
"//pkg/volume:go_default_library",
"//pkg/volume:go_default_library",
"//pkg/volume/util:go_default_library",
"//pkg/volume/util:go_default_library",
...
@@ -24,6 +25,7 @@ go_library(
...
@@ -24,6 +25,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library",
"//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library",
...
...
pkg/volume/azure_file/azure_file.go
View file @
f5b319c0
...
@@ -26,9 +26,11 @@ import (
...
@@ -26,9 +26,11 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/api/resource"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/types"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
cloudprovider
"k8s.io/cloud-provider"
cloudprovider
"k8s.io/cloud-provider"
volumehelpers
"k8s.io/cloud-provider/volume/helpers"
volumehelpers
"k8s.io/cloud-provider/volume/helpers"
"k8s.io/klog"
"k8s.io/klog"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume"
volutil
"k8s.io/kubernetes/pkg/volume/util"
volutil
"k8s.io/kubernetes/pkg/volume/util"
...
@@ -82,7 +84,8 @@ func (plugin *azureFilePlugin) CanSupport(spec *volume.Spec) bool {
...
@@ -82,7 +84,8 @@ func (plugin *azureFilePlugin) CanSupport(spec *volume.Spec) bool {
}
}
func
(
plugin
*
azureFilePlugin
)
IsMigratedToCSI
()
bool
{
func
(
plugin
*
azureFilePlugin
)
IsMigratedToCSI
()
bool
{
return
false
return
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
CSIMigration
)
&&
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
CSIMigrationAzureFile
)
}
}
func
(
plugin
*
azureFilePlugin
)
RequiresRemount
()
bool
{
func
(
plugin
*
azureFilePlugin
)
RequiresRemount
()
bool
{
...
...
staging/src/k8s.io/csi-translation-lib/translate.go
View file @
f5b319c0
...
@@ -31,6 +31,7 @@ var (
...
@@ -31,6 +31,7 @@ var (
plugins
.
AWSEBSDriverName
:
plugins
.
NewAWSElasticBlockStoreCSITranslator
(),
plugins
.
AWSEBSDriverName
:
plugins
.
NewAWSElasticBlockStoreCSITranslator
(),
plugins
.
CinderDriverName
:
plugins
.
NewOpenStackCinderCSITranslator
(),
plugins
.
CinderDriverName
:
plugins
.
NewOpenStackCinderCSITranslator
(),
plugins
.
AzureDiskDriverName
:
plugins
.
NewAzureDiskCSITranslator
(),
plugins
.
AzureDiskDriverName
:
plugins
.
NewAzureDiskCSITranslator
(),
plugins
.
AzureFileDriverName
:
plugins
.
NewAzureFileCSITranslator
(),
}
}
)
)
...
...
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