kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop InTreePluginAWSUnregister feature gate for k8s 1.31 and above 

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2024-07-25 12:27:51 -04:00
parent 41480d95a9
commit 535af3f10f
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/model/components/apiserver.go
View File

@ -185,6 +185,8 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
if _, found := c.FeatureGates["InTreePluginAWSUnregister"]; !found {
c.FeatureGates["InTreePluginAWSUnregister"] = "true"
} else if b.IsKubernetesGTE("1.31") {
delete(c.FeatureGates, "InTreePluginAWSUnregister")
}
if _, found := c.FeatureGates["CSIMigrationAWS"]; !found && b.IsKubernetesLT("1.27") {

2
pkg/model/components/kubecontrollermanager.go
View File

@ -151,6 +151,8 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error
if _, found := kcm.FeatureGates["InTreePluginAWSUnregister"]; !found {
kcm.FeatureGates["InTreePluginAWSUnregister"] = "true"
} else if b.IsKubernetesGTE("1.31") {
delete(kcm.FeatureGates, "InTreePluginAWSUnregister")
}
if _, found := kcm.FeatureGates["CSIMigrationAWS"]; !found && b.IsKubernetesLT("1.27") {

2
pkg/model/components/kubelet.go
View File

@ -178,6 +178,8 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
if _, found := clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"]; !found {
clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"] = "true"
} else if b.IsKubernetesGTE("1.31") {
delete(clusterSpec.Kubelet.FeatureGates, "InTreePluginAWSUnregister")
}
}

2
pkg/model/components/kubescheduler.go
View File

@ -65,6 +65,8 @@ func (b *KubeSchedulerOptionsBuilder) BuildOptions(o interface{}) error {
if _, found := config.FeatureGates["InTreePluginAWSUnregister"]; !found {
config.FeatureGates["InTreePluginAWSUnregister"] = "true"
} else if b.IsKubernetesGTE("1.31") {
delete(clusterSpec.Kubelet.FeatureGates, "InTreePluginAWSUnregister")
}
if _, found := config.FeatureGates["CSIMigrationAWS"]; !found && b.IsKubernetesLT("1.27") {