toolbox dump: include full instance details on GCE

justinsb · Jan 14, 2025 · a663d8b · a663d8b
1 parent cf70ea6
commit a663d8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/model/components/kubecontrollermanager.go b/pkg/model/components/kubecontrollermanager.go
@@ -25,6 +25,7 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/gce"
 	"k8s.io/kops/upup/pkg/fi/loader"
 	"k8s.io/kops/upup/pkg/fi/utils"
 )
@@ -110,7 +111,7 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o *kops.Cluster) erro
 	networking := &clusterSpec.Networking
 	if networking.Kubenet != nil {
 		kcm.ConfigureCloudRoutes = fi.PtrTo(true)
-	} else if networking.GCP != nil {
+	} else if gce.UsesIPAliases(o) {
 		kcm.ConfigureCloudRoutes = fi.PtrTo(false)
 		if kcm.CloudProvider == "external" {
 			// kcm should not allocate node cidrs with the CloudAllocator if we're using the external CCM

diff --git a/pkg/resources/gce/dump.go b/pkg/resources/gce/dump.go
@@ -79,8 +79,7 @@ func DumpManagedInstance(op *resources.DumpOperation, r *resources.Resource) err
 
 	op.Dump.Instances = append(op.Dump.Instances, i)
 
-	// Unclear if we should include the instance details in the dump - assume YAGNI until someone needs it
-	// dump.Resources = append(dump.Resources, instanceDetails)
+	op.Dump.Resources = append(op.Dump.Resources, instanceDetails)
 
 	return nil
 }