Skip to content

Commit

Permalink
Print directions to get password instead of grabbing
Browse files Browse the repository at this point in the history
Signed-off-by: Blake Romano <[email protected]>
  • Loading branch information
blakeromano committed Dec 12, 2023
1 parent 8c05216 commit ba25fd4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 45 deletions.
38 changes: 0 additions & 38 deletions pkg/build/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ import (
"github.com/cnoe-io/idpbuilder/globals"
"github.com/cnoe-io/idpbuilder/pkg/controllers"
"github.com/cnoe-io/idpbuilder/pkg/kind"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -181,39 +179,3 @@ func (b *Build) Run(ctx context.Context, recreateCluster bool) error {
close(managerExit)
return err
}

type ArgoConfig struct {
Username string
Password string
Url string

}

func (b *Build) GetArgoConfig() (*ArgoConfig, error) {
kubeConfig, err := b.GetKubeConfig()
if err != nil {
return nil, err
}

kubeClient, err := b.GetKubeClient(kubeConfig)
if err != nil {
return nil, err
}

secret := &corev1.Secret{}

err = kubeClient.Get(context.Background(), types.NamespacedName{
Namespace: "argocd",
Name: "argocd-initial-admin-secret",
}, secret)
if err != nil {
return nil, err
}

return &ArgoConfig{
Username: "admin",
Password: string(secret.Data["password"]),
Url: "https://argocd.cnoe.localtest.me:8443/",
}, nil

}
10 changes: 3 additions & 7 deletions pkg/cmd/create/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,14 @@ func create(cmd *cobra.Command, args []string) error {
}

b := build.NewBuild(buildName, kubeVersion, kubeConfigPath, kindConfigPath, extraPortsMapping, absDirPaths, k8s.GetScheme(), ctxCancel)

if err := b.Run(ctx, recreateCluster); err != nil {
return err
}

argoConfig, err := b.GetArgoConfig()
if err != nil {
if err := b.Run(ctx, recreateCluster); err != nil {
return err
}

fmt.Print("\n\n########################### Finished Creating IDP Successfully! ############################\n\n\n")
fmt.Printf("Can Access ArgoCD at %s\nUsername: %s\nPassword: %s\n", argoConfig.Url, argoConfig.Username, argoConfig.Password)
fmt.Print("Can Access ArgoCD at https://argocd.cnoe.localtest.me:8443/\nUsername: admin\n")
fmt.Print(`Password can be retrieved by running: kubectl -n argocd get secret argocd-initial-admin-secret -o jsonpath="{.data.password}" | base64 -d`, "\n")


return nil
Expand Down

0 comments on commit ba25fd4

Please sign in to comment.