github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74457 from neolit123/fix-kubeproxy-winkernel 

kubeadm: fix issue with missing kubeproxy fields in test data
pull/564/head
Kubernetes Prow Robot 2019-02-23 14:05:15 -08:00 committed by GitHub
parent 1cf8001e53 b2cc473388
commit 5312ade3d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/util/config/testdata/conversion/master/internal_non_linux.yaml vendored
View File

@ -67,6 +67,10 @@ ComponentConfigs:
PortRange: ""
ResourceContainer: /kube-proxy
UDPIdleTimeout: 250ms
Winkernel:
EnableDSR: false
NetworkName: ""
SourceVip: ""
Kubelet:
Address: 1.2.3.4
Authentication:

4
cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml vendored
View File

@ -89,6 +89,10 @@ oomScoreAdj: -999
portRange: ""
resourceContainer: /kube-proxy
udpIdleTimeout: 250ms
winkernel:
enableDSR: false
networkName: ""
sourceVip: ""
---
address: 1.2.3.4
apiVersion: kubelet.config.k8s.io/v1beta1

4
cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3_non_linux.yaml vendored
View File

@ -89,6 +89,10 @@ oomScoreAdj: -999
portRange: ""
resourceContainer: /kube-proxy
udpIdleTimeout: 250ms
winkernel:
enableDSR: false
networkName: ""
sourceVip: ""
---
address: 1.2.3.4
apiVersion: kubelet.config.k8s.io/v1beta1

4
cmd/kubeadm/app/util/config/testdata/conversion/master/v1beta1_non_linux.yaml vendored
View File

@ -90,6 +90,10 @@ oomScoreAdj: -999
portRange: ""
resourceContainer: /kube-proxy
udpIdleTimeout: 250ms
winkernel:
enableDSR: false
networkName: ""
sourceVip: ""
---
address: 1.2.3.4
apiVersion: kubelet.config.k8s.io/v1beta1

4
cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted_non_linux.yaml vendored
View File

@ -76,6 +76,10 @@ oomScoreAdj: -999
portRange: ""
resourceContainer: /kube-proxy
udpIdleTimeout: 250ms
winkernel:
enableDSR: false
networkName: ""
sourceVip: ""
---
address: 0.0.0.0
apiVersion: kubelet.config.k8s.io/v1beta1