From b2cc47338862bdadad3e2ed79fd9fcde5dff87f7 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 23 Feb 2019 19:13:16 +0200 Subject: [PATCH] kubeadm: fix issue with missing kubeproxy fields in test data --- .../config/testdata/conversion/master/internal_non_linux.yaml | 4 ++++ .../app/util/config/testdata/conversion/master/v1alpha3.yaml | 4 ++++ .../config/testdata/conversion/master/v1alpha3_non_linux.yaml | 4 ++++ .../config/testdata/conversion/master/v1beta1_non_linux.yaml | 4 ++++ .../testdata/defaulting/master/defaulted_non_linux.yaml | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/master/internal_non_linux.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/master/internal_non_linux.yaml index e070df6031..438ba49899 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/master/internal_non_linux.yaml +++ b/cmd/kubeadm/app/util/config/testdata/conversion/master/internal_non_linux.yaml @@ -67,6 +67,10 @@ ComponentConfigs: PortRange: "" ResourceContainer: /kube-proxy UDPIdleTimeout: 250ms + Winkernel: + EnableDSR: false + NetworkName: "" + SourceVip: "" Kubelet: Address: 1.2.3.4 Authentication: diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml index 28ed6d7ce9..27731830fe 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml +++ b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml @@ -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 diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3_non_linux.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3_non_linux.yaml index 7666f3202b..344e96e2db 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3_non_linux.yaml +++ b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3_non_linux.yaml @@ -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 diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1beta1_non_linux.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1beta1_non_linux.yaml index 4000e587df..6fcc9049a1 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1beta1_non_linux.yaml +++ b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1beta1_non_linux.yaml @@ -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 diff --git a/cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted_non_linux.yaml b/cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted_non_linux.yaml index ba7d7808a0..2edebfb2d7 100644 --- a/cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted_non_linux.yaml +++ b/cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted_non_linux.yaml @@ -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