Skip to content

Commit

Permalink
feat: running in cluster
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Jones <alexsimonjones@gmail.com>
  • Loading branch information
AlexsJones committed Apr 15, 2023
1 parent f0a0c9a commit 3988eb2
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 103 deletions.
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +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
8 changes: 8 additions & 0 deletions cmd/serve/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion container/manifests/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: k8sgpt-deployment
namespace: k8sgpt
labels:
app: k8sgpt
spec:
Expand All @@ -14,9 +15,11 @@ spec:
labels:
app: k8sgpt
spec:
serviceAccountName: k8sgpt
containers:
- name: k8sgpt-container
image: ghcr.io/k8sgpt-ai/k8sgpt:v0.2.2 #x-release-please-version
imagePullPolicy: Always
image: tibbar/test-k8sgpt:latest #x-release-please-version
ports:
- containerPort: 8080
args: ["serve"]
Expand Down
71 changes: 3 additions & 68 deletions container/manifests/role.yaml
Original file line number Diff line number Diff line change
@@ -1,77 +1,12 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: k8sgpt-cluster-role
name: k8sgpt-cluster-role-all
rules:
- apiGroups:
- ""
- '*'
resources:
- pods
- nodes
- persistentvolumeclaims
- namespaces
verbs:
- get
- list
- watch
- apiGroups:
- extensions
- apps
resources:
- deployments
- replicasets
- statefulsets
verbs:
- get
- list
- watch
- apiGroups:
- autoscaling
resources:
- horizontalpodautoscalers
verbs:
- get
- list
- watch
- apiGroups:
- networking.k8s.io
resources:
- networkpolicies
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- services
- endpoints
verbs:
- get
- list
- watch
- apiGroups:
- batch
resources:
- jobs
verbs:
- get
- list
- watch
- apiGroups:
- batch
- extensions
- batch.openshift.io
resources:
- cronjobs
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- events
- '*'
verbs:
- get
- list
Expand Down
13 changes: 13 additions & 0 deletions container/manifests/rolebinding.yaml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions container/manifests/sa.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: k8sgpt
namespace: k8sgpt
7 changes: 0 additions & 7 deletions container/manifests/secret.yaml

This file was deleted.

13 changes: 1 addition & 12 deletions container/manifests/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: k8sgpt-service
namespace: k8sgpt
spec:
selector:
app: k8sgpt
Expand All @@ -10,15 +11,3 @@ spec:
port: 8080
targetPort: 8080
type: ClusterIP
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: k8sgpt-rolebinding
subjects:
- kind: ServiceAccount
name: k8sgpt
roleRef:
kind: ClusterRole
name: k8sgpt-cluster-role
apiGroup: rbac.authorization.k8s.io
33 changes: 18 additions & 15 deletions pkg/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,36 @@ 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 {
return nil, err
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(c)
clientSet, err := kubernetes.NewForConfig(config)
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
}

return &Client{
Client: clientSet,
RestClient: restClient,
Config: c,
Config: config,
}, nil
}

0 comments on commit 3988eb2

Please sign in to comment.