Merge branch 'master' into next

powerlevel9k.zsh-theme

@@ -1424,7 +1424,16 @@ prompt_kubecontext() {
       cur_namespace="default"
     fi
 
-    "$1_prompt_segment" "$0" "$2" "magenta" "white" "$cur_ctx/$cur_namespace" "KUBERNETES_ICON"
+    local k8s_final_text=""
+
+    if [[ "$k8s_context" == "k8s_namespace" ]]; then
+      # No reason to print out the same identificator twice
+      k8s_final_text="$k8s_context"
+    else
+      k8s_final_text="$k8s_context/$k8s_namespace"
+    fi
+
+    "$1_prompt_segment" "$0" "$2" "magenta" "white" "$k8s_final_text" "KUBERNETES_ICON"
   fi
 }