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

toolbox dump: include full instance details on GCE

This commit is contained in:
justinsb 2025-01-13 11:54:46 -05:00
parent 2b133b2503
commit ecadd7a5b4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/model/components/kubecontrollermanager.go
View File

@ -25,6 +25,7 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi" "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/loader"
"k8s.io/kops/upup/pkg/fi/utils" "k8s.io/kops/upup/pkg/fi/utils"
) )
@ -110,7 +111,7 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o *kops.Cluster) erro
networking := &clusterSpec.Networking networking := &clusterSpec.Networking
if networking.Kubenet != nil { if networking.Kubenet != nil {
kcm.ConfigureCloudRoutes = fi.PtrTo(true) kcm.ConfigureCloudRoutes = fi.PtrTo(true)
} else if networking.GCP != nil { } else if gce.UsesIPAliases(o) {
kcm.ConfigureCloudRoutes = fi.PtrTo(false) kcm.ConfigureCloudRoutes = fi.PtrTo(false)
if kcm.CloudProvider == "external" { if kcm.CloudProvider == "external" {
// kcm should not allocate node cidrs with the CloudAllocator if we're using the external CCM // kcm should not allocate node cidrs with the CloudAllocator if we're using the external CCM

3
pkg/resources/gce/dump.go
View File

@ -79,8 +79,7 @@ func DumpManagedInstance(op *resources.DumpOperation, r *resources.Resource) err
op.Dump.Instances = append(op.Dump.Instances, i) 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 op.Dump.Resources = append(op.Dump.Resources, instanceDetails)
// dump.Resources = append(dump.Resources, instanceDetails)
return nil return nil
} }