From 9b6734e808197a76ccef482c1f236269631c2a93 Mon Sep 17 00:00:00 2001 From: Nicolas Grauss Date: Thu, 30 Apr 2026 19:53:41 +0200 Subject: [PATCH] SREP-715: Using the new --dump-guest-cluster-through-kube-service option of the hypershift CLI when dumping dataplane content for must-gathers --- cmd/hcp/mustgather/mustGather.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/hcp/mustgather/mustGather.go b/cmd/hcp/mustgather/mustGather.go index 329c3a380..e5907ea8c 100644 --- a/cmd/hcp/mustgather/mustGather.go +++ b/cmd/hcp/mustgather/mustGather.go @@ -50,7 +50,7 @@ func NewCmdMustGather() *cobra.Command { }, } - defaultAcmImage := "quay.io/stolostron/must-gather:2.11.4-SNAPSHOT-2024-12-02-15-19-44" + defaultAcmImage := "quay.io/stolostron/must-gather:latest" mustGatherCommand.Flags().StringVarP(&mg.clusterId, "cluster-id", "C", "", "Internal ID of the cluster to gather data from") mustGatherCommand.Flags().StringVar(&mg.reason, "reason", "", "The reason for this command, which requires elevation (e.g., OHSS ticket or PD incident).") mustGatherCommand.Flags().StringVar(&mg.gatherTargets, "gather", "hcp", "Comma-separated list of gather targets (available: sc, sc_acm, mc, hcp).") @@ -194,10 +194,8 @@ func (mg *mustGather) Run() error { hcName := cluster.DomainPrefix() hcNamespace := strings.TrimSuffix(hcpNamespace, "-"+hcName) - // TODO(ACM-16170): replace this with an official ACM release image once it's available - acmHyperShiftImage := "quay.io/rokejungrh/must-gather:v2.13.0-33-linux" gatherScript := fmt.Sprintf("/usr/bin/gather hosted-cluster-namespace=%s hosted-cluster-name=%s", hcNamespace, hcName) - if err := createMustGather(mcRestCfg, mcK8sCli, []string{"--dest-dir=" + destDir, "--image=" + acmHyperShiftImage, gatherScript}); err != nil { + if err := createMustGather(mcRestCfg, mcK8sCli, []string{"--dest-dir=" + destDir, "--image=" + mg.acmMustGatherImage, gatherScript}); err != nil { fmt.Printf("collected HCP dynatrace logs but failed to gather %s: %v\n", gatherTarget, err.Error()) }