From 03e96bb02777b8162e18f07757174868ac762b0e Mon Sep 17 00:00:00 2001 From: Aris Boutselis Date: Fri, 1 Dec 2023 14:00:40 +0000 Subject: [PATCH 1/3] fix: kube marker Signed-off-by: Aris Boutselis --- api/v1alpha1/k8sgpt_types.go | 2 +- config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/v1alpha1/k8sgpt_types.go b/api/v1alpha1/k8sgpt_types.go index 7c1303f4..7fc85f90 100644 --- a/api/v1alpha1/k8sgpt_types.go +++ b/api/v1alpha1/k8sgpt_types.go @@ -97,7 +97,7 @@ type Integrations struct { // K8sGPTSpec defines the desired state of K8sGPT type K8sGPTSpec struct { Version string `json:"version,omitempty"` - // +kubebuilder:default:=ghcr.io/k8sgpt-ai/k8gpt + // +kubebuilder:default:=ghcr.io/k8sgpt-ai/k8sgpt Repository string `json:"repository,omitempty"` NoCache bool `json:"noCache,omitempty"` Filters []string `json:"filters,omitempty"` diff --git a/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml b/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml index 4a6ceed6..b944dc61 100644 --- a/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml +++ b/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml @@ -127,7 +127,7 @@ spec: type: object type: object repository: - default: ghcr.io/k8sgpt-ai/k8gpt + default: ghcr.io/k8sgpt-ai/k8sgpt type: string sink: properties: From 15229c2d27ca4731b92147ebfe73d99f0c56b756 Mon Sep 17 00:00:00 2001 From: Aris Boutselis Date: Fri, 1 Dec 2023 14:07:33 +0000 Subject: [PATCH 2/3] docs: update CR specification Signed-off-by: Aris Boutselis --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0a2feb6c..68019fa6 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ spec: # anonymized: false # language: english noCache: false - repository: ghcr.io/k8sgpt-ai/k8gpt + repository: ghcr.io/k8sgpt-ai/k8sgpt version: v0.3.8 #integrations: # trivy: @@ -58,7 +58,7 @@ spec: # sink: # type: slack # webhook: - # extraOptions: + #extraOptions: # backstage: # enabled: true EOF From 766efce9aa0943ebdda61733915480ac709191b2 Mon Sep 17 00:00:00 2001 From: Aris Boutselis Date: Fri, 1 Dec 2023 19:20:28 +0000 Subject: [PATCH 3/3] chore: add missing backends Signed-off-by: Aris Boutselis --- api/v1alpha1/k8sgpt_types.go | 11 +++++++---- chart/operator/templates/k8sgpt-crd.yaml | 3 +++ config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/api/v1alpha1/k8sgpt_types.go b/api/v1alpha1/k8sgpt_types.go index 7fc85f90..493e0f09 100644 --- a/api/v1alpha1/k8sgpt_types.go +++ b/api/v1alpha1/k8sgpt_types.go @@ -71,7 +71,7 @@ type WebhookRef struct { type AISpec struct { // +kubebuilder:default:=openai - // +kubebuilder:validation:Enum=openai;localai;azureopenai + // +kubebuilder:validation:Enum=openai;localai;azureopenai;amazonbedrock;cohere;amazonsagemaker Backend string `json:"backend"` BaseUrl string `json:"baseUrl,omitempty"` // +kubebuilder:default:=gpt-3.5-turbo @@ -109,9 +109,12 @@ type K8sGPTSpec struct { } const ( - OpenAI = "openai" - AzureOpenAI = "azureopenai" - LocalAI = "localai" + OpenAI = "openai" + AzureOpenAI = "azureopenai" + LocalAI = "localai" + AmazonBedrock = "amazonbedrock" + AmazonSageMaker = "AmazonSageMaker" + Cohere = "cohere" ) // K8sGPTStatus defines the observed state of K8sGPT diff --git a/chart/operator/templates/k8sgpt-crd.yaml b/chart/operator/templates/k8sgpt-crd.yaml index 142d8996..5facd8da 100644 --- a/chart/operator/templates/k8sgpt-crd.yaml +++ b/chart/operator/templates/k8sgpt-crd.yaml @@ -46,6 +46,9 @@ spec: - openai - localai - azureopenai + - amazonbedrock + - cohere + - amazonsagemaker type: string baseUrl: type: string diff --git a/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml b/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml index b944dc61..f2642501 100644 --- a/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml +++ b/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml @@ -46,6 +46,9 @@ spec: - openai - localai - azureopenai + - amazonbedrock + - cohere + - amazonsagemaker type: string baseUrl: type: string