Merge pull request #152 from k8sgpt-ai/release-please--branches--main

chore(main): release 0.1.4

.release-please-manifest.json

@@ -1 +1 @@
-{".":"0.1.3"}
+{".":"0.1.4"}

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [0.1.4](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.1.3...v0.1.4) (2023-03-30)
+
+
+### Features
+
+* add Ingress class validation ([#154](https://github.com/k8sgpt-ai/k8sgpt/issues/154)) ([b061566](https://github.com/k8sgpt-ai/k8sgpt/commit/b061566404ef80288ca29add2d401574109d44c0))
+* output selected backend ([#153](https://github.com/k8sgpt-ai/k8sgpt/issues/153)) ([be061da](https://github.com/k8sgpt-ai/k8sgpt/commit/be061da5b65045938acd70ad2eb2d21b87d2d6bf))
+
+
+### Bug Fixes
+
+* now supports different kubeconfig and kubectx ([c8f3c94](https://github.com/k8sgpt-ai/k8sgpt/commit/c8f3c946b00c00cd185961a4fa777806da94014e))
+
+
+### Refactoring
+
+* removed sample flag ([0afd528](https://github.com/k8sgpt-ai/k8sgpt/commit/0afd52844b96579391f77698bf0555145b6d2be8))
+
 ## [0.1.3](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.1.2...v0.1.3) (2023-03-30)
 
 

cmd/auth/auth.go

@@ -35,6 +35,7 @@ var AuthCmd = &cobra.Command{
 		// override the default backend if a flag is provided
 		if backend != "" {
 			backendType = backend
+			color.Green("Using %s as backend AI provider", backendType)
 		}
 
 		fmt.Printf("Enter %s Key: ", backendType)

cmd/root.go

@@ -1,8 +1,11 @@
 package cmd
 
 import (
-	"github.com/k8sgpt-ai/k8sgpt/cmd/generate"
 	"os"
+	"path/filepath"
+
+	"github.com/k8sgpt-ai/k8sgpt/cmd/generate"
+	"k8s.io/client-go/util/homedir"
 
 	"github.com/fatih/color"
 	"github.com/k8sgpt-ai/k8sgpt/cmd/analyze"
@@ -13,10 +16,10 @@ import (
 )
 
 var (
-	cfgFile    string
-	masterURL  string
-	kubeconfig string
-	version    string
+	cfgFile     string
+	kubecontext string
+	kubeconfig  string
+	version     string
 )
 
 // rootCmd represents the base command when called without any subcommands
@@ -42,23 +45,25 @@ func Execute(v string) {
 func init() {
 	cobra.OnInitialize(initConfig)
 
-	// Here you will define your flags and configuration settings.
-	// Cobra supports persistent flags, which, if defined here,
-	// will be global for your application.
+	var kubeconfigPath string
+	if home := homedir.HomeDir(); home != "" {
+		kubeconfigPath = filepath.Join(home, ".kube", "config")
+	}
 	rootCmd.AddCommand(auth.AuthCmd)
 	rootCmd.AddCommand(analyze.AnalyzeCmd)
 	rootCmd.AddCommand(generate.GenerateCmd)
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.k8sgpt.yaml)")
-	rootCmd.PersistentFlags().StringVar(&masterURL, "master", "", "The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.")
-	rootCmd.PersistentFlags().StringVar(&kubeconfig, "kubeconfig", "", "Path to a kubeconfig. Only required if out-of-cluster.")
+	rootCmd.PersistentFlags().StringVar(&kubecontext, "kubecontext", "", "Kubernetes context to use. Only required if out-of-cluster.")
+	rootCmd.PersistentFlags().StringVar(&kubeconfig, "kubeconfig", kubeconfigPath, "Path to a kubeconfig. Only required if out-of-cluster.")
 	// Cobra also supports local flags, which will only run
 	// when this action is called directly.
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	// rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
 	//Initialise the kubeconfig
-	kubernetesClient, err := kubernetes.NewClient(masterURL, kubeconfig)
+	kubernetesClient, err := kubernetes.NewClient(kubecontext, kubeconfig)
 	if err != nil {
 		color.Red("Error initialising kubernetes client: %v", err)
+		os.Exit(1)
 	}
 
 	viper.Set("kubernetesClient", kubernetesClient)

pkg/analyzer/ingressAnalyzer.go

@@ -22,6 +22,26 @@ func AnalyzeIngress(ctx context.Context, config *AnalysisConfiguration, client *
 
 	for _, ing := range list.Items {
 		var failures []string
+
+		// get ingressClassName
+		ingressClassName := ing.Spec.IngressClassName
+		if ingressClassName == nil {
+			ingClassValue := ing.Annotations["kubernetes.io/ingress.class"]
+			if ingClassValue == "" {
+				failures = append(failures, fmt.Sprintf("Ingress %s/%s does not specify an Ingress class.", ing.Namespace, ing.Name))
+			} else {
+				ingressClassName = &ingClassValue
+			}
+		}
+
+		// check if ingressclass exist
+		if ingressClassName != nil {
+			_, err := client.GetClient().NetworkingV1().IngressClasses().Get(ctx, *ingressClassName, metav1.GetOptions{})
+			if err != nil {
+				failures = append(failures, fmt.Sprintf("Ingress uses the ingress class %s which does not exist.", *ingressClassName))
+			}
+		}
+
 		// loop over rules
 		for _, rule := range ing.Spec.Rules {
 			// loop over paths

pkg/kubernetes/kubernetes.go

@@ -2,7 +2,6 @@ package kubernetes
 
 import (
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 )
 
@@ -14,21 +13,23 @@ func (c *Client) GetClient() *kubernetes.Clientset {
 	return c.client
 }
 
-func NewClient(masterURL string, kubeconfig string) (*Client, error) {
+func NewClient(kubecontext string, kubeconfig string) (*Client, error) {
 
-	config, err := rest.InClusterConfig()
-	if err != nil {
-		kubeconfig :=
-			clientcmd.NewDefaultClientConfigLoadingRules().GetDefaultFilename()
-		config, err = clientcmd.BuildConfigFromFlags(masterURL, kubeconfig)
-		if err != nil {
-			return nil, err
-		}
-	}
-	clientSet, err := kubernetes.NewForConfig(config)
+	config := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
+		&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeconfig},
+		&clientcmd.ConfigOverrides{
+			CurrentContext: kubecontext,
+		})
+	// create the clientset
+	c, err := config.ClientConfig()
 	if err != nil {
 		return nil, err
 	}
+	clientSet, err := kubernetes.NewForConfig(c)
+	if err != nil {
+		return nil, err
+	}
+
 	return &Client{
 		client: clientSet,
 	}, nil