diff --git a/docs/cluster_spec.md b/docs/cluster_spec.md index 266badf200e3..cbef94f33d5e 100644 --- a/docs/cluster_spec.md +++ b/docs/cluster_spec.md @@ -1599,14 +1599,19 @@ the removal of fields no longer in use. | kubelet.clientCaFile | kubelet.clientCAFile | | kubeProxy.ipvsExcludeCidrs | kubeProxy.ipvsExcludeCIDRs | | kubernetesApiAccess | api.access | +| masterKubelet | controlPlaneKubelet | +| masterKubelet.authenticationTokenWebhookCacheTtl | controlPlaneKubelet.authenticationTokenWebhookCacheTTL | +| masterKubelet.clientCaFile | controlPlaneKubelet.clientCAFile | | masterPublicName | api.publicName | -| networking.amazonvpc.imageName | networking.amazonvpc.image | -| networking.amazonvpc.initImageName | networking.amazonvpc.initImage | +| networking.amazonvpc | networking.amazonVPC | +| networking.amazonvpc.imageName | networking.amazonVPC.image | +| networking.amazonvpc.initImageName | networking.amazonVPC.initImage | | networking.canal.disableFlannelForwardRules | networking.canal.flanneldIptablesForwardRules (value inverted) | | networking.cilium.disableMasquerade | networking.cilium.masquerade (value inverted) | | networking.cilium.IPTablesRulesNoinstall | networking.cilium.installIptablesRules (value inverted) | | networking.cilium.toFqdnsDnsRejectResponseCode | networking.cilium.toFQDNsDNSRejectResponseCode | | networking.cilium.toFqdnsEnablePoller | networking.cilium.toFQDNsEnablePoller | +| networking.kuberouter | networking.kubeRouter | | project | cloudProvider.gce.project | | topology.bastion.bastionPublicName | topology.bastion.publicName | | topology.dns.type | topology.dns | diff --git a/nodeup/pkg/model/networking/kube_router.go b/nodeup/pkg/model/networking/kube_router.go index 4ce900f3109d..bcd94915db96 100644 --- a/nodeup/pkg/model/networking/kube_router.go +++ b/nodeup/pkg/model/networking/kube_router.go @@ -34,7 +34,7 @@ var _ fi.ModelBuilder = &KuberouterBuilder{} func (b *KuberouterBuilder) Build(c *fi.ModelBuilderContext) error { networking := b.Cluster.Spec.Networking - if networking.Kuberouter == nil { + if networking.KubeRouter == nil { return nil } diff --git a/pkg/apis/kops/cluster.go b/pkg/apis/kops/cluster.go index b72a3d02c687..4514a8f898ba 100644 --- a/pkg/apis/kops/cluster.go +++ b/pkg/apis/kops/cluster.go @@ -822,7 +822,7 @@ func (c *Cluster) fillClusterSpecNetworkingSpec() { // OK } else if c.Spec.Networking.Canal != nil { // OK - } else if c.Spec.Networking.Kuberouter != nil { + } else if c.Spec.Networking.KubeRouter != nil { // OK } else if c.Spec.Networking.AmazonVPC != nil { // OK diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go index fddef3311d22..9a411baa45de 100644 --- a/pkg/apis/kops/networking.go +++ b/pkg/apis/kops/networking.go @@ -29,9 +29,9 @@ type NetworkingSpec struct { Flannel *FlannelNetworkingSpec `json:"flannel,omitempty"` Calico *CalicoNetworkingSpec `json:"calico,omitempty"` Canal *CanalNetworkingSpec `json:"canal,omitempty"` - Kuberouter *KuberouterNetworkingSpec `json:"kuberouter,omitempty"` + KubeRouter *KuberouterNetworkingSpec `json:"kubeRouter,omitempty"` Romana *RomanaNetworkingSpec `json:"romana,omitempty"` - AmazonVPC *AmazonVPCNetworkingSpec `json:"amazonvpc,omitempty"` + AmazonVPC *AmazonVPCNetworkingSpec `json:"amazonVPC,omitempty"` Cilium *CiliumNetworkingSpec `json:"cilium,omitempty"` LyftVPC *LyftVPCNetworkingSpec `json:"lyftvpc,omitempty"` GCE *GCENetworkingSpec `json:"gce,omitempty"` diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go index 08454a2e4e17..ba16e6bd2d15 100644 --- a/pkg/apis/kops/v1alpha2/networking.go +++ b/pkg/apis/kops/v1alpha2/networking.go @@ -29,7 +29,7 @@ type NetworkingSpec struct { Flannel *FlannelNetworkingSpec `json:"flannel,omitempty"` Calico *CalicoNetworkingSpec `json:"calico,omitempty"` Canal *CanalNetworkingSpec `json:"canal,omitempty"` - Kuberouter *KuberouterNetworkingSpec `json:"kuberouter,omitempty"` + KubeRouter *KuberouterNetworkingSpec `json:"kuberouter,omitempty"` Romana *RomanaNetworkingSpec `json:"romana,omitempty"` AmazonVPC *AmazonVPCNetworkingSpec `json:"amazonvpc,omitempty"` Cilium *CiliumNetworkingSpec `json:"cilium,omitempty"` diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index da9682329284..ae9a8ecf586b 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -6116,14 +6116,14 @@ func autoConvert_v1alpha2_NetworkingSpec_To_kops_NetworkingSpec(in *NetworkingSp } else { out.Canal = nil } - if in.Kuberouter != nil { - in, out := &in.Kuberouter, &out.Kuberouter + if in.KubeRouter != nil { + in, out := &in.KubeRouter, &out.KubeRouter *out = new(kops.KuberouterNetworkingSpec) if err := Convert_v1alpha2_KuberouterNetworkingSpec_To_kops_KuberouterNetworkingSpec(*in, *out, s); err != nil { return err } } else { - out.Kuberouter = nil + out.KubeRouter = nil } if in.Romana != nil { in, out := &in.Romana, &out.Romana @@ -6260,14 +6260,14 @@ func autoConvert_kops_NetworkingSpec_To_v1alpha2_NetworkingSpec(in *kops.Network } else { out.Canal = nil } - if in.Kuberouter != nil { - in, out := &in.Kuberouter, &out.Kuberouter + if in.KubeRouter != nil { + in, out := &in.KubeRouter, &out.KubeRouter *out = new(KuberouterNetworkingSpec) if err := Convert_kops_KuberouterNetworkingSpec_To_v1alpha2_KuberouterNetworkingSpec(*in, *out, s); err != nil { return err } } else { - out.Kuberouter = nil + out.KubeRouter = nil } if in.Romana != nil { in, out := &in.Romana, &out.Romana diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go index 4b00e5216ac7..cca7ce0ccdde 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go @@ -4336,8 +4336,8 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { *out = new(CanalNetworkingSpec) (*in).DeepCopyInto(*out) } - if in.Kuberouter != nil { - in, out := &in.Kuberouter, &out.Kuberouter + if in.KubeRouter != nil { + in, out := &in.KubeRouter, &out.KubeRouter *out = new(KuberouterNetworkingSpec) **out = **in } diff --git a/pkg/apis/kops/v1alpha3/networking.go b/pkg/apis/kops/v1alpha3/networking.go index de66ac7678d3..2d15052746fc 100644 --- a/pkg/apis/kops/v1alpha3/networking.go +++ b/pkg/apis/kops/v1alpha3/networking.go @@ -33,9 +33,9 @@ type NetworkingSpec struct { Flannel *FlannelNetworkingSpec `json:"flannel,omitempty"` Calico *CalicoNetworkingSpec `json:"calico,omitempty"` Canal *CanalNetworkingSpec `json:"canal,omitempty"` - Kuberouter *KuberouterNetworkingSpec `json:"kuberouter,omitempty"` + KubeRouter *KuberouterNetworkingSpec `json:"kubeRouter,omitempty"` Romana *kops.RomanaNetworkingSpec `json:"-"` - AmazonVPC *AmazonVPCNetworkingSpec `json:"amazonvpc,omitempty"` + AmazonVPC *AmazonVPCNetworkingSpec `json:"amazonVPC,omitempty"` Cilium *CiliumNetworkingSpec `json:"cilium,omitempty"` LyftVPC *kops.LyftVPCNetworkingSpec `json:"-"` GCE *GCENetworkingSpec `json:"gce,omitempty"` diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go index 1bc4e1bf86e3..4fe6de681bf9 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go @@ -6267,14 +6267,14 @@ func autoConvert_v1alpha3_NetworkingSpec_To_kops_NetworkingSpec(in *NetworkingSp } else { out.Canal = nil } - if in.Kuberouter != nil { - in, out := &in.Kuberouter, &out.Kuberouter + if in.KubeRouter != nil { + in, out := &in.KubeRouter, &out.KubeRouter *out = new(kops.KuberouterNetworkingSpec) if err := Convert_v1alpha3_KuberouterNetworkingSpec_To_kops_KuberouterNetworkingSpec(*in, *out, s); err != nil { return err } } else { - out.Kuberouter = nil + out.KubeRouter = nil } out.Romana = in.Romana if in.AmazonVPC != nil { @@ -6387,14 +6387,14 @@ func autoConvert_kops_NetworkingSpec_To_v1alpha3_NetworkingSpec(in *kops.Network } else { out.Canal = nil } - if in.Kuberouter != nil { - in, out := &in.Kuberouter, &out.Kuberouter + if in.KubeRouter != nil { + in, out := &in.KubeRouter, &out.KubeRouter *out = new(KuberouterNetworkingSpec) if err := Convert_kops_KuberouterNetworkingSpec_To_v1alpha3_KuberouterNetworkingSpec(*in, *out, s); err != nil { return err } } else { - out.Kuberouter = nil + out.KubeRouter = nil } out.Romana = in.Romana if in.AmazonVPC != nil { diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go index faff1d42d559..896082290c35 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go @@ -4283,8 +4283,8 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { *out = new(CanalNetworkingSpec) (*in).DeepCopyInto(*out) } - if in.Kuberouter != nil { - in, out := &in.Kuberouter, &out.Kuberouter + if in.KubeRouter != nil { + in, out := &in.KubeRouter, &out.KubeRouter *out = new(KuberouterNetworkingSpec) **out = **in } diff --git a/pkg/apis/kops/validation/instancegroup.go b/pkg/apis/kops/validation/instancegroup.go index 59d628b305ce..70d54d072f47 100644 --- a/pkg/apis/kops/validation/instancegroup.go +++ b/pkg/apis/kops/validation/instancegroup.go @@ -84,7 +84,7 @@ func ValidateInstanceGroup(g *kops.InstanceGroup, cloud fi.Cloud, strict bool) f } if fi.ValueOf(g.Spec.RootVolumeIOPS) < 0 { - allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "rootVolumeIops"), g.Spec.RootVolumeIOPS, "RootVolumeIOPS must be greater than 0")) + allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "rootVolumeIOPS"), g.Spec.RootVolumeIOPS, "RootVolumeIOPS must be greater than 0")) } if fi.ValueOf(g.Spec.RootVolumeThroughput) < 0 { @@ -401,27 +401,27 @@ func validateExternalLoadBalancer(lb *kops.LoadBalancerSpec, fldPath *field.Path parsed, err := arn.Parse(actual) if err != nil { - allErrs = append(allErrs, field.Invalid(fldPath.Child("targetGroupArn"), actual, + allErrs = append(allErrs, field.Invalid(fldPath.Child("targetGroupARN"), actual, fmt.Sprintf("Target Group ARN must be a valid AWS ARN: %v", err))) return allErrs } resource := strings.Split(parsed.Resource, "/") if len(resource) != 3 { - allErrs = append(allErrs, field.Invalid(fldPath.Child("targetGroupArn"), actual, + allErrs = append(allErrs, field.Invalid(fldPath.Child("targetGroupARN"), actual, "Target Group ARN resource must be a valid AWS ARN resource such as \"targetgroup/tg-name/1234567890123456\"")) return allErrs } kind := resource[0] if kind != "targetgroup" { - allErrs = append(allErrs, field.Invalid(fldPath.Child("targetGroupArn"), kind, + allErrs = append(allErrs, field.Invalid(fldPath.Child("targetGroupARN"), kind, "Target Group ARN resource type must be \"targetgroup\"")) } name := resource[1] if len(name) > 32 { - allErrs = append(allErrs, field.Invalid(fldPath.Child("targetGroupArn"), name, + allErrs = append(allErrs, field.Invalid(fldPath.Child("targetGroupARN"), name, "Target Group ARN resource name must have at most 32 characters")) } } diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index 1ce9749b14a7..85493dd23098 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -253,7 +253,7 @@ func validateClusterSpec(spec *kops.ClusterSpec, c *kops.Cluster, fieldPath *fie allErrs = append(allErrs, field.Forbidden(lbPath, "sslCertificate requires network loadbalancer. See https://github.com/kubernetes/kops/blob/master/permalinks/acm_nlb.md")) } if lbSpec.Class == kops.LoadBalancerClassNetwork && lbSpec.UseForInternalAPI && lbSpec.Type == kops.LoadBalancerTypeInternal { - allErrs = append(allErrs, field.Forbidden(lbPath, "useForInternalApi cannot be used with internal NLB due lack of hairpinning support")) + allErrs = append(allErrs, field.Forbidden(lbPath, "useForInternalAPI cannot be used with internal NLB due lack of hairpinning support")) } } @@ -678,7 +678,7 @@ func validateKubeProxy(k *kops.KubeProxyConfig, fldPath *field.Path) field.Error for i, x := range k.IPVSExcludeCIDRs { if _, _, err := net.ParseCIDR(x); err != nil { - allErrs = append(allErrs, field.Invalid(fldPath.Child("ipvsExcludeCidrs").Index(i), x, "Invalid network CIDR")) + allErrs = append(allErrs, field.Invalid(fldPath.Child("ipvsExcludeCIDRs").Index(i), x, "Invalid network CIDR")) } } @@ -854,9 +854,9 @@ func validateNetworking(cluster *kops.Cluster, v *kops.NetworkingSpec, fldPath * allErrs = append(allErrs, validateNetworkingCanal(cluster, v.Canal, fldPath.Child("canal"))...) } - if v.Kuberouter != nil { + if v.KubeRouter != nil { if optionTaken { - allErrs = append(allErrs, field.Forbidden(fldPath.Child("kuberouter"), "only one networking option permitted")) + allErrs = append(allErrs, field.Forbidden(fldPath.Child("kubeRouter"), "only one networking option permitted")) } if c.KubeProxy != nil && (c.KubeProxy.Enabled == nil || *c.KubeProxy.Enabled) { allErrs = append(allErrs, field.Forbidden(fldPath.Root().Child("spec", "kubeProxy", "enabled"), "kube-router requires kubeProxy to be disabled")) @@ -864,7 +864,7 @@ func validateNetworking(cluster *kops.Cluster, v *kops.NetworkingSpec, fldPath * optionTaken = true if cluster.Spec.IsIPv6Only() { - allErrs = append(allErrs, field.Forbidden(fldPath.Child("kuberouter"), "kube-router does not support IPv6")) + allErrs = append(allErrs, field.Forbidden(fldPath.Child("kuberRouter"), "kube-router does not support IPv6")) } } @@ -874,16 +874,16 @@ func validateNetworking(cluster *kops.Cluster, v *kops.NetworkingSpec, fldPath * if v.AmazonVPC != nil { if optionTaken { - allErrs = append(allErrs, field.Forbidden(fldPath.Child("amazonvpc"), "only one networking option permitted")) + allErrs = append(allErrs, field.Forbidden(fldPath.Child("amazonVPC"), "only one networking option permitted")) } optionTaken = true if c.GetCloudProvider() != kops.CloudProviderAWS { - allErrs = append(allErrs, field.Forbidden(fldPath.Child("amazonvpc"), "amazon-vpc-routed-eni networking is supported only in AWS")) + allErrs = append(allErrs, field.Forbidden(fldPath.Child("amazonVPC"), "amazon-vpc-routed-eni networking is supported only in AWS")) } if cluster.Spec.IsIPv6Only() { - allErrs = append(allErrs, field.Forbidden(fldPath.Child("amazonvpc"), "amazon-vpc-routed-eni networking does not support IPv6")) + allErrs = append(allErrs, field.Forbidden(fldPath.Child("amazonVPC"), "amazon-vpc-routed-eni networking does not support IPv6")) } } diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index c36d3045afac..8123c5d20ae6 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -4501,8 +4501,8 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { *out = new(CanalNetworkingSpec) (*in).DeepCopyInto(*out) } - if in.Kuberouter != nil { - in, out := &in.Kuberouter, &out.Kuberouter + if in.KubeRouter != nil { + in, out := &in.KubeRouter, &out.KubeRouter *out = new(KuberouterNetworkingSpec) **out = **in } diff --git a/pkg/model/awsmodel/firewall.go b/pkg/model/awsmodel/firewall.go index 32138b875152..7f8865721b87 100644 --- a/pkg/model/awsmodel/firewall.go +++ b/pkg/model/awsmodel/firewall.go @@ -144,7 +144,7 @@ func (b *FirewallModelBuilder) applyNodeToMasterBlockSpecificPorts(c *fi.ModelBu protocols = append(protocols, ProtocolIPIP) } - if b.Cluster.Spec.Networking.Kuberouter != nil { + if b.Cluster.Spec.Networking.KubeRouter != nil { protocols = append(protocols, ProtocolIPIP) } diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go index 9eeb329390bb..07ea5568ca74 100644 --- a/pkg/model/bootstrapscript.go +++ b/pkg/model/bootstrapscript.go @@ -270,7 +270,7 @@ func (b *BootstrapScriptBuilder) ResourceNodeUp(c *fi.ModelBuilderContext, ig *k keypairs = append(keypairs, "apiserver-aggregator-ca", "service-account", "etcd-clients-ca") } else if !model.UseKopsControllerForNodeBootstrap(b.Cluster) { keypairs = append(keypairs, "kubelet", "kube-proxy") - if b.Cluster.Spec.Networking.Kuberouter != nil { + if b.Cluster.Spec.Networking.KubeRouter != nil { keypairs = append(keypairs, "kube-router") } } diff --git a/pkg/model/iam/iam_builder.go b/pkg/model/iam/iam_builder.go index 00a59ffd9d56..c8edc1228001 100644 --- a/pkg/model/iam/iam_builder.go +++ b/pkg/model/iam/iam_builder.go @@ -719,7 +719,7 @@ func ReadableStatePaths(cluster *kops.Cluster, role Subject) ([]string, error) { if networkingSpec != nil { // @check if kuberoute is enabled and permit access to the private key - if networkingSpec.Kuberouter != nil { + if networkingSpec.KubeRouter != nil { paths = append(paths, "/pki/private/kube-router/*") } diff --git a/pkg/model/openstackmodel/firewall.go b/pkg/model/openstackmodel/firewall.go index ed95102644bd..1bfe7d3104e7 100644 --- a/pkg/model/openstackmodel/firewall.go +++ b/pkg/model/openstackmodel/firewall.go @@ -446,7 +446,7 @@ func (b *FirewallModelBuilder) addCNIRules(c *fi.ModelBuilderContext, sgMap map[ protocols = append(protocols, ProtocolIPEncap) } - if b.Cluster.Spec.Networking.Kuberouter != nil { + if b.Cluster.Spec.Networking.KubeRouter != nil { protocols = append(protocols, ProtocolIPEncap) } } diff --git a/pkg/model/pki.go b/pkg/model/pki.go index 9371e9acb25d..422cb6e6bef4 100644 --- a/pkg/model/pki.go +++ b/pkg/model/pki.go @@ -70,7 +70,7 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error { c.AddTask(t) } - if b.KopsModelContext.Cluster.Spec.Networking.Kuberouter != nil && !b.UseKopsControllerForNodeBootstrap() { + if b.KopsModelContext.Cluster.Spec.Networking.KubeRouter != nil && !b.UseKopsControllerForNodeBootstrap() { t := &fitasks.Keypair{ Name: fi.PtrTo("kube-router"), Lifecycle: b.Lifecycle, diff --git a/tests/e2e/pkg/tester/skip_regex.go b/tests/e2e/pkg/tester/skip_regex.go index ad24a16aceca..5b719685e8ba 100644 --- a/tests/e2e/pkg/tester/skip_regex.go +++ b/tests/e2e/pkg/tester/skip_regex.go @@ -73,7 +73,7 @@ func (t *Tester) setSkipRegexFlag() error { // https://github.com/cilium/cilium/issues/18241 skipRegex += "|Services.should.create.endpoints.for.unready.pods" skipRegex += "|Services.should.be.able.to.connect.to.terminating.and.unready.endpoints.if.PublishNotReadyAddresses.is.true" - } else if networking.Kuberouter != nil { + } else if networking.KubeRouter != nil { skipRegex += "|load-balancer|hairpin|affinity\\stimeout|service\\.kubernetes\\.io|CLOSE_WAIT" } else if networking.Kubenet != nil { skipRegex += "|Services.*affinity" diff --git a/tests/integration/conversion/aws/v1alpha2.yaml b/tests/integration/conversion/aws/v1alpha2.yaml index 8ee665c4d825..3124b6db5437 100644 --- a/tests/integration/conversion/aws/v1alpha2.yaml +++ b/tests/integration/conversion/aws/v1alpha2.yaml @@ -58,7 +58,7 @@ spec: masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: - kubenet: {} + amazonvpc: {} nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 diff --git a/tests/integration/conversion/aws/v1alpha3.yaml b/tests/integration/conversion/aws/v1alpha3.yaml index 43c8c18a0aa7..0abfbe239153 100644 --- a/tests/integration/conversion/aws/v1alpha3.yaml +++ b/tests/integration/conversion/aws/v1alpha3.yaml @@ -57,7 +57,7 @@ spec: kubernetesVersion: v1.21.0 networkCIDR: 172.20.0.0/16 networking: - kubenet: {} + amazonVPC: {} nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 diff --git a/tests/integration/conversion/azure/v1alpha2.yaml b/tests/integration/conversion/azure/v1alpha2.yaml index be92c5643fca..20b9855cd616 100644 --- a/tests/integration/conversion/azure/v1alpha2.yaml +++ b/tests/integration/conversion/azure/v1alpha2.yaml @@ -42,7 +42,7 @@ spec: masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: - kubenet: {} + kuberouter: {} nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 diff --git a/tests/integration/conversion/azure/v1alpha3.yaml b/tests/integration/conversion/azure/v1alpha3.yaml index f56754e6299e..6946ffc39cf9 100644 --- a/tests/integration/conversion/azure/v1alpha3.yaml +++ b/tests/integration/conversion/azure/v1alpha3.yaml @@ -40,7 +40,7 @@ spec: kubernetesVersion: v1.21.0 networkCIDR: 172.20.0.0/16 networking: - kubenet: {} + kubeRouter: {} nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go index ccbdb347f24b..5ecb3d1f3276 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go @@ -1019,7 +1019,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*Addon } } - if b.Cluster.Spec.Networking.Kuberouter != nil { + if b.Cluster.Spec.Networking.KubeRouter != nil { key := "networking.kuberouter" { diff --git a/upup/pkg/fi/cloudup/new_cluster.go b/upup/pkg/fi/cloudup/new_cluster.go index f4cd0ce844ac..be0b9b99d955 100644 --- a/upup/pkg/fi/cloudup/new_cluster.go +++ b/upup/pkg/fi/cloudup/new_cluster.go @@ -1139,7 +1139,7 @@ func setupNetworking(opt *NewClusterOptions, cluster *api.Cluster) error { case "canal": cluster.Spec.Networking.Canal = &api.CanalNetworkingSpec{} case "kube-router": - cluster.Spec.Networking.Kuberouter = &api.KuberouterNetworkingSpec{} + cluster.Spec.Networking.KubeRouter = &api.KuberouterNetworkingSpec{} if cluster.Spec.KubeProxy == nil { cluster.Spec.KubeProxy = &api.KubeProxyConfig{} } diff --git a/upup/pkg/fi/cloudup/new_cluster_test.go b/upup/pkg/fi/cloudup/new_cluster_test.go index e163f2178339..f09938b1bbf5 100644 --- a/upup/pkg/fi/cloudup/new_cluster_test.go +++ b/upup/pkg/fi/cloudup/new_cluster_test.go @@ -237,7 +237,7 @@ func TestSetupNetworking(t *testing.T) { Enabled: fi.PtrTo(false), }, Networking: &api.NetworkingSpec{ - Kuberouter: &api.KuberouterNetworkingSpec{}, + KubeRouter: &api.KuberouterNetworkingSpec{}, }, }, }, diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go index 1c808bdfec5c..01142b8cae2d 100644 --- a/upup/pkg/fi/cloudup/template_functions.go +++ b/upup/pkg/fi/cloudup/template_functions.go @@ -602,7 +602,7 @@ func (tf *TemplateFunctions) KopsControllerConfig() (string, error) { if cluster.Spec.KubeProxy.Enabled == nil || *cluster.Spec.KubeProxy.Enabled { certNames = append(certNames, "kube-proxy") } - if cluster.Spec.Networking.Kuberouter != nil { + if cluster.Spec.Networking.KubeRouter != nil { certNames = append(certNames, "kube-router") }