Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 17 additions & 7 deletions cmd/ciReleaseCleanfailed.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,27 @@ var ciReleaseCleanfailedCmd = &cobra.Command{
releaseName, _ := cmd.Flags().GetString("release-name")
namespace, _ := cmd.Flags().GetString("namespace")

// ----
// Try reading KUBECONFIG from environment variable first
kubeConfigPath := os.Getenv("KUBECONFIG")
if kubeConfigPath == "" {
// If not set, use the default kube config path
homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")
}
kubeConfigPath = homeDir + "/.kube/config"

homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")
}
kubeConfigPath := homeDir + "/.kube/config"

// Read kubeConfig from file
if _, err := os.Stat(kubeConfigPath); os.IsNotExist(err) {
log.Fatalf("kubeConfig file does not exist at path: %s", kubeConfigPath)
}

// Read kubeConfig file
kubeConfig, err := os.ReadFile(kubeConfigPath)
if err != nil {
log.Fatalf("cannot read kubeConfig from path")
log.Fatalf("cannot read kubeConfig from path: %s", kubeConfigPath)
}

//k8s go client init logic
Expand Down Expand Up @@ -86,7 +96,7 @@ var ciReleaseCleanfailedCmd = &cobra.Command{
fmt.Printf("Deleting secret %s\n", secretName)
err := clientset.CoreV1().Secrets(namespace).Delete(context.TODO(), secretName, v1.DeleteOptions{})
if err != nil {
log.Fatalf("Error deleting secret %s: %s", secretName, err)
log.Printf("Error deleting secret %s: %s", secretName, err)
}
}
}
Expand Down
22 changes: 17 additions & 5 deletions cmd/ciReleaseDelete.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,27 @@ var ciReleaseDeleteCmd = &cobra.Command{
namespace, _ := cmd.Flags().GetString("namespace")
deletePVCs, _ := cmd.Flags().GetBool("delete-pvcs")

homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")
// Try reading KUBECONFIG from environment variable first
kubeConfigPath := os.Getenv("KUBECONFIG")
if kubeConfigPath == "" {
// If not set, use the default kube config path
homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")
}
kubeConfigPath = homeDir + "/.kube/config"

}

// Read kubeConfig from file
if _, err := os.Stat(kubeConfigPath); os.IsNotExist(err) {
log.Fatalf("kubeConfig file does not exist at path: %s", kubeConfigPath)
}
kubeConfigPath := homeDir + "/.kube/config"

// Read kubeConfig file
kubeConfig, err := os.ReadFile(kubeConfigPath)
if err != nil {
log.Fatalf("cannot read kubeConfig from path")
log.Fatalf("cannot read kubeConfig from path: %s", kubeConfigPath)
}

//k8s go client init logic
Expand Down
20 changes: 15 additions & 5 deletions cmd/ciReleaseDeploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,22 @@ var ciReleaseDeployCmd = &cobra.Command{
}

if !debug {
// Connect to the cluster
homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")

// Try reading KUBECONFIG from environment variable first
kubeConfigPath := os.Getenv("KUBECONFIG")
if kubeConfigPath == "" {
// If not set, use the default kube config path
homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")
}
kubeConfigPath = homeDir + "/.kube/config"
}

// Read kubeConfig from file
if _, err := os.Stat(kubeConfigPath); os.IsNotExist(err) {
log.Fatalf("kubeConfig file does not exist at path: %s", kubeConfigPath)
}
kubeConfigPath := homeDir + "/.kube/config"

