v1alpha3: fix miscellaneous capitalization

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                                                   |

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
 	}
 

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

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"`

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"`

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"`

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"))
 		}
 	}

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,17 +854,17 @@ 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"))
 		}
 		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"))
 		}
 
 	}

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)
 	}
 

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")
 		}
 	}

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/*")
 				}
 

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)
 		}
 	}

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,

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"

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

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

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

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

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"
 
 		{

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{}
 		}

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{},
 					},
 				},
 			},