Fix antctl mc deploy command usage (#6287)

This patch ensures that v is optional in version tag and improved error message if specified version tag is not found. Signed-off-by: Roopesh Saravanan <[email protected]>
antrea-io · May 11, 2024 · 4ec2bdd · 4ec2bdd
1 parent 7753d7f
commit 4ec2bdd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/pkg/antctl/raw/multicluster/deploy/deploy_helper.go b/pkg/antctl/raw/multicluster/deploy/deploy_helper.go
@@ -54,6 +54,9 @@ var getAPIGroupResources = getAPIGroupResourcesWrapper
 
 func generateManifests(role string, version string) ([]string, error) {
 	var manifests []string
+	if version != "latest" && !strings.HasPrefix(version, "v") {
+		version = fmt.Sprintf("v%s", version)
+	}
 	switch role {
 	case leaderRole:
 		manifests = []string{
@@ -176,6 +179,9 @@ func deploy(cmd *cobra.Command, role string, version string, namespace string, f
 		for _, manifest := range manifests {
 			// #nosec G107
 			resp, err := httpGet(manifest)
+			if resp.StatusCode == 404 {
+				return fmt.Errorf("manifest %s not found", manifest)
+			}
 			if err != nil {
 				return err
 			}

diff --git a/pkg/antctl/raw/multicluster/deploy/deploy_helper_test.go b/pkg/antctl/raw/multicluster/deploy/deploy_helper_test.go
@@ -84,6 +84,22 @@ func TestGenerateManifests(t *testing.T) {
 				"https://github.com/antrea-io/antrea/releases/download/v1.14.0/antrea-multicluster-member.yml",
 			},
 		},
+		{
+			name:    "generate versioned leader manifests without the prefix v in the version",
+			role:    "leader",
+			version: "1.14.0",
+			expectedManifests: []string{
+				"https://github.com/antrea-io/antrea/releases/download/v1.14.0/antrea-multicluster-leader.yml",
+			},
+		},
+		{
+			name:    "generate versioned member manifests without the prefix v in the version",
+			role:    "member",
+			version: "1.14.0",
+			expectedManifests: []string{
+				"https://github.com/antrea-io/antrea/releases/download/v1.14.0/antrea-multicluster-member.yml",
+			},
+		},
 		{
 			name:        "invalid role",
 			role:        "member1",