//k8s go client init logic
config, err := clientcmd.BuildConfigFromFlags("", kubeConfigPath)
Expand Down
17 changes: 12 additions & 5 deletions cmd/ciReleaseDiff.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,19 @@ var ciReleaseDiffCmd = &cobra.Command{
referenceDataOverride := ""
if !debug {

homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")
// Try reading KUBECONFIG from environment variable first
kubeConfigPath := os.Getenv("KUBECONFIG")
if kubeConfigPath == "" {
homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")
}
kubeConfigPath = homeDir + "/.kube/config"
}
// Read kubeConfig from file
if _, err := os.Stat(kubeConfigPath); os.IsNotExist(err) {
log.Fatalf("kubeConfig file does not exist at path: %s", kubeConfigPath)
}
kubeConfigPath := homeDir + "/.kube/config"

//k8s go client init logic
config, err := clientcmd.BuildConfigFromFlags("", kubeConfigPath)
if err != nil {
Expand Down
15 changes: 10 additions & 5 deletions cmd/ciReleaseList.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,17 @@ var ciReleaseListCmd = &cobra.Command{

namespace, _ := cmd.Flags().GetString("namespace")

homeDir, err := os.UserHomeDir()
if err != nil {
fmt.Println("cannot read user home dir")
os.Exit(1)
// Try reading KUBECONFIG from environment variable first
kubeConfigPath := os.Getenv("KUBECONFIG")
if kubeConfigPath == "" {
// If not set, use the default kube config path
homeDir, err := os.UserHomeDir()
if err != nil {
fmt.Println("cannot read user home dir")
os.Exit(1)
}
kubeConfigPath = homeDir + "/.kube/config"
}
kubeConfigPath := homeDir + "/.kube/config"

kubeConfig, err := os.ReadFile(kubeConfigPath)
if err != nil {
Expand Down
8 changes: 4 additions & 4 deletions cmd/ciReleaseValidate.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ var ciReleaseValidateCmd = &cobra.Command{
pending_release=$(helm list -n "$NAMESPACE" --pending --filter="(\s|^)($RELEASE_NAME)(\s|$)"| tail -1 | cut -f1)

if [[ "$pending_release" == "$RELEASE_NAME" ]]; then
upgrade_secret_to_delete=$(kubectl get secret -l owner=helm,status=pending-upgrade,name="$RELEASE_NAME" -n "$NAMESPACE" | awk '{print $1}' | grep -v NAME)
install_secret_to_delete=$(kubectl get secret -l owner=helm,status=pending-install,name="$RELEASE_NAME" -n "$NAMESPACE" | awk '{print $1}' | grep -v NAME)
upgrade_secret_to_delete=$(kubectl get secret -l owner=helm,status=pending-upgrade,name="$RELEASE_NAME" -n "$NAMESPACE" --no-headers | awk '{print $1}')
install_secret_to_delete=$(kubectl get secret -l owner=helm,status=pending-install,name="$RELEASE_NAME" -n "$NAMESPACE" --no-headers | awk '{print $1}')

if [[ ! -z "$upgrade_secret_to_delete" ]] ; then
kubectl delete secret -n "$NAMESPACE" "$upgrade_secret_to_delete"
kubectl delete secret -n "$NAMESPACE" "$upgrade_secret_to_delete" || true
fi
if [[ ! -z "$install_secret_to_delete" ]] ; then
kubectl delete secret -n "$NAMESPACE" "$install_secret_to_delete"
kubectl delete secret -n "$NAMESPACE" "$install_secret_to_delete" || true
fi
fi
`, namespace, releaseName)
Expand Down
14 changes: 9 additions & 5 deletions cmd/ciReleaseWakeup.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,19 @@ var ciReleaseWakeupCmd = &cobra.Command{
releaseName, _ := cmd.Flags().GetString("release-name")
namespace, _ := cmd.Flags().GetString("namespace")

homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")
// Try reading KUBECONFIG from environment variable first
kubeConfigPath := os.Getenv("KUBECONFIG")
if kubeConfigPath == "" {
homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")
}
kubeConfigPath = homeDir + "/.kube/config"
}
kubeConfigPath := homeDir + "/.kube/config"

kubeConfig, err := os.ReadFile(kubeConfigPath)
if err != nil {
log.Fatalf("cannot read kubeConfig from path")
log.Fatalf("cannot read kubeConfig from path: %s", kubeConfigPath)
}

// k8s go client init logic
Expand Down
15 changes: 10 additions & 5 deletions cmd/ciScriptsEsInitRemove.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,22 @@ var ciScriptsEsinitRemoveCmd = &cobra.Command{
fmt.Printf("Namespace: %s\n", namespace)
}

homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")
// Try reading KUBECONFIG from environment variable first
kubeConfigPath := os.Getenv("KUBECONFIG")
if kubeConfigPath == "" {
homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("cannot read user home dir")
}
kubeConfigPath = homeDir + "/.kube/config"
}
kubeConfigPath := homeDir + "/.kube/config"

//k8s go client init logic
config, err := clientcmd.BuildConfigFromFlags("", kubeConfigPath)
if err != nil {
log.Fatalf("cannot read kubeConfig from path: %s", err)
log.Fatalf("cannot read kubeConfig from path: %s", kubeConfigPath)
}

clientset, err := kubernetes.NewForConfig(config)
if err != nil {
log.Fatalf("cannot initialize k8s client: %s", err)
Expand Down