From 5caf4b7798e3019aa07f2cb550fc33d1b56dfd07 Mon Sep 17 00:00:00 2001 From: Maciej Kwiek Date: Wed, 11 Sep 2019 17:19:41 +0200 Subject: [PATCH] Generate apimachinery for Cilium config Signed-off-by: Maciej Kwiek --- .../kops/v1alpha1/zz_generated.conversion.go | 28 +++++++++++++++++++ .../kops/v1alpha2/zz_generated.conversion.go | 28 +++++++++++++++++++ .../cilium/manifest.yaml | 4 +-- 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go index a78024150a95c..dfd07029b7419 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go @@ -1228,6 +1228,20 @@ func autoConvert_v1alpha1_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in * out.StateDir = in.StateDir out.TracePayloadLen = in.TracePayloadLen out.Tunnel = in.Tunnel + out.EnableIpv6 = in.EnableIpv6 + out.EnableIpv4 = in.EnableIpv4 + out.MonitorAggregation = in.MonitorAggregation + out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax + out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax + out.PreallocateBPFMaps = in.PreallocateBPFMaps + out.SidecarIstioProxyImage = in.SidecarIstioProxyImage + out.ClusterName = in.ClusterName + out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller + out.WaitBPFMount = in.WaitBPFMount + out.ContainerRuntimeLabels = in.ContainerRuntimeLabels + out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall + out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes + out.EnableNodePort = in.EnableNodePort return nil } @@ -1286,6 +1300,20 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha1_CiliumNetworkingSpec(in * out.StateDir = in.StateDir out.TracePayloadLen = in.TracePayloadLen out.Tunnel = in.Tunnel + out.EnableIpv6 = in.EnableIpv6 + out.EnableIpv4 = in.EnableIpv4 + out.MonitorAggregation = in.MonitorAggregation + out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax + out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax + out.PreallocateBPFMaps = in.PreallocateBPFMaps + out.SidecarIstioProxyImage = in.SidecarIstioProxyImage + out.ClusterName = in.ClusterName + out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller + out.WaitBPFMount = in.WaitBPFMount + out.ContainerRuntimeLabels = in.ContainerRuntimeLabels + out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall + out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes + out.EnableNodePort = in.EnableNodePort return nil } diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 9be461b3b564a..7ba0d3e4c4cf3 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -1270,6 +1270,20 @@ func autoConvert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in * out.StateDir = in.StateDir out.TracePayloadLen = in.TracePayloadLen out.Tunnel = in.Tunnel + out.EnableIpv6 = in.EnableIpv6 + out.EnableIpv4 = in.EnableIpv4 + out.MonitorAggregation = in.MonitorAggregation + out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax + out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax + out.PreallocateBPFMaps = in.PreallocateBPFMaps + out.SidecarIstioProxyImage = in.SidecarIstioProxyImage + out.ClusterName = in.ClusterName + out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller + out.WaitBPFMount = in.WaitBPFMount + out.ContainerRuntimeLabels = in.ContainerRuntimeLabels + out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall + out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes + out.EnableNodePort = in.EnableNodePort return nil } @@ -1328,6 +1342,20 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(in * out.StateDir = in.StateDir out.TracePayloadLen = in.TracePayloadLen out.Tunnel = in.Tunnel + out.EnableIpv6 = in.EnableIpv6 + out.EnableIpv4 = in.EnableIpv4 + out.MonitorAggregation = in.MonitorAggregation + out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax + out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax + out.PreallocateBPFMaps = in.PreallocateBPFMaps + out.SidecarIstioProxyImage = in.SidecarIstioProxyImage + out.ClusterName = in.ClusterName + out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller + out.WaitBPFMount = in.WaitBPFMount + out.ContainerRuntimeLabels = in.ContainerRuntimeLabels + out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall + out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes + out.EnableNodePort = in.EnableNodePort return nil } diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 35f76e0204b7e..6644a7f9fcedd 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -107,7 +107,7 @@ spec: - id: k8s-1.7 kubernetesVersion: '>=1.7.0 <1.12.0' manifest: networking.cilium.io/k8s-1.7.yaml - manifestHash: 5393e3da7833f0706e78fcf4b84e848ee02df0ad + manifestHash: 1842edf8273fef484880c64271b28f735292932e name: networking.cilium.io selector: role.kubernetes.io/networking: "1" @@ -115,7 +115,7 @@ spec: - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: networking.cilium.io/k8s-1.12.yaml - manifestHash: 5393e3da7833f0706e78fcf4b84e848ee02df0ad + manifestHash: 1842edf8273fef484880c64271b28f735292932e name: networking.cilium.io selector: role.kubernetes.io/networking: "1"