Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf: completely remove the dependency of rbd-api on etcd #1870

Merged
merged 19 commits into from
Feb 20, 2024
Merged

perf: completely remove the dependency of rbd-api on etcd #1870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c7567fa
feat: add response header (#1869)
DokiDoki1103 Feb 19, 2024
ee780a7
perf: arm build (#1859)
DokiDoki1103 Jan 19, 2024
ff2b6fb
perf: delete default github token (#1860)
DokiDoki1103 Jan 19, 2024
fa669e7
fix: etcd insecure connection(#1863)
DokiDoki1103 Jan 25, 2024
33a51b1
perf: image tag list (#1862)
DokiDoki1103 Jan 25, 2024
6512740
fix: mirror warehouse image parsing error in ip:port format (#1867)
ZhangSetSail Feb 3, 2024
45244b5
perf: remove mq etcd dependency (#1868)
DokiDoki1103 Feb 18, 2024
a94fa90
fix: reduce servicecheck etcd key
DokiDoki1103 Feb 20, 2024
ef1d1af
perf: delete net-rule code
DokiDoki1103 Feb 20, 2024
9a381b8
perf: reduce "/rainbond/backup_restore/" etcd key
DokiDoki1103 Feb 20, 2024
f888d12
perf: reduce "/event/dockerloginstacne" etcd key
DokiDoki1103 Feb 20, 2024
58fbc19
perf: reduce "rainbond/gateway/ips" etcd key
DokiDoki1103 Feb 20, 2024
e2e0d94
perf: reduce "/rainbond/shareresult/" etcd key
DokiDoki1103 Feb 20, 2024
c6d7d27
perf: auto clean database key
DokiDoki1103 Feb 20, 2024
1fb68f9
perf: delete instances api, reduce api etcd
DokiDoki1103 Feb 20, 2024
fc19b16
Merge branch 'V6.0' into etcd-api-6
DokiDoki1103 Feb 20, 2024
2545341
perf: add clean database key
DokiDoki1103 Feb 20, 2024
90e7408
perf: delete cloud route
DokiDoki1103 Feb 20, 2024
50e96c7
fix: pass ci
DokiDoki1103 Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions api/api/api_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,6 @@ type PluginInterface interface {

// RulesInterface RulesInterface
type RulesInterface interface {
SetDownStreamRule(w http.ResponseWriter, r *http.Request)
GetDownStreamRule(w http.ResponseWriter, r *http.Request)
DeleteDownStreamRule(w http.ResponseWriter, r *http.Request)
UpdateDownStreamRule(w http.ResponseWriter, r *http.Request)
}

// AppInterface app handle interface
Expand Down
36 changes: 0 additions & 36 deletions api/api_routers/cloud/cloudRouter.go
View file
Open in desktop

This file was deleted.

15 changes: 1 addition & 14 deletions api/api_routers/version2/v2Rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,19 @@ package version2

import (
"github.com/go-chi/chi"
"github.com/goodrain/rainbond/api/controller"
)

//PluginRouter plugin router
// PluginRouter plugin router
func (v2 *V2) rulesRouter() chi.Router {
r := chi.NewRouter()
// service rule
// url: v2/tenant/{tenant_name}/services/{service_alias}/net-rule/xxx
// -- --
//downstream
r.Mount("/downstream", v2.downstreamRouter())
//upstream
r.Mount("/upstream", v2.upstreamRouter())
return r
}

func (v2 *V2) downstreamRouter() chi.Router {
r := chi.NewRouter()
r.Post("/", controller.GetManager().SetDownStreamRule)
//r.Get("/")
r.Get("/{dest_service_alias}/{port}", controller.GetManager().GetDownStreamRule)
r.Put("/{dest_service_alias}/{port}", controller.GetManager().UpdateDownStreamRule)
//r.Delete("/{service_alias}/{port}")
return r
}

func (v2 *V2) upstreamRouter() chi.Router {
r := chi.NewRouter()
return r
Expand Down
4 changes: 2 additions & 2 deletions api/controller/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func (a *ApplicationController) DeleteApp(w http.ResponseWriter, r *http.Request
var req model.EtcdCleanReq
if httputil.ValidatorRequestStructAndErrorResponse(r, w, &req, nil) {
logrus.Debugf("delete app etcd keys : %+v", req.Keys)
handler.GetEtcdHandler().CleanAllServiceData(req.Keys)
handler.GetCleanDateBaseHandler().CleanAllServiceData(req.Keys)
}
// Delete application
err := handler.GetApplicationHandler().DeleteApp(r.Context(), app)
Expand Down Expand Up @@ -366,7 +366,7 @@ func (a *ApplicationController) DeleteGovernanceModeCR(w http.ResponseWriter, r
httputil.ReturnSuccess(r, w, nil)
}

//GetWatchOperatorManaged get watch operator managed component
// GetWatchOperatorManaged get watch operator managed component
func (a *ApplicationController) GetWatchOperatorManaged(w http.ResponseWriter, r *http.Request) {
app := r.Context().Value(ctxutil.ContextKey("application")).(*dbmodel.Application)
ret, err := handler.GetApplicationHandler().GetAndHandleOperatorManaged(app.AppID)
Expand Down
241 changes: 0 additions & 241 deletions api/controller/cloud.go
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions api/controller/k8s_attribute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package controller
import (
"fmt"
"github.com/goodrain/rainbond/api/handler"
api_model "github.com/goodrain/rainbond/api/model"
apimodel "github.com/goodrain/rainbond/api/model"
ctxutil "github.com/goodrain/rainbond/api/util/ctx"
dbmodel "github.com/goodrain/rainbond/db/model"
httputil "github.com/goodrain/rainbond/util/http"
Expand All @@ -47,7 +47,7 @@ func (k *K8sAttributeController) K8sAttributes(w http.ResponseWriter, r *http.Re

func (k *K8sAttributeController) getK8sAttributes(w http.ResponseWriter, r *http.Request) {
componentID := r.Context().Value(ctxutil.ContextKey("service_id")).(string)
var k8sAttrGet api_model.ComponentK8sAttributeGet
var k8sAttrGet apimodel.ComponentK8sAttributeGet
if ok := httputil.ValidatorRequestStructAndErrorResponse(r, w, &k8sAttrGet, nil); !ok {
httputil.ReturnBcodeError(r, w, fmt.Errorf("k8s attributes is not valid"))
return
Expand Down Expand Up @@ -80,7 +80,7 @@ func (k *K8sAttributeController) getK8sAttributes(w http.ResponseWriter, r *http
func (k *K8sAttributeController) createK8sAttributes(w http.ResponseWriter, r *http.Request) {
tenantID := r.Context().Value(ctxutil.ContextKey("tenant_id")).(string)
componentID := r.Context().Value(ctxutil.ContextKey("service_id")).(string)
var k8sAttr api_model.ComponentK8sAttribute
var k8sAttr apimodel.ComponentK8sAttribute
if ok := httputil.ValidatorRequestStructAndErrorResponse(r, w, &k8sAttr, nil); !ok {
httputil.ReturnBcodeError(r, w, fmt.Errorf("k8s attributes is not valid"))
return
Expand All @@ -94,7 +94,7 @@ func (k *K8sAttributeController) createK8sAttributes(w http.ResponseWriter, r *h

func (k *K8sAttributeController) updateK8sAttributes(w http.ResponseWriter, r *http.Request) {
componentID := r.Context().Value(ctxutil.ContextKey("service_id")).(string)
var k8sAttr api_model.ComponentK8sAttribute
var k8sAttr apimodel.ComponentK8sAttribute
if ok := httputil.ValidatorRequestStructAndErrorResponse(r, w, &k8sAttr, nil); !ok {
httputil.ReturnBcodeError(r, w, fmt.Errorf("k8s attributes is not valid"))
return
Expand All @@ -108,7 +108,7 @@ func (k *K8sAttributeController) updateK8sAttributes(w http.ResponseWriter, r *h

func (k *K8sAttributeController) deleteK8sAttributes(w http.ResponseWriter, r *http.Request) {
componentID := r.Context().Value(ctxutil.ContextKey("service_id")).(string)
var req api_model.DeleteK8sAttributeReq
var req apimodel.DeleteK8sAttributeReq
if ok := httputil.ValidatorRequestStructAndErrorResponse(r, w, &req, nil); !ok {
httputil.ReturnBcodeError(r, w, fmt.Errorf("k8s attributes is not valid"))
return
Expand Down
Loading
Loading