diff --git a/Makefile b/Makefile index 1a8ee4979..2be223af3 100644 --- a/Makefile +++ b/Makefile @@ -251,5 +251,5 @@ arctl: fmt vet ## Build manager binary. # graphql-server go gql-gen: @go run github.com/99designs/gqlgen@v0.17.40 generate -build-graphql-server: - @CGO_ENABLED=0 GOOS=linux go build -o go-bff-server graphql-server/go-server/main.go +build-graphql-server: gql-gen + @CGO_ENABLED=0 GOOS=linux go build -o bin/graphql-server graphql-server/go-server/main.go \ No newline at end of file diff --git a/assets/dataset_flow.drawio b/assets/dataset_flow.drawio deleted file mode 100644 index 5bda545e9..000000000 --- a/assets/dataset_flow.drawio +++ /dev/null @@ -1 +0,0 @@ -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 \ No newline at end of file diff --git a/assets/dataset_flow.drawio.png b/assets/dataset_flow.drawio.png deleted file mode 100644 index 0e082125c..000000000 Binary files a/assets/dataset_flow.drawio.png and /dev/null differ diff --git a/charts/arcadia/Chart.yaml b/charts/arcadia/Chart.yaml index 2f37000d7..7ae631fc9 100644 --- a/charts/arcadia/Chart.yaml +++ b/charts/arcadia/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: arcadia description: A Helm chart(KubeBB Component) for KubeAGI Arcadia type: application -version: 0.1.14 +version: 0.1.15 appVersion: "0.0.1" keywords: diff --git a/charts/arcadia/templates/post-oss.yaml b/charts/arcadia/templates/post-oss.yaml index bbdea332e..fa4983250 100644 --- a/charts/arcadia/templates/post-oss.yaml +++ b/charts/arcadia/templates/post-oss.yaml @@ -4,7 +4,7 @@ metadata: name: {{ .Release.Name }}-minio namespace: {{ .Release.Namespace }} annotations: - "helm.sh/hook": post-install,post-upgrade + "helm.sh/hook": post-install "helm.sh/hook-weight": "1" spec: displayName: "内置系统数据源" diff --git a/graphql-server/go-server/README.md b/graphql-server/go-server/README.md index 629e4e3c2..71b4cadcd 100644 --- a/graphql-server/go-server/README.md +++ b/graphql-server/go-server/README.md @@ -1,3 +1,7 @@ +# graphql go server + + + ## How to develop **There can only be one Query structure in all schemas, and Mutation can have one or none.** @@ -52,33 +56,48 @@ All we have to do is just implement the `FindX` function. And the content of the ## How to run -in the root dir of the project +At the root dir of the project + +1. Build graphql server ```shell -# 1. build make build-graphql-server +``` -# 2. run parameters -$ ./go-bff-server -h -Usage of ./main: +2. Try graphql-server + +```shell +$ ./bin/graphql-server -h +Usage of ./bin/graphql-server: + -host string + bind to the host, default is 0.0.0.0 + -port int + service listening port (default 8081) + -enable-playground + whether to enable the graphql playground + -enable-oidc + whether to enable oidc authentication -client-id string - oidc client id + oidc client id -client-secret string - oidc client secret - -enable-playgroud - whether to open the graphql playground (default true) - -host string - bind to the host, default is 0.0.0.0 + oidc client secret + -master-url string + k8s master url -issuer-url string - oidc issuer url + oidc issuer url -kubeconfig string - Paths to a kubeconfig. Only required if out-of-cluster. - -master-url string - k8s master url - -port int - service listening port (default 8081) + Paths to a kubeconfig. Only required if out-of-cluster. +``` + +3. Run graphql-server -# 3. run -./go-bff-server --client-id=bff-client --client-secret=some-secret --master-url=https://k8s-adress --issuer-url=https://oidc-server +> If you don't want to try playground,do not pass flag `-enable-plaground` + +```shell +./bin/graphql-server -enable-playground --client-id=bff-client --client-secret=some-secret --master-url=https://k8s-adress --issuer-url=https://oidc-server ``` +4. Try apis with plaground + +Open http://localhost:8081/ in your browser! + diff --git a/graphql-server/go-server/main.go b/graphql-server/go-server/main.go index 5cec57ee2..b2989f0cd 100644 --- a/graphql-server/go-server/main.go +++ b/graphql-server/go-server/main.go @@ -36,14 +36,16 @@ import ( ) var ( - host = flag.String("host", "", "bind to the host, default is 0.0.0.0") - port = flag.Int("port", 8081, "service listening port") - enablePlayground = flag.Bool("enable-playgroud", true, "whether to open the graphql playground") - - issuerURL = flag.String("issuer-url", "", "oidc issuer url") - masterURL = flag.String("master-url", "", "k8s master url") - clientSecret = flag.String("client-secret", "", "oidc client secret") - clientID = flag.String("client-id", "", "oidc client id") + host = flag.String("host", "", "bind to the host, default is 0.0.0.0") + port = flag.Int("port", 8081, "service listening port") + + enablePlayground = flag.Bool("enable-playground", false, "enable the graphql playground") + + // Flags fro oidc client + issuerURL = flag.String("issuer-url", "", "oidc issuer url(required when enable odic)") + masterURL = flag.String("master-url", "", "k8s master url(required when enable odic)") + clientID = flag.String("client-id", "", "oidc client id(required when enable odic)") + clientSecret = flag.String("client-secret", "", "oidc client secret(required when enable odic)") ) func main() { @@ -61,7 +63,7 @@ func main() { }) if *enablePlayground { - http.Handle("/", auth.AuthInterceptor(oidc.Verifier, playground.Handler("Arcadia-BFF-Server", "/query"))) + http.Handle("/", auth.AuthInterceptor(oidc.Verifier, playground.Handler("Arcadia-Graphql-Server", "/query"))) } http.Handle("/query", auth.AuthInterceptor(oidc.Verifier, srv.ServeHTTP))