Merge pull request #280 from k8sgpt-ai/feat/manifests

Makefile

@@ -0,0 +1,16 @@
+.PHONY: docker-build
+IMG ?= ghcr.io/k8sgpt-ai/k8sgpt:latest
+
+deploy:
+ifndef SECRET
+	$(error SECRET environment variable is not set)
+endif
+	kubectl create ns k8sgpt || true
+	kubectl create secret generic ai-backend-secret --from-literal=secret-key=$(SECRET) --namespace=k8sgpt || true
+	kubectl apply -f container/manifests
+undeploy:
+	kubectl delete secret ai-backend-secret --namespace=k8sgpt
+	kubectl delete -f container/manifests
+	kubectl delete ns k8sgpt
+docker-build:
+	docker buildx build --build-arg=VERSION="$$(git describe --tags --abbrev=0)" --build-arg=COMMIT="$$(git rev-parse --short HEAD)" --build-arg DATE="$$(date +%FT%TZ)" --platform="linux/amd64,linux/arm64" -t ${IMG} -f container/Dockerfile . --push

cmd/serve/serve.go

@@ -42,6 +42,14 @@ var ServeCmd = &cobra.Command{
 					Password: password,
 					Model:    model,
 				}
+
+				configAI.Providers = append(configAI.Providers, *aiProvider)
+
+				viper.Set("ai", configAI)
+				if err := viper.WriteConfig(); err != nil {
+					color.Red("Error writing config file: %s", err.Error())
+					os.Exit(1)
+				}
 			} else {
 				color.Red("Error: AI provider not specified in configuration. Please run k8sgpt auth")
 				os.Exit(1)

container/manifests/deployment.yaml

@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: k8sgpt-deployment
+  namespace: k8sgpt
+  labels:
+    app: k8sgpt
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: k8sgpt
+  template:
+    metadata:
+      labels:
+        app: k8sgpt
+    spec:
+      serviceAccountName: k8sgpt
+      containers:
+      - name: k8sgpt-container
+        imagePullPolicy: Always
+        image: ghcr.io/k8sgpt-ai/k8sgpt:v0.2.2 #x-release-please-version
+        ports:
+        - containerPort: 8080
+        args: ["serve"]
+        resources:
+          limits:
+            cpu: "1"
+            memory: "512Mi"
+          requests:
+            cpu: "0.5"
+            memory: "256Mi"
+        env:
+        - name: K8SGPT_MODEL
+          value: "gpt-3.5-turbo"
+        - name: K8SGPT_BACKEND
+          value: "openai"
+        - name: K8SGPT_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: ai-backend-secret
+              key: secret-key

container/manifests/role.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: k8sgpt-cluster-role-all
+rules:
+- apiGroups:
+  - '*'
+  resources:
+  - '*'
+  verbs:
+  - get
+  - list
+  - watch

container/manifests/rolebinding.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: k8sgpt-rolebinding
+  namespace: k8sgpt
+subjects:
+- kind: ServiceAccount
+  name: k8sgpt
+  namespace: k8sgpt
+roleRef:
+  kind: ClusterRole
+  name: k8sgpt-cluster-role-all
+  apiGroup: rbac.authorization.k8s.io

container/manifests/sa.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: k8sgpt
+  namespace: k8sgpt

container/manifests/service.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: k8sgpt-service
+  namespace: k8sgpt
+spec:
+  selector:
+    app: k8sgpt
+  ports:
+    - name: http
+      port: 8080
+      targetPort: 8080
+  type: ClusterIP

demo

@@ -0,0 +1,11 @@
+. demo-magic.sh
+clear
+
+pe "k8sgpt filter list"
+pe "k8sgpt analyze --filter=Pod --explain -o json | jq ."
+pe "k8sgpt integration list"
+pe "k8sgpt integration activate trivy"
+pe "k8sgpt filter list"
+pe "k8sgpt analyze --filter=VulnerabilityReport"
+pe "./k8sgpt analyze --filter=Node --explain"
+

pkg/kubernetes/kubernetes.go

@@ -28,26 +28,29 @@ func (c *Client) GetRestClient() rest.Interface {
 }
 
 func NewClient(kubecontext string, kubeconfig string) (*Client, error) {
-
-	config := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
-		&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeconfig},
-		&clientcmd.ConfigOverrides{
-			CurrentContext: kubecontext,
-		})
-	// create the clientset
-	c, err := config.ClientConfig()
+	var config *rest.Config
+	config, err := rest.InClusterConfig()
+	if err != nil {
+		clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
+			&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeconfig},
+			&clientcmd.ConfigOverrides{
+				CurrentContext: kubecontext,
+			})
+		// create the clientset
+		config, err = clientConfig.ClientConfig()
+		if err != nil {
+			return nil, err
+		}
+	}
+	clientSet, err := kubernetes.NewForConfig(config)
 	if err != nil {
 		return nil, err
 	}
-	clientSet, err := kubernetes.NewForConfig(c)
-	if err != nil {
-		return nil, err
-	}
-	c.APIPath = "/api"
-	c.GroupVersion = &scheme.Scheme.PrioritizedVersionsForGroup("")[0]
-	c.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: scheme.Codecs}
+	config.APIPath = "/api"
+	config.GroupVersion = &scheme.Scheme.PrioritizedVersionsForGroup("")[0]
+	config.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: scheme.Codecs}
 
-	restClient, err := rest.RESTClientFor(c)
+	restClient, err := rest.RESTClientFor(config)
 	if err != nil {
 		return nil, err
 	}
@@ -55,6 +58,6 @@ func NewClient(kubecontext string, kubeconfig string) (*Client, error) {
 	return &Client{
 		Client:     clientSet,
 		RestClient: restClient,
-		Config:     c,
+		Config:     config,
 	}, nil
 }

release-please-config.json

@@ -11,7 +11,8 @@
         "README.md",
         "deploy/manifest.yaml",
         "chart/Chart.yaml",
-        "chart/values.yaml"
+        "chart/values.yaml",
+        "container/manifests/deployment.yaml"
       ],
       "changelog-sections": [
         {