kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Limit GCE names to 63 chars for various resources

This commit is contained in:
Ciprian Hacman 2022-06-26 06:10:10 +03:00
parent 100a49c83c
commit 5a8472313f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/model/gcemodel/context.go
View File

@ -72,6 +72,11 @@ func (c *GCEModelContext) SafeObjectName(name string) string {
return gce.SafeObjectName(name, c.Cluster.ObjectMeta.Name)
}
// SafeSuffixedObjectName returns the object name and cluster name escaped for GCE, limited to 63 chars
func (c *GCEModelContext) SafeSuffixedObjectName(name string) string {
return gce.ClusterSuffixedName(name, c.Cluster.ObjectMeta.Name, 63)
}
// SafeClusterName returns the cluster name escaped for use as a GCE resource name
func (c *GCEModelContext) SafeClusterName() string {
return gce.SafeClusterName(c.Cluster.ObjectMeta.Name)
@ -87,7 +92,7 @@ func (c *GCEModelContext) LinkToTargetPool(id string) *gcetasks.TargetPool {
}
func (c *GCEModelContext) NameForTargetPool(id string) string {
return c.SafeObjectName(id)
return c.SafeSuffixedObjectName(id)
}
func (c *GCEModelContext) NameForHealthCheck(id string) string {
@ -99,11 +104,11 @@ func (c *GCEModelContext) NameForBackendService(id string) string {
}
func (c *GCEModelContext) NameForForwardingRule(id string) string {
return c.SafeObjectName(id)
return c.SafeSuffixedObjectName(id)
}
func (c *GCEModelContext) NameForIPAddress(id string) string {
return c.SafeObjectName(id)
return c.SafeSuffixedObjectName(id)
}
func (c *GCEModelContext) NameForPoolHealthcheck(id string) string {
@ -111,7 +116,7 @@ func (c *GCEModelContext) NameForPoolHealthcheck(id string) string {
}
func (c *GCEModelContext) NameForHealthcheck(id string) string {
return c.SafeObjectName(id)
return c.SafeSuffixedObjectName(id)
}
func (c *GCEModelContext) NameForFirewallRule(id string) string {

2
upup/pkg/fi/cloudup/gce/gce_cloud.go
View File

@ -304,7 +304,7 @@ func (c *gceCloudImplementation) GetApiIngressStatus(cluster *kops.Cluster) ([]f
var ingresses []fi.ApiIngressStatus
// Note that this must match GCEModelContext::NameForForwardingRule
name := SafeObjectName("api", cluster.ObjectMeta.Name)
name := ClusterSuffixedName("api", cluster.ObjectMeta.Name, 63)
klog.V(2).Infof("Querying GCE to find ForwardingRules for API (%q)", name)
// These are the ingress rules, so we search for them in the network project.