Skip to content

Commit ec56004

Browse files
committed
feat(controller): starting to rewrite the controller to use BSD jails instead of Kubernetes
1 parent b465028 commit ec56004

34 files changed

Lines changed: 281 additions & 1421 deletions

apps/controller/api/handlers/instance/change_api_key.go

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/controller/api/handlers/instance/create.go

Lines changed: 0 additions & 27 deletions
This file was deleted.

apps/controller/api/handlers/instance/terminate.go

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package handlers
2+
3+
import (
4+
"controller/utils"
5+
"fmt"
6+
"net/http"
7+
8+
"github.com/gin-gonic/gin"
9+
)
10+
11+
type startReqBody struct {
12+
CustomerId string `json:"customerId" binding:"required"`
13+
}
14+
15+
func Start(c *gin.Context) {
16+
var body startReqBody
17+
if err := c.ShouldBindJSON(&body); err != nil {
18+
c.Status(http.StatusBadRequest)
19+
fmt.Println(err.Error())
20+
return
21+
}
22+
23+
jail, err := utils.JailFactory(body.CustomerId)
24+
if err != nil {
25+
fmt.Println(err.Error())
26+
c.Status(http.StatusInternalServerError)
27+
return
28+
}
29+
30+
if err := jail.Start(); err != nil {
31+
fmt.Println(err.Error())
32+
c.Status(http.StatusInternalServerError)
33+
return
34+
}
35+
36+
c.String(http.StatusOK, "Jail started.")
37+
}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package handlers
2+
3+
import (
4+
"controller/utils"
5+
"fmt"
6+
"net/http"
7+
8+
"github.com/gin-gonic/gin"
9+
)
10+
11+
type stopReqBody struct {
12+
CustomerId string `json:"customerId" binding:"required"`
13+
}
14+
15+
func Stop(c *gin.Context) {
16+
var body stopReqBody
17+
if err := c.ShouldBindJSON(&body); err != nil {
18+
c.Status(http.StatusBadRequest)
19+
fmt.Println(err.Error())
20+
return
21+
}
22+
23+
jail, err := utils.JailFactory(body.CustomerId)
24+
if err != nil {
25+
fmt.Println(err.Error())
26+
c.Status(http.StatusInternalServerError)
27+
return
28+
}
29+
30+
if err := jail.Stop(); err != nil {
31+
fmt.Println(err.Error())
32+
c.Status(http.StatusInternalServerError)
33+
return
34+
}
35+
36+
c.String(http.StatusOK, "Jail stopped.")
37+
}

apps/controller/api/setup.go

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
package api
22

33
import (
4-
"controller/api/handlers/instance"
5-
"fmt"
4+
"controller/api/handlers"
65

76
"github.com/gin-gonic/gin"
87
)
98

