From 5e114cd8a05986b7762fb9db22a43d61bb9fe00e Mon Sep 17 00:00:00 2001 From: "Igor D.C" Date: Thu, 1 Oct 2020 00:18:45 +0000 Subject: Fix arg mismatch in GetLogicalCloudContext The previous commits were merged in the wrong order, which caused a bad 3-way merge resulting in the arg mismatch as witnessed below: k8s/src/dcm/pkg/modulepkg/module/cluster.go:263:57: not enough arguments in call to lcClient.GetLogicalCloudContext have (string) want (string, string) Makefile:13: recipe for target 'all' failed make: *** [all] Error 2 The CI merge job doesn't run tests before merging, so this slipped in. Issue-ID: MULTICLOUD-1143 Change-Id: I0168345af6bac7886cba32d958f241687ab24a81 Signed-off-by: Igor D.C --- src/dcm/pkg/module/cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dcm/pkg/module/cluster.go') diff --git a/src/dcm/pkg/module/cluster.go b/src/dcm/pkg/module/cluster.go index 6cb18539..253b37a3 100644 --- a/src/dcm/pkg/module/cluster.go +++ b/src/dcm/pkg/module/cluster.go @@ -260,7 +260,7 @@ func (v *ClusterClient) UpdateCluster(project, logicalCloud, clusterReference st // Get returns Cluster's kubeconfig for corresponding cluster reference func (v *ClusterClient) GetClusterConfig(project, logicalCloud, clusterReference string) (string, error) { lcClient := NewLogicalCloudClient() - context, ctxVal, err := lcClient.GetLogicalCloudContext(logicalCloud) + context, ctxVal, err := lcClient.GetLogicalCloudContext(project, logicalCloud) if err != nil { return "", pkgerrors.Wrap(err, "Error getting logical cloud context.") } -- cgit 1.2.3-korg