feat: add k8sgpt image repositoty and tag to k8sgpt crd

feat: add default value Signed-off-by: JuHyung-Son <[email protected]>
k8sgpt-ai · Nov 21, 2023 · 0898941 · 0898941
1 parent 7fedf7c
commit 0898941
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 12 deletions.
diff --git a/api/v1alpha1/k8sgpt_types.go b/api/v1alpha1/k8sgpt_types.go
@@ -94,9 +94,15 @@ type Integrations struct {
 	Trivy *Trivy `json:"trivy,omitempty"`
 }
 
+type Image struct {
+	// +kubebuilder:default:=ghcr.io/k8sgpt-ai/k8gpt
+	Repository string `json:"repository,omitempty"`
+	Tag        string `json:"tag,omitempty"`
+}
+
 // K8sGPTSpec defines the desired state of K8sGPT
 type K8sGPTSpec struct {
-	Version      string           `json:"version,omitempty"`
+	Image        Image            `json:"image,omitempty"`
 	NoCache      bool             `json:"noCache,omitempty"`
 	Filters      []string         `json:"filters,omitempty"`
 	ExtraOptions *ExtraOptionsRef `json:"extraOptions,omitempty"`

diff --git a/api/v1alpha1/k8sgpt_types_test.go b/api/v1alpha1/k8sgpt_types_test.go
@@ -34,11 +34,12 @@ var _ = Describe("The test cases for the K8sGPT CRDs", func() {
 			Key:  "k8s-gpt",
 		}
 
-		kind     = "K8sGPT"
-		baseUrl  = "https://api.k8s-gpt.localhost"
-		model    = "345M"
-		version  = "v1alpha1"
-		language = "english"
+		kind       = "K8sGPT"
+		baseUrl    = "https://api.k8s-gpt.localhost"
+		model      = "345M"
+		repository = "ghcr.io/k8sgpt-ai/k8sgpt"
+		tag        = "v1alpha1"
+		language   = "english"
 
 		Namespace = "k8sGPT"
 
@@ -60,8 +61,10 @@ var _ = Describe("The test cases for the K8sGPT CRDs", func() {
 					Anonymize: true,
 					Language:  language,
 				},
-				Version: version,
-
+				Image: Image{
+					Repository: repository,
+					Tag:        tag,
+				},
 				NoCache: true,
 			},
 		}
@@ -84,8 +87,10 @@ var _ = Describe("The test cases for the K8sGPT CRDs", func() {
 					Anonymize: false,
 					Language:  language,
 				},
-				Version: version,
-
+				Image: Image{
+					Repository: repository,
+					Tag:        tag,
+				},
 				NoCache: false,
 			},
 		}

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml b/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml
@@ -81,6 +81,14 @@ spec:
                 items:
                   type: string
                 type: array
+              image:
+                properties:
+                  repository:
+                    default: ghcr.io/k8sgpt-ai/k8gpt
+                    type: string
+                  tag:
+                    type: string
+                type: object
               integrations:
                 properties:
                   trivy:
@@ -135,8 +143,6 @@ spec:
                   webhook:
                     type: string
                 type: object
-              version:
-                type: string
             type: object
           status:
             description: K8sGPTStatus defines the observed state of K8sGPT