Merge pull request #114 from jiaozifs/feat/support_k8s

Brownjy · web-flow · commit ce3ee54875bd · 2024-01-23T12:33:20.000+08:00
Feat/support k8s
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,11 @@
+FROM ubuntu:22.04
+
+
+WORKDIR /app
+
+COPY jzfs /jzfs
+COPY script/start.sh /start.sh
+
+RUN chmod +x /start.sh
+
+ENTRYPOINT ["/start.sh"]
diff --git a/README.md b/README.md
@@ -31,6 +31,10 @@ After following the above steps, you should be able to see an executable file na
 ./jzfs daemon
 ```
 
+#### run with docker
+```bash
+docker run -v <data>:/app -p 34913:34913 gitdatateam/jzfs:latest  --db "postgres://<user>:<password>@192.168.1.16:5432/jiaozifs?sslmode=disable" --bs_path /app/data --listen http://0.0.0.0:34913 --config /app/config.toml
+```
 ## License
 
 Dual-licensed under [MIT](https://github.com/jiaozifs/jiaozifs/blob/main/LICENSE-MIT) + [Apache 2.0](https://github.com/jiaozifs/jiaozifs/blob/main/LICENSE-APACHE)
diff --git a/charts/Chart.yaml b/charts/Chart.yaml
@@ -0,0 +1,13 @@
+apiVersion: v2
+name: jiaozifs-api
+description: Install jiaozifs api to provider backend function of jiaozifs.
+version: 1.0.0
+kubeVersion: < 1.28.0-0
+home: https://jiaozifs.com/
+keywords:
+  - jiaozifs
+sources:
+  - https://github.com/jiaozifs/jiaozifs
+  - https://github.com/jiaozifs/jiaozifs-ui
+maintainers:
+  - name: jiaozifs team
diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
@@ -0,0 +1,24 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: jiaozifs-backend-api-deployment
+  labels:
+    apptype: jiaozifs-api
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: jiaozifs-backend-api
+  template:
+    metadata:
+      labels:
+        app: jiaozifs-backend-api
+        apptype: jiaozifs-api
+    spec:
+      containers:
+        - name: jiaozifs-backend
+          image: gitdatateam/jzfs:latest
+          imagePullPolicy: Always
+          args: ["--db  {{ .Values.db }} --log-level {{ .Values.log_level }} --bs_path {{ .Values.home_path }}/data --listen http://0.0.0.0:{{ .Values.port }} --config {{ .Values.home_path }}/config.yaml"]
+          ports:
+            - containerPort: {{ .Values.port }}
diff --git a/charts/templates/ingress.yaml b/charts/templates/ingress.yaml
@@ -0,0 +1,28 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name:  jiaozifs-api
+  annotations:
+    meta.helm.sh/release-name: jiaozifs-api
+    nginx.ingress.kubernetes.io/rewrite-target: /
+    nginx.ingress.kubernetes.io/proxy-connect-timeout: "30"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "1800"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "1800"
+  labels:
+    apptype: jiaozifs-api
+    app.kubernetes.io/managed-by: Helm
+    heritage: Helm
+    release:  jiaozifs-api
+spec:
+  ingressClassName: {{.Values.ingress_name}}
+  rules:
+    - host: api.jiaozifs.com
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: jiaozifs-backend-api-service
+                port:
+                  number: {{ .Values.port }}
diff --git a/charts/templates/service.yaml b/charts/templates/service.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: jiaozifs-backend-api-service
+  labels:
+    apptype: jiaozifs-api
+spec:
+  type: ClusterIP
+  selector:
+    app: jiaozifs-backend-api
+  ports:
+    - protocol: TCP
+      port: {{ .Values.port }}
+      targetPort: {{ .Values.port }}
diff --git a/charts/values.yaml b/charts/values.yaml
@@ -0,0 +1,9 @@
+# Additional Trusted CAs.
+# Enable this flag and add your CA certs as a secret named tls-ca-additional in the namespace.
+# See README.md for details.
+replicas: 1
+db: ""
+home_path: "/app/data"
+port: 34913
+ingress_name: nginx
+log_level: info
diff --git a/cmd/daemon.go b/cmd/daemon.go
@@ -3,6 +3,8 @@ package cmd
 import (
 	"context"
 
+	"github.com/pelletier/go-toml/v2"
+
 	"github.com/gorilla/sessions"
 	logging "github.com/ipfs/go-log/v2"
 	apiImpl "github.com/jiaozifs/jiaozifs/api/api_impl"
@@ -16,7 +18,6 @@ import (
 	"github.com/jiaozifs/jiaozifs/utils"
 	"github.com/jiaozifs/jiaozifs/version"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"github.com/uptrace/bun"
 )
 
@@ -38,6 +39,12 @@ var daemonCmd = &cobra.Command{
 			return err
 		}
 
+		cfgData, err := toml.Marshal(cfg)
+		if err != nil {
+			return err
+		}
+		log.Debug(string(cfgData))
+
 		shutdown := make(utils.Shutdown)
 		stop, err := fx_opt.New(cmd.Context(),
 			fx_opt.Override(new(context.Context), cmd.Context()),
@@ -76,9 +83,4 @@ var daemonCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(daemonCmd)
-	daemonCmd.Flags().String("db", "", "pg connection string eg. postgres://user:pass@localhost:5432/jiaozifs?sslmode=disable")
-	daemonCmd.Flags().String("log-level", "INFO", "set log level eg. DEBUG INFO ERROR")
-
-	_ = viper.BindPFlag("database.connection", daemonCmd.Flags().Lookup("db"))
-	_ = viper.BindPFlag("log.level", daemonCmd.Flags().Lookup("log-level"))
 }
diff --git a/cmd/root.go b/cmd/root.go
@@ -3,7 +3,6 @@ package cmd
 import (
 	"os"
 
-	"github.com/jiaozifs/jiaozifs/config"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -31,7 +30,9 @@ func RootCmd() *cobra.Command {
 }
 func init() {
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "~/.jiaozifs/config.toml", "config file (default is $HOME/.jiaozifs/config.toml)")
-	rootCmd.PersistentFlags().String("listen", config.DefaultLocalBSPath, "config blockstore path")
+	rootCmd.PersistentFlags().String("listen", "http://127.0.0.1:34913", "config list url")
+	rootCmd.PersistentFlags().String("log-level", "INFO", "set log level eg. DEBUG INFO ERROR")
 	_ = viper.BindPFlag("api.listen", rootCmd.PersistentFlags().Lookup("listen"))
 	_ = viper.BindPFlag("config", rootCmd.PersistentFlags().Lookup("config"))
+	_ = viper.BindPFlag("log.level", rootCmd.PersistentFlags().Lookup("log-level"))
 }
diff --git a/makefile b/makefile
@@ -27,3 +27,8 @@ test: gen-api
 	go test -timeout=30m -parallel=4  -v ./...
 build:gen-api
 	go build $(GOFLAGS) -o jzfs
+
+TAG:=test
+docker:build
+	docker build -t gitdatateam/jzfs:$(TAG) .
+	docker push gitdatateam/jzfs:$(TAG)
diff --git a/models/migrations/main.go b/models/migrations/main.go
@@ -9,12 +9,6 @@ import (
 
 var Migrations = migrate.NewMigrations()
 
-func init() {
-	if err := Migrations.DiscoverCaller(); err != nil {
-		panic(err)
-	}
-}
-
 func MigrateDatabase(ctx context.Context, sqlDB *bun.DB) error {
 	migrator := migrate.NewMigrator(sqlDB, Migrations)
 	err := migrator.Init(ctx)
diff --git a/script/postgress/configmap.yaml b/script/postgress/configmap.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: jiaozifs-api-postgres-config
+  labels:
+    app: jiaozifs-api-db-cfg
+    apptype: jiaozifs-pg-db
+data:
+  POSTGRES_DB: "postgresdb"
+  POSTGRES_USER: "admin"
+  POSTGRES_PASSWORD: "psltest"
diff --git a/script/postgress/deployment.yaml b/script/postgress/deployment.yaml
@@ -0,0 +1,34 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: jiaozifs-api-pg-db-deployment  # Sets Deployment name
+  labels:
+    apptype: jiaozifs-pg-db
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: jiaozifs-api-pg-db
+  template:
+    metadata:
+      labels:
+        app: jiaozifs-api-pg-db
+        apptype: jiaozifs-pg-db
+    spec:
+      nodeName: k2
+      containers:
+        - name: postgres
+          image: postgres:13.13
+          imagePullPolicy: "IfNotPresent"
+          ports:
+            - containerPort: 5432
+          envFrom:
+            - configMapRef:
+                name: jiaozifs-api-postgres-config
+          volumeMounts:
+            - mountPath: /var/lib/postgresql/data
+              name: postgredb
+      volumes:
+        - name: postgredb
+          persistentVolumeClaim:
+            claimName: jiaozifs-postgres-pv-claim
diff --git a/script/postgress/pv.yaml b/script/postgress/pv.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: jiaozifs-postgres-pv-volume
+  labels:
+    type: local
+    apptype: jiaozifs-pg-db
+spec:
+  storageClassName: manual
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: "/data/jiaozifs-pg-data"
diff --git a/script/postgress/pvc.yaml b/script/postgress/pvc.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: jiaozifs-postgres-pv-claim
+  labels:
+    apptype: jiaozifs-pg-db
+spec:
+  storageClassName: manual
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
diff --git a/script/postgress/svc.yaml b/script/postgress/svc.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: jiaozifs-api-db-service
+  labels:
+    apptype: jiaozifs-pg-db
+spec:
+  type: ClusterIP
+  selector:
+    app: jiaozifs-api-pg-db
+  ports:
+    - protocol: TCP
+      port: 5432
+      targetPort: 5432
diff --git a/script/start.sh b/script/start.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+regex="--config[[:space:]]+([^[:space:]]+)"
+if [[ $@ =~ $regex ]]; then
+  config_value="--config ${BASH_REMATCH[1]}"
+  echo "Config value: $config_value"
+fi
+
+regex="--log-level[[:space:]]+([^[:space:]]+)"
+if [[ $@ =~ $regex ]]; then
+  loglevel="--log-level ${BASH_REMATCH[1]}"
+  echo "Log level: $loglevel"
+fi
+
+/jzfs init $@
+
+/jzfs daemon $config_value $loglevel

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ package cmd`
`3`	`3`	`import (`
`4`	`4`	`"os"`
`5`	`5`
`6`		`- "github.com/jiaozifs/jiaozifs/config"`
`7`	`6`	`"github.com/spf13/cobra"`
`8`	`7`	`"github.com/spf13/viper"`
`9`	`8`	`)`
`@@ -31,7 +30,9 @@ func RootCmd() *cobra.Command {`
`31`	`30`	`}`
`32`	`31`	`func init() {`
`33`	`32`	`rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "~/.jiaozifs/config.toml", "config file (default is $HOME/.jiaozifs/config.toml)")`
`34`		`- rootCmd.PersistentFlags().String("listen", config.DefaultLocalBSPath, "config blockstore path")`
	`33`	`+ rootCmd.PersistentFlags().String("listen", "http://127.0.0.1:34913", "config list url")`
	`34`	`+ rootCmd.PersistentFlags().String("log-level", "INFO", "set log level eg. DEBUG INFO ERROR")`
`35`	`35`	`_ = viper.BindPFlag("api.listen", rootCmd.PersistentFlags().Lookup("listen"))`
`36`	`36`	`_ = viper.BindPFlag("config", rootCmd.PersistentFlags().Lookup("config"))`
	`37`	`+ _ = viper.BindPFlag("log.level", rootCmd.PersistentFlags().Lookup("log-level"))`
`37`	`38`	`}`