Skip to content

Commit 5312ade

Browse files
authored
Merge pull request kubernetes#74457 from neolit123/fix-kubeproxy-winkernel
kubeadm: fix issue with missing kubeproxy fields in test data
2 parents 1cf8001 + b2cc473 commit 5312ade

File tree

5 files changed

+20
-0
lines changed

5 files changed

+20
-0
lines changed

cmd/kubeadm/app/util/config/testdata/conversion/master/internal_non_linux.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ ComponentConfigs:
6767
PortRange: ""
6868
ResourceContainer: /kube-proxy
6969
UDPIdleTimeout: 250ms
70+
Winkernel:
71+
EnableDSR: false
72+
NetworkName: ""
73+
SourceVip: ""
7074
Kubelet:
7175
Address: 1.2.3.4
7276
Authentication:

cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ oomScoreAdj: -999
8989
portRange: ""
9090
resourceContainer: /kube-proxy
9191
udpIdleTimeout: 250ms
92+
winkernel:
93+
enableDSR: false
94+
networkName: ""
95+
sourceVip: ""
9296
---
9397
address: 1.2.3.4
9498
apiVersion: kubelet.config.k8s.io/v1beta1

cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3_non_linux.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ oomScoreAdj: -999
8989
portRange: ""
9090
resourceContainer: /kube-proxy
9191
udpIdleTimeout: 250ms
92+
winkernel:
93+
enableDSR: false
94+
networkName: ""
95+
sourceVip: ""
9296
---
9397
address: 1.2.3.4
9498
apiVersion: kubelet.config.k8s.io/v1beta1

cmd/kubeadm/app/util/config/testdata/conversion/master/v1beta1_non_linux.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ oomScoreAdj: -999
9090
portRange: ""
9191
resourceContainer: /kube-proxy
9292
udpIdleTimeout: 250ms
93+
winkernel:
94+
enableDSR: false
95+
networkName: ""
96+
sourceVip: ""
9397
---
9498
address: 1.2.3.4
9599
apiVersion: kubelet.config.k8s.io/v1beta1

cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted_non_linux.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ oomScoreAdj: -999
7676
portRange: ""
7777
resourceContainer: /kube-proxy
7878
udpIdleTimeout: 250ms
79+
winkernel:
80+
enableDSR: false
81+
networkName: ""
82+
sourceVip: ""
7983
---
8084
address: 0.0.0.0
8185
apiVersion: kubelet.config.k8s.io/v1beta1

0 commit comments

Comments
 (0)