feat: add watsonxai provider

.github/workflows/build_container.yaml

@@ -118,7 +118,7 @@ jobs:
         uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
         with:
           registry: "ghcr.io"
           username: ${{ github.actor }}

.github/workflows/release.yaml

@@ -80,7 +80,7 @@ jobs:
         uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
         with:
           registry: "ghcr.io"
           username: ${{ github.actor }}

api/v1alpha1/k8sgpt_types.go

@@ -82,7 +82,7 @@ type BackOff struct {
 
 type AISpec struct {
 	// +kubebuilder:default:=openai
-	// +kubebuilder:validation:Enum=openai;localai;azureopenai;amazonbedrock;cohere;amazonsagemaker;google;googlevertexai
+	// +kubebuilder:validation:Enum=watsonxai;openai;localai;azureopenai;amazonbedrock;cohere;amazonsagemaker;google;googlevertexai
 	Backend string   `json:"backend"`
 	BackOff *BackOff `json:"backOff,omitempty"`
 	BaseUrl string   `json:"baseUrl,omitempty"`
@@ -140,6 +140,7 @@ const (
 	Cohere          = "cohere"
 	Google          = "google"
 	GoogleVertexAI  = "googlevertexai"
+	WatsonXAI       = "watsonxai"
 )
 
 // K8sGPTStatus defines the observed state of K8sGPT

api/v1alpha1/result_types.go

@@ -50,6 +50,7 @@ type ResultStatus struct {
 //+kubebuilder:subresource:status
 //+kubebuilder:printcolumn:name="Kind",type="string",JSONPath=".spec.kind",description="Kind"
 //+kubebuilder:printcolumn:name="Backend",type="string",JSONPath=".spec.backend",description="Backend"
+//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Age"
 
 // Result is the Schema for the results API
 type Result struct {

chart/operator/templates/k8sgpt-crd.yaml

@@ -56,6 +56,7 @@ spec:
                   backend:
                     default: openai
                     enum:
+                    - watsonxai
                     - openai
                     - localai
                     - azureopenai

chart/operator/templates/result-crd.yaml

@@ -24,6 +24,10 @@ spec:
       jsonPath: .spec.backend
       name: Backend
       type: string
+    - description: Age
+      jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
     name: v1alpha1
     schema:
       openAPIV3Schema:

config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml

@@ -59,6 +59,7 @@ spec:
                   backend:
                     default: openai
                     enum:
+                    - watsonxai
                     - openai
                     - localai
                     - azureopenai

config/crd/bases/core.k8sgpt.ai_results.yaml

@@ -23,6 +23,10 @@ spec:
       jsonPath: .spec.backend
       name: Backend
       type: string
+    - description: Age
+      jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
     name: v1alpha1
     schema:
       openAPIV3Schema:

go.mod

@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go v1.4.0-20240406062209-1cc152efbf5c.1
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.34.2-20240406062209-1cc152efbf5c.2
+	buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.34.2-20240720172138-1b9bcd834f17.2
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
 	github.com/prometheus/client_golang v1.19.1

go.sum

@@ -1,8 +1,8 @@
 buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go v1.4.0-20240406062209-1cc152efbf5c.1 h1:LgzSBB4q8qpgOqpTJoUKEbsDMddSuMK/ccdCuyQkOV8=
 buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go v1.4.0-20240406062209-1cc152efbf5c.1/go.mod h1:8O5QQzJX72VEsoGtQvjBYwA25KrvIN7unx+ahHfxPpc=
 buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.34.1-20240406062209-1cc152efbf5c.1/go.mod h1:qEarbrHjaZEQ5GeUH6XqSqqJMvtPwAGFpAc0nkSBzrQ=
-buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.34.2-20240406062209-1cc152efbf5c.2 h1:9lke4oMvLFuSb+tR1gU2FVBXVZJy84JLafjPdBxnK+E=
-buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.34.2-20240406062209-1cc152efbf5c.2/go.mod h1:1wq1qVxvJkTEUQsF5/XjmhQYXYhbVoLSGhKnzS3ie54=
+buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.34.2-20240720172138-1b9bcd834f17.2 h1:IGBeVvzzeoEl0Ck0uxWXIUn8/my/ZeBvQEIaXCLteOc=
+buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.34.2-20240720172138-1b9bcd834f17.2/go.mod h1:1wq1qVxvJkTEUQsF5/XjmhQYXYhbVoLSGhKnzS3ie54=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=

pkg/resources/k8sgpt.go

@@ -227,7 +227,7 @@ func GetDeployment(config v1alpha1.K8sGPT, outOfClusterMode bool, c client.Clien
 		})
 	}
 	// This check is necessary for the simple OpenAI journey, let's keep it here and guard from breaking other types of backend
-	if config.Spec.AI.Secret != nil && config.Spec.AI.Backend != v1alpha1.AmazonBedrock {
+	if config.Spec.AI.Secret != nil && config.Spec.AI.Backend != v1alpha1.AmazonBedrock && config.Spec.AI.Backend != v1alpha1.WatsonXAI {
 		password := corev1.EnvVar{
 			Name: "K8SGPT_PASSWORD",
 			ValueFrom: &corev1.EnvVarSource{
@@ -313,6 +313,17 @@ func GetDeployment(config v1alpha1.K8sGPT, outOfClusterMode bool, c client.Clien
 			},
 		)
 	}
+	// Add checks for watsonxai
+	if config.Spec.AI.Backend == v1alpha1.WatsonXAI {
+		if config.Spec.AI.Secret != nil {
+			if err := addSecretAsEnvToDeployment(config.Spec.AI.Secret.Name, "WATSONX_API_KEY", config, c, &deployment); err != nil {
+				return &appsv1.Deployment{}, err
+			}
+			if err := addSecretAsEnvToDeployment(config.Spec.AI.Secret.Name, "WATSONX_PROJECT_ID", config, c, &deployment); err != nil {
+				return &appsv1.Deployment{}, err
+			}
+		}
+	}
 	return &deployment, nil
 }