10-
func StartAPI(devMode bool) error {
11-
var port int = 8080
12-
if devMode {
13-
port = 1337
14-
}
15-
router := gin.Default()
9+
func SetupRouter() *gin.Engine {
10+
r := gin.Default()
11+
v1 := r.Group("/api/v1")
12+
v1.POST("/start", handlers.Start)
13+
v1.POST("/stop", handlers.Stop)
1614

17-
instanceEndpoints := router.Group("/instance")
18-
instanceEndpoints.POST("/create", instance.CreateInstance)
19-
instanceEndpoints.DELETE("/terminate", instance.TerminateInstance)
20-
21-
return router.Run(fmt.Sprintf("0.0.0.0:%d", port))
15+
return r
2216
}

apps/controller/api/types/instance.go

Lines changed: 0 additions & 10 deletions
This file was deleted.

apps/controller/go.mod

Lines changed: 24 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -1,165 +1,38 @@
11
module controller
22

3-
go 1.23
3+
go 1.25.0
44

5-
require (
6-
github.com/carlmjohnson/requests v0.24.2
7-
github.com/gin-gonic/gin v1.10.0
8-
helm.sh/helm/v3 v3.16.2
9-
k8s.io/apimachinery v0.31.2
10-
k8s.io/client-go v0.31.2
11-
)
5+
require github.com/gin-gonic/gin v1.12.0
126

137
require (
14-
dario.cat/mergo v1.0.1 // indirect
15-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
16-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
17-
github.com/BurntSushi/toml v1.3.2 // indirect
18-
github.com/MakeNowJust/heredoc v1.0.0 // indirect
19-
github.com/Masterminds/goutils v1.1.1 // indirect
20-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
21-
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
22-
github.com/Masterminds/squirrel v1.5.4 // indirect
23-
github.com/Microsoft/hcsshim v0.11.4 // indirect
24-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
25-
github.com/beorn7/perks v1.0.1 // indirect
26-
github.com/blang/semver/v4 v4.0.0 // indirect
27-
github.com/bytedance/sonic v1.12.3 // indirect
28-
github.com/bytedance/sonic/loader v0.2.1 // indirect
29-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
30-
github.com/chai2010/gettext-go v1.0.2 // indirect
31-
github.com/cloudwego/base64x v0.1.4 // indirect
32-
github.com/cloudwego/iasm v0.2.0 // indirect
33-
github.com/containerd/containerd v1.7.12 // indirect
34-
github.com/containerd/log v0.1.0 // indirect
35-
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
36-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
37-
github.com/distribution/reference v0.5.0 // indirect
38-
github.com/docker/cli v25.0.1+incompatible // indirect
39-
github.com/docker/distribution v2.8.3+incompatible // indirect
40-
github.com/docker/docker v25.0.6+incompatible // indirect
41-
github.com/docker/docker-credential-helpers v0.7.0 // indirect
42-
github.com/docker/go-connections v0.5.0 // indirect
43-
github.com/docker/go-metrics v0.0.1 // indirect
44-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
45-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
46-
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
47-
github.com/fatih/color v1.13.0 // indirect
48-
github.com/felixge/httpsnoop v1.0.4 // indirect
49-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
50-
github.com/gabriel-vasile/mimetype v1.4.6 // indirect
51-
github.com/gin-contrib/sse v0.1.0 // indirect
52-
github.com/go-errors/errors v1.4.2 // indirect
53-
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
54-
github.com/go-logr/logr v1.4.2 // indirect
55-
github.com/go-logr/stdr v1.2.2 // indirect
56-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
57-
github.com/go-openapi/jsonreference v0.20.2 // indirect
58-
github.com/go-openapi/swag v0.22.4 // indirect
8+
github.com/bytedance/gopkg v0.1.3 // indirect
9+
github.com/bytedance/sonic v1.15.0 // indirect
10+
github.com/bytedance/sonic/loader v0.5.0 // indirect
11+
github.com/cloudwego/base64x v0.1.6 // indirect
12+
github.com/gabriel-vasile/mimetype v1.4.12 // indirect
13+
github.com/gin-contrib/sse v1.1.0 // indirect
5914
github.com/go-playground/locales v0.14.1 // indirect
6015
github.com/go-playground/universal-translator v0.18.1 // indirect
61-
github.com/go-playground/validator/v10 v10.22.1 // indirect
62-
github.com/gobwas/glob v0.2.3 // indirect
63-
github.com/goccy/go-json v0.10.3 // indirect
64-
github.com/gogo/protobuf v1.3.2 // indirect
65-
github.com/golang/protobuf v1.5.4 // indirect
66-
github.com/google/btree v1.0.1 // indirect
67-
github.com/google/gnostic-models v0.6.8 // indirect
68-
github.com/google/go-cmp v0.6.0 // indirect
69-
github.com/google/gofuzz v1.2.0 // indirect
70-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
71-
github.com/google/uuid v1.6.0 // indirect
72-
github.com/gorilla/mux v1.8.0 // indirect
73-
github.com/gorilla/websocket v1.5.0 // indirect
74-
github.com/gosuri/uitable v0.0.4 // indirect
75-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
76-
github.com/hashicorp/errwrap v1.1.0 // indirect
77-
github.com/hashicorp/go-multierror v1.1.1 // indirect
78-
github.com/huandu/xstrings v1.5.0 // indirect
79-
github.com/imdario/mergo v0.3.16 // indirect
80-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
81-
github.com/jmoiron/sqlx v1.4.0 // indirect
82-
github.com/josharian/intern v1.0.0 // indirect
16+
github.com/go-playground/validator/v10 v10.30.1 // indirect
17+
github.com/goccy/go-json v0.10.5 // indirect
18+
github.com/goccy/go-yaml v1.19.2 // indirect
8319
github.com/json-iterator/go v1.1.12 // indirect
84-
github.com/klauspost/compress v1.16.0 // indirect
85-
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
86-
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
87-
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
20+
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
8821
github.com/leodido/go-urn v1.4.0 // indirect
89-
github.com/lib/pq v1.10.9 // indirect
90-
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
91-
github.com/mailru/easyjson v0.7.7 // indirect
92-
github.com/mattn/go-colorable v0.1.13 // indirect
9322
github.com/mattn/go-isatty v0.0.20 // indirect
94-
github.com/mattn/go-runewidth v0.0.9 // indirect
95-
github.com/mitchellh/copystructure v1.2.0 // indirect
96-
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
97-
github.com/mitchellh/reflectwalk v1.0.2 // indirect
98-
github.com/moby/locker v1.0.1 // indirect
99-
github.com/moby/spdystream v0.4.0 // indirect
100-
github.com/moby/term v0.5.0 // indirect
10123
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
10224
github.com/modern-go/reflect2 v1.0.2 // indirect
103-
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
104-
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
105-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
106-
github.com/opencontainers/go-digest v1.0.0 // indirect
107-
github.com/opencontainers/image-spec v1.1.0 // indirect
108-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
109-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
110-
github.com/pkg/errors v0.9.1 // indirect
111-
github.com/prometheus/client_golang v1.19.1 // indirect
112-
github.com/prometheus/client_model v0.6.1 // indirect
113-
github.com/prometheus/common v0.55.0 // indirect
114-
github.com/prometheus/procfs v0.15.1 // indirect
115-
github.com/rubenv/sql-migrate v1.7.0 // indirect
116-
github.com/russross/blackfriday/v2 v2.1.0 // indirect
117-
github.com/shopspring/decimal v1.4.0 // indirect
118-
github.com/sirupsen/logrus v1.9.3 // indirect
119-
github.com/spf13/cast v1.7.0 // indirect
120-
github.com/spf13/cobra v1.8.1 // indirect
121-
github.com/spf13/pflag v1.0.5 // indirect
25+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
26+
github.com/pierrec/lz4/v4 v4.1.26 // indirect
27+
github.com/quic-go/qpack v0.6.0 // indirect
28+
github.com/quic-go/quic-go v0.59.0 // indirect
12229
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
123-
github.com/ugorji/go/codec v1.2.12 // indirect
124-
github.com/x448/float16 v0.8.4 // indirect
125-
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
126-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
127-
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
128-
github.com/xlab/treeprint v1.2.0 // indirect
129-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
130-
go.opentelemetry.io/otel v1.28.0 // indirect
131-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
132-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
133-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
134-
golang.org/x/arch v0.11.0 // indirect
135-
golang.org/x/crypto v0.28.0 // indirect
136-
golang.org/x/net v0.30.0 // indirect
137-
golang.org/x/oauth2 v0.21.0 // indirect
138-
golang.org/x/sync v0.8.0 // indirect
139-
golang.org/x/sys v0.26.0 // indirect
140-
golang.org/x/term v0.25.0 // indirect
141-
golang.org/x/text v0.19.0 // indirect
142-
golang.org/x/time v0.3.0 // indirect
143-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
144-
google.golang.org/grpc v1.65.0 // indirect
145-
google.golang.org/protobuf v1.35.1 // indirect
146-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
147-
gopkg.in/inf.v0 v0.9.1 // indirect
148-
gopkg.in/yaml.v2 v2.4.0 // indirect
149-
gopkg.in/yaml.v3 v3.0.1 // indirect
150-
k8s.io/api v0.31.2 // indirect
151-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
152-
k8s.io/apiserver v0.31.1 // indirect
153-
k8s.io/cli-runtime v0.31.1 // indirect
154-
k8s.io/component-base v0.31.1 // indirect
155-
k8s.io/klog/v2 v2.130.1 // indirect
156-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
157-
k8s.io/kubectl v0.31.1 // indirect
158-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
159-
oras.land/oras-go v1.2.5 // indirect
160-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
161-
sigs.k8s.io/kustomize/api v0.17.2 // indirect
162-
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
163-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
164-
sigs.k8s.io/yaml v1.4.0 // indirect
30+
github.com/ugorji/go/codec v1.3.1 // indirect
31+
go.mongodb.org/mongo-driver/v2 v2.5.0 // indirect
32+
golang.org/x/arch v0.22.0 // indirect
33+
golang.org/x/crypto v0.48.0 // indirect
34+
golang.org/x/net v0.51.0 // indirect
35+
golang.org/x/sys v0.41.0 // indirect
36+
golang.org/x/text v0.34.0 // indirect
37+
google.golang.org/protobuf v1.36.10 // indirect
16538
)

0 commit comments

Comments
 (0)