Skip to content

Refactor pkg/cli/helm and add unit tests #9166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
May 19, 2025
Merged

Refactor pkg/cli/helm and add unit tests #9166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
20d15a7
Update clients and cluster manager
ytimocin Apr 11, 2025
64e7a5c
WIP refactor cli/helm
willdavsmith Apr 18, 2025
fd66c84
fix install
willdavsmith Apr 22, 2025
f97fa48
fix test
willdavsmith Apr 22, 2025
5e20b60
Fix output
willdavsmith Apr 22, 2025
e06ea21
Merge branch 'features/upgrade-v1' into ytimocin/upgrade/clients
willdavsmith May 8, 2025
999f0d4
fix merge
willdavsmith May 8, 2025
6152f36
fix
willdavsmith May 12, 2025
c7e5bec
re-run
willdavsmith May 12, 2025
ddab411
Merge branch 'main' into ytimocin/upgrade/clients
willdavsmith May 13, 2025
e44d7c1
PR
willdavsmith May 19, 2025
5bff917
Merge branch 'main' into ytimocin/upgrade/clients
willdavsmith May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions cmd/rad/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,12 @@ func initSubCommands() {
Prompter: &prompt.Impl{},
ConfigFileInterface: &framework.ConfigFileInterfaceImpl{},
KubernetesInterface: &kubernetes.Impl{},
HelmInterface: &helm.Impl{},
NamespaceInterface: &namespace.Impl{},
AWSClient: aws.NewClient(),
AzureClient: azure.NewClient(),
HelmInterface: &helm.Impl{
Helm: helm.NewHelmClient(),
},
NamespaceInterface: &namespace.Impl{},
AWSClient: aws.NewClient(),
AzureClient: azure.NewClient(),
}

deployCmd, _ := cmd_deploy.NewCommand(framework)
Expand Down
3 changes: 2 additions & 1 deletion pkg/cli/cmd/install/kubernetes/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ func (r *Runner) Run(ctx context.Context) error {
}

clusterOptions := helm.PopulateDefaultClusterOptions(cliOptions)
_, err = r.Helm.InstallRadius(ctx, clusterOptions, r.KubeContext)

err = r.Helm.InstallRadius(ctx, clusterOptions, r.KubeContext)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/cmd/install/kubernetes/kubernetes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func Test_Run(t *testing.T) {
},
})
helmMock.EXPECT().InstallRadius(ctx, expectedOptions, "test-context").
Return(true, nil).
Return(nil).
Times(1)

err := runner.Run(ctx)
Expand Down Expand Up @@ -150,7 +150,7 @@ func Test_Run(t *testing.T) {
},
})
helmMock.EXPECT().InstallRadius(ctx, expectedOptions, "test-context").
Return(true, nil).
Return(nil).
Times(1)

err := runner.Run(ctx)
Expand Down
17 changes: 3 additions & 14 deletions pkg/cli/cmd/radinit/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,9 @@ func (r *Runner) Run(ctx context.Context) error {
},
}

// Install radius control plane
err := installRadius(ctx, r, cliOptions)
clusterOptions := helm.PopulateDefaultClusterOptions(cliOptions)

err := r.HelmInterface.InstallRadius(ctx, clusterOptions, r.Options.Cluster.Context)
if err != nil {
return clierrors.MessageWithCause(err, "Failed to install Radius.")
}
Expand Down Expand Up @@ -346,15 +347,3 @@ func (r *Runner) getAWSCredential() (ucp.AwsCredentialResource, error) {
return ucp.AwsCredentialResource{}, fmt.Errorf("unsupported AWS credential kind: %s", r.Options.CloudProviders.AWS.CredentialKind)
}
}

func installRadius(ctx context.Context, r *Runner, cliOptions helm.CLIClusterOptions) error {
clusterOptions := helm.PopulateDefaultClusterOptions(cliOptions)

// Ignore existing radius installation because we already asked the user whether to re-install or not
_, err := r.HelmInterface.InstallRadius(ctx, clusterOptions, r.Options.Cluster.Context)
if err != nil {
return err
}

return nil
}
2 changes: 1 addition & 1 deletion pkg/cli/cmd/radinit/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ func Test_Run_InstallAndCreateEnvironment(t *testing.T) {
helmInterface := helm.NewMockInterface(ctrl)
helmInterface.EXPECT().
InstallRadius(context.Background(), gomock.Any(), "kind-kind").
Return(true, nil).
Return(nil).
Times(1)

prompter := prompt.NewMockInterface(ctrl)
Expand Down
7 changes: 1 addition & 6 deletions pkg/cli/cmd/uninstall/kubernetes/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,8 @@ func (r *Runner) Run(ctx context.Context) error {
}

r.Output.LogInfo("Uninstalling Radius...")
err = r.Helm.UninstallRadius(ctx, helm.ClusterOptions{
Radius: helm.ChartOptions{
Namespace: helm.RadiusSystemNamespace,
ReleaseName: helm.NewDefaultClusterOptions().Radius.ReleaseName,
},
}, r.KubeContext)

err = r.Helm.UninstallRadius(ctx, helm.NewDefaultClusterOptions(), r.KubeContext)
if err != nil {
return err
}
Expand Down
14 changes: 2 additions & 12 deletions pkg/cli/cmd/uninstall/kubernetes/kubernetes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,7 @@ func Test_Run(t *testing.T) {
Return(helm.InstallState{RadiusInstalled: true, RadiusVersion: "test-version"}, nil).
Times(1)

helmMock.EXPECT().UninstallRadius(ctx, helm.ClusterOptions{
Radius: helm.ChartOptions{
Namespace: "radius-system",
ReleaseName: "radius",
},
}, "test-context").
helmMock.EXPECT().UninstallRadius(ctx, helm.NewDefaultClusterOptions(), "test-context").
Return(nil).
Times(1)

Expand Down Expand Up @@ -142,12 +137,7 @@ func Test_Run(t *testing.T) {
Return(helm.InstallState{RadiusInstalled: true, RadiusVersion: "test-version"}, nil).
Times(1)

helmMock.EXPECT().UninstallRadius(ctx, helm.ClusterOptions{
Radius: helm.ChartOptions{
Namespace: "radius-system",
ReleaseName: "radius",
},
}, "test-context").
helmMock.EXPECT().UninstallRadius(ctx, helm.NewDefaultClusterOptions(), "test-context").
Return(nil).
Times(1)

Expand Down
Loading
Loading