Skip to content

Commit 6777f93

Browse files
committed
updated sealed secret app to new style
Signed-off-by: Nitishkumar Singh <[email protected]> updated code based on #258 Signed-off-by: Nitishkumar Singh <[email protected]> removed additional line Signed-off-by: Nitishkumar Singh <[email protected]> removed unwanted line Signed-off-by: Nitishkumar Singh <[email protected]>
1 parent ba7cbad commit 6777f93

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

cmd/apps/sealed_secret_app.go

+20-19
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import (
99
"os"
1010
"path"
1111

12+
"github.com/alexellis/arkade/pkg/apps"
1213
"github.com/alexellis/arkade/pkg/k8s"
14+
"github.com/alexellis/arkade/pkg/types"
1315

1416
"github.com/alexellis/arkade/pkg"
1517
"github.com/alexellis/arkade/pkg/config"
@@ -36,7 +38,6 @@ func MakeInstallSealedSecrets() *cobra.Command {
3638
if err := config.SetKubeconfig(kubeConfigPath); err != nil {
3739
return err
3840
}
39-
fmt.Printf("Using kubeconfig: %s\n", kubeConfigPath)
4041

4142
wait, _ := command.Flags().GetBool("wait")
4243

@@ -62,22 +63,7 @@ func MakeInstallSealedSecrets() *cobra.Command {
6263

6364
os.Setenv("HELM_HOME", path.Join(userPath, ".helm"))
6465

65-
_, err = helm.TryDownloadHelm(userPath, clientArch, clientOS)
66-
if err != nil {
67-
return err
68-
}
69-
7066
updateRepo, _ := command.Flags().GetBool("update-repo")
71-
err = helm.AddHelmRepo("stable", "https://kubernetes-charts.storage.googleapis.com/", updateRepo)
72-
if err != nil {
73-
return fmt.Errorf("unable to add repo %s", err)
74-
}
75-
76-
err = helm.FetchChart("stable/sealed-secrets", defaultVersion)
77-
78-
if err != nil {
79-
return fmt.Errorf("unable fetch chart %s", err)
80-
}
8167

8268
overrides := map[string]string{}
8369

@@ -90,11 +76,26 @@ func MakeInstallSealedSecrets() *cobra.Command {
9076
return err
9177
}
9278

93-
err = helm.Helm3Upgrade("stable/sealed-secrets",
94-
namespace, "values.yaml", defaultVersion, overrides, wait)
79+
sealedSecretAppOptions := types.DefaultInstallOptions().
80+
WithNamespace(namespace).
81+
WithHelmPath(path.Join(userPath, ".helm")).
82+
WithHelmRepo("stable/sealed-secrets").
83+
WithHelmURL("https://charts.helm.sh/stable").
84+
WithOverrides(overrides).
85+
WithHelmUpdateRepo(updateRepo).
86+
WithWait(wait).
87+
WithKubeconfigPath(kubeConfigPath)
88+
89+
_, err = helm.TryDownloadHelm(userPath, clientArch, clientOS)
9590
if err != nil {
96-
return fmt.Errorf("unable to sealed secret chart with helm %s", err)
91+
return err
9792
}
93+
94+
_, err = apps.MakeInstallChart(sealedSecretAppOptions)
95+
if err != nil {
96+
return err
97+
}
98+
9899
fmt.Println(SealedSecretsPostInstallMsg)
99100
return nil
100101
}

0 commit comments

Comments
 (0)