Merge pull request #31 from wandb/j7m4/use-channel-version-for-weave-…

…trace feat: use channel version for weave-trace
wandb · Dec 18, 2024 · 887b422 · 887b422
2 parents df7073a + bb357d5
commit 887b422
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/cmd/wsm/download.go b/cmd/wsm/download.go
@@ -58,12 +58,6 @@ func DownloadCmd() *cobra.Command {
 				fmt.Printf("Error fetching the latest operator-wandb controller tag: %v\n", err)
 				os.Exit(1)
 			}
-			// Fetch the latest tag for weave-trace
-			weaveTraceTag, err := getMostRecentTag("wandb/weave-trace")
-			if err != nil {
-				fmt.Printf("Error fetching the latest weave-trace tag: %v\n", err)
-				os.Exit(1)
-			}
 			fmt.Println("Downloading operator helm chart")
 			operatorImgs, _ := downloadChartImages(
 				helm.WandbHelmRepoURL,
@@ -87,11 +81,8 @@ func DownloadCmd() *cobra.Command {
 			}
 
 			// Enable weave-trace in the chart values
-			dlSpec.Values["weave-trace"] = map[string]interface{}{
-				"install": true,
-				"image": map[string]interface{}{
-					"tag": weaveTraceTag,
-				},
+			if dlWeaveTrace, ok := dlSpec.Values["weave-trace"]; ok {
+				dlWeaveTrace.(map[string]interface{})["install"] = true
 			}
 
 			fmt.Println("Downloading wandb helm chart")

diff --git a/cmd/wsm/list.go b/cmd/wsm/list.go
@@ -124,12 +124,6 @@ func ListCmd() *cobra.Command {
 				p.Quit()
 				return
 			}
-			weaveTraceTag, err := getMostRecentTag("wandb/weave-trace")
-			if err != nil {
-				fmt.Printf("Error fetching the latest weave-trace tag: %v\n", err)
-				p.Quit()
-				return
-			}
 			operatorImgs, _ := downloadChartImages(
 				helm.WandbHelmRepoURL,
 				helm.WandbOperatorChart,
@@ -147,11 +141,8 @@ func ListCmd() *cobra.Command {
 			}
 
 			// Enable weave-trace in the chart values
-			spec.Values["weave-trace"] = map[string]interface{}{
-				"install": true,
-				"image": map[string]interface{}{
-					"tag": weaveTraceTag,
-				},
+			if weaveTrace, ok := spec.Values["weave-trace"]; ok {
+				weaveTrace.(map[string]interface{})["install"] = true
 			}
 
 			wandbImgs, _ := downloadChartImages(