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

Remove networking flags as of k8s 1.24

This commit is contained in:
Ole Markus With 2022-01-18 22:15:16 +01:00
parent 85732b4c4d
commit 3f265a43bb
7 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,7 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
if networking == nil { if networking == nil {
return fmt.Errorf("no networking mode set") return fmt.Errorf("no networking mode set")
} }
if UsesKubenet(networking) { if UsesKubenet(networking) && b.IsKubernetesLT("1.24") {
clusterSpec.Kubelet.NetworkPluginName = "kubenet" clusterSpec.Kubelet.NetworkPluginName = "kubenet"
clusterSpec.Kubelet.NetworkPluginMTU = fi.Int32(9001) clusterSpec.Kubelet.NetworkPluginMTU = fi.Int32(9001)
clusterSpec.Kubelet.NonMasqueradeCIDR = clusterSpec.NonMasqueradeCIDR clusterSpec.Kubelet.NonMasqueradeCIDR = clusterSpec.NonMasqueradeCIDR

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

@ -44,7 +44,9 @@ func (b *NetworkingOptionsBuilder) BuildOptions(o interface{}) error {
} }
if UsesCNI(networking) { if UsesCNI(networking) {
if b.Context.IsKubernetesLT("1.24") {
options.Kubelet.NetworkPluginName = "cni" options.Kubelet.NetworkPluginName = "cni"
}
// ConfigureCBR0 flag removed from 1.5 // ConfigureCBR0 flag removed from 1.5
options.Kubelet.ConfigureCBR0 = nil options.Kubelet.ConfigureCBR0 = nil

4
tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -225,7 +225,6 @@ kubelet:
InTreePluginAWSUnregister: "true" InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
networkPluginName: cni
podManifestPath: /etc/kubernetes/manifests podManifestPath: /etc/kubernetes/manifests
protectKernelDefaults: true protectKernelDefaults: true
masterKubelet: masterKubelet:
@ -242,7 +241,6 @@ masterKubelet:
InTreePluginAWSUnregister: "true" InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
networkPluginName: cni
podManifestPath: /etc/kubernetes/manifests podManifestPath: /etc/kubernetes/manifests
protectKernelDefaults: true protectKernelDefaults: true
registerSchedulable: false registerSchedulable: false
@ -254,7 +252,7 @@ CloudProvider: aws
ConfigBase: memfs://tests/minimal.example.com ConfigBase: memfs://tests/minimal.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master InstanceGroupRole: Master
NodeupConfigHash: G19o8iyxYuu/a0e4dRh4FGU9ZGX0YqfzaRdqEGn2qZs= NodeupConfigHash: CDzdXl/0qObw/fUKEXHnAs4vwUckB0u6Sb9hv98SEys=
__EOF_KUBE_ENV __EOF_KUBE_ENV

3
tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -153,7 +153,6 @@ kubelet:
InTreePluginAWSUnregister: "true" InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
networkPluginName: cni
podManifestPath: /etc/kubernetes/manifests podManifestPath: /etc/kubernetes/manifests
protectKernelDefaults: true protectKernelDefaults: true
@ -164,7 +163,7 @@ CloudProvider: aws
ConfigBase: memfs://tests/minimal.example.com ConfigBase: memfs://tests/minimal.example.com
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: 761GI5NIkJH7vSaSF2Igb/MV8d3cz873JAmFTzT2RX0= NodeupConfigHash: kRdGVRLcd+t+PYT5YSR/lQ8ci9q7DtvS3nNI26+EcPc=
__EOF_KUBE_ENV __EOF_KUBE_ENV

2
tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -154,7 +154,6 @@ spec:
InTreePluginAWSUnregister: "true" InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
networkPluginName: cni
podManifestPath: /etc/kubernetes/manifests podManifestPath: /etc/kubernetes/manifests
protectKernelDefaults: true protectKernelDefaults: true
kubernetesApiAccess: kubernetesApiAccess:
@ -176,7 +175,6 @@ spec:
InTreePluginAWSUnregister: "true" InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
networkPluginName: cni
podManifestPath: /etc/kubernetes/manifests podManifestPath: /etc/kubernetes/manifests
protectKernelDefaults: true protectKernelDefaults: true
registerSchedulable: false registerSchedulable: false

1
tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content
View File

@ -244,7 +244,6 @@ KubeletConfig:
InTreePluginAWSUnregister: "true" InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
networkPluginName: cni
nodeLabels: nodeLabels:
kops.k8s.io/instancegroup: master-us-test-1a kops.k8s.io/instancegroup: master-us-test-1a
kops.k8s.io/kops-controller-pki: "" kops.k8s.io/kops-controller-pki: ""

1
tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_nodeupconfig-nodes_content
View File

@ -51,7 +51,6 @@ KubeletConfig:
InTreePluginAWSUnregister: "true" InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
networkPluginName: cni
nodeLabels: nodeLabels:
kops.k8s.io/instancegroup: nodes-us-test-1a kops.k8s.io/instancegroup: nodes-us-test-1a
kubernetes.io/role: node kubernetes.io/role: node