Migrations/neko-rooms
1
0
Fork 0
mirror of https://github.com/m1k1o/neko-rooms.git synced 2026-11-02 22:51:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

move labels to custom file. (#24)

Browse Source
This commit is contained in:
Miroslav Šedivý
2021-07-27 19:42:50 +02:00
committed by GitHub
parent b05fe9ee39
commit 2f2e28074b
4 changed files with 131 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/room/containers.go
+5 -22
View File
@@ -13,34 +13,17 @@ import (
)
func (manager *RoomManagerCtx) containerToEntry(container dockerTypes.Container) (*types.RoomEntry, error) {
roomName, ok := container.Labels["m1k1o.neko_rooms.name"]
if !ok {
return nil, fmt.Errorf("damaged container labels: name not found")
}
nekoImage, ok := container.Labels["m1k1o.neko_rooms.neko_image"]
if !ok {
// Backward compatibility.
nekoImage = container.Image
//return nil, fmt.Errorf("Damaged container labels: neko_image not found.")
}
URL, ok := container.Labels["m1k1o.neko_rooms.url"]
if !ok {
return nil, fmt.Errorf("damaged container labels: url not found")
}
epr, err := manager.getEprFromLabels(container.Labels)
labels, err := manager.extractLabels(container.Labels)
if err != nil {
return nil, err
}
return &types.RoomEntry{
ID: container.ID,
URL: URL,
Name: roomName,
NekoImage: nekoImage,
MaxConnections: epr.Max - epr.Min + 1,
URL: labels.URL,
Name: labels.Name,
NekoImage: labels.NekoImage,
MaxConnections: labels.Epr.Max - labels.Epr.Min + 1,
Running: container.State == "running",
Status: container.Status,
Created: time.Unix(container.Created, 0),
internal/room/labels.go
+71
View File
@@ -0,0 +1,71 @@
package room
import (
"fmt"
"strconv"
)
type RoomLabels struct {
Name string
URL string
Epr EprPorts
NekoImage string
}
func (manager *RoomManagerCtx) extractLabels(labels map[string]string) (*RoomLabels, error) {
name, ok := labels["m1k1o.neko_rooms.name"]
if !ok {
return nil, fmt.Errorf("damaged container labels: name not found")
}
url, ok := labels["m1k1o.neko_rooms.url"]
if !ok {
return nil, fmt.Errorf("damaged container labels: url not found")
}
nekoImage, ok := labels["m1k1o.neko_rooms.neko_image"]
if !ok {
return nil, fmt.Errorf("damaged container labels: neko_image not found")
}
eprMinStr, ok := labels["m1k1o.neko_rooms.epr.min"]
if !ok {
return nil, fmt.Errorf("damaged container labels: epr.min not found")
}
eprMin, err := strconv.ParseUint(eprMinStr, 10, 16)
if err != nil {
return nil, err
}
eprMaxStr, ok := labels["m1k1o.neko_rooms.epr.max"]
if !ok {
return nil, fmt.Errorf("damaged container labels: epr.max not found")
}
eprMax, err := strconv.ParseUint(eprMaxStr, 10, 16)
if err != nil {
return nil, err
}
return &RoomLabels{
Name: name,
URL: url,
NekoImage: nekoImage,
Epr: EprPorts{
Min: uint16(eprMin),
Max: uint16(eprMax),
},
}, nil
}
func (manager *RoomManagerCtx) serializeLabels(labels RoomLabels) map[string]string {
return map[string]string{
"m1k1o.neko_rooms.name": labels.Name,
"m1k1o.neko_rooms.url": labels.URL,
"m1k1o.neko_rooms.instance": manager.config.InstanceName,
"m1k1o.neko_rooms.epr.min": fmt.Sprintf("%d", labels.Epr.Min),
"m1k1o.neko_rooms.epr.max": fmt.Sprintf("%d", labels.Epr.Max),
"m1k1o.neko_rooms.neko_image": labels.NekoImage,
}
}
internal/room/manager.go
+53 -37
View File
@@ -114,6 +114,10 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
}
}
//
// Allocate ports
//
epr, err := manager.allocatePorts(settings.MaxConnections)
if err != nil {
return "", err
@@ -137,8 +141,33 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
exposedPorts[portKey] = struct{}{}
}
//
// Set traefik labels
//
containerName := manager.config.InstanceName + "-" + roomName
traefikLabels := map[string]string{
"traefik.enable": "true",
"traefik.http.services." + containerName + "-frontend.loadbalancer.server.port": fmt.Sprintf("%d", frontendPort),
"traefik.http.routers." + containerName + ".entrypoints": manager.config.TraefikEntrypoint,
"traefik.http.routers." + containerName + ".rule": "Host(`" + manager.config.TraefikDomain + "`) && PathPrefix(`/" + roomName + "`)",
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.regex": "/" + roomName + "$$",
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.replacement": "/" + roomName + "/",
"traefik.http.middlewares." + containerName + "-prf.stripprefix.prefixes": "/" + roomName + "/",
"traefik.http.routers." + containerName + ".middlewares": containerName + "-rdr," + containerName + "-prf",
}
// optional HTTPS
if manager.config.TraefikCertresolver != "" {
traefikLabels["traefik.http.routers."+containerName+".tls"] = "true"
traefikLabels["traefik.http.routers."+containerName+".tls.certresolver"] = manager.config.TraefikCertresolver
}
//
// Set internal labels
//
instanceUrl := manager.config.InstanceUrl
if instanceUrl == "" {
urlProto := "http"
@@ -157,31 +186,20 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
instanceUrl = instanceUrl + "/"
}
labels := map[string]string{
// Set internal labels
"m1k1o.neko_rooms.name": roomName,
"m1k1o.neko_rooms.url": instanceUrl + roomName + "/",
"m1k1o.neko_rooms.instance": manager.config.InstanceName,
"m1k1o.neko_rooms.epr.min": fmt.Sprintf("%d", epr.Min),
"m1k1o.neko_rooms.epr.max": fmt.Sprintf("%d", epr.Max),
"m1k1o.neko_rooms.neko_image": settings.NekoImage,
labels := manager.serializeLabels(RoomLabels{
Name: roomName,
URL: instanceUrl + roomName + "/",
Epr: epr,
NekoImage: settings.NekoImage,
})
// Set traefik labels
"traefik.enable": "true",
"traefik.http.services." + containerName + "-frontend.loadbalancer.server.port": fmt.Sprintf("%d", frontendPort),
"traefik.http.routers." + containerName + ".entrypoints": manager.config.TraefikEntrypoint,
"traefik.http.routers." + containerName + ".rule": "Host(`" + manager.config.TraefikDomain + "`) && PathPrefix(`/" + roomName + "`)",
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.regex": "/" + roomName + "$$",
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.replacement": "/" + roomName + "/",
"traefik.http.middlewares." + containerName + "-prf.stripprefix.prefixes": "/" + roomName + "/",
"traefik.http.routers." + containerName + ".middlewares": containerName + "-rdr," + containerName + "-prf",
for k, v := range traefikLabels {
labels[k] = v
}
// optional HTTPS
if manager.config.TraefikCertresolver != "" {
labels["traefik.http.routers."+containerName+".tls"] = "true"
labels["traefik.http.routers."+containerName+".tls.certresolver"] = manager.config.TraefikCertresolver
}
//
// Set environment variables
//
env := []string{
fmt.Sprintf("NEKO_BIND=:%d", frontendPort),
@@ -194,6 +212,10 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
env = append(env, fmt.Sprintf("NEKO_NAT1TO1=%s", strings.Join(manager.config.NAT1To1IPs, ",")))
}
//
// Set container mounts
//
mounts := []dockerMount.Mount{}
for _, mount := range settings.Mounts {
readOnly := false
@@ -260,6 +282,10 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
)
}
//
// Set container configs
//
config := &container.Config{
// Hostname
Hostname: containerName,
@@ -358,22 +384,12 @@ func (manager *RoomManagerCtx) GetSettings(id string) (*types.RoomSettings, erro
return nil, err
}
roomName, ok := container.Config.Labels["m1k1o.neko_rooms.name"]
if !ok {
return nil, fmt.Errorf("damaged container labels: name not found")
}
nekoImage, ok := container.Config.Labels["m1k1o.neko_rooms.neko_image"]
if !ok {
return nil, fmt.Errorf("damaged container labels: neko_image not found")
}
epr, err := manager.getEprFromLabels(container.Config.Labels)
labels, err := manager.extractLabels(container.Config.Labels)
if err != nil {
return nil, err
}
privateStorageRoot := path.Join(manager.config.StorageExternal, privateStoragePath, roomName)
privateStorageRoot := path.Join(manager.config.StorageExternal, privateStoragePath, labels.Name)
templateStorageRoot := path.Join(manager.config.StorageExternal, templateStoragePath)
mounts := []types.RoomMount{}
@@ -397,9 +413,9 @@ func (manager *RoomManagerCtx) GetSettings(id string) (*types.RoomSettings, erro
}
settings := types.RoomSettings{
Name: roomName,
NekoImage: nekoImage,
MaxConnections: epr.Max - epr.Min + 1,
Name: labels.Name,
NekoImage: labels.NekoImage,
MaxConnections: labels.Epr.Max - labels.Epr.Min + 1,
Mounts: mounts,
}
internal/room/ports.go
+2 -32
View File
@@ -3,7 +3,6 @@ package room
import (
"fmt"
"sort"
"strconv"
)
type EprPorts struct {
@@ -51,12 +50,12 @@ func (manager *RoomManagerCtx) getUsedPorts() ([]EprPorts, error) {
result := []EprPorts{}
for _, container := range containers {
epr, err := manager.getEprFromLabels(container.Labels)
labels, err := manager.extractLabels(container.Labels)
if err != nil {
return nil, err
}
result = append(result, epr)
result = append(result, labels.Epr)
}
sort.SliceStable(result, func(i, j int) bool {
@@ -65,32 +64,3 @@ func (manager *RoomManagerCtx) getUsedPorts() ([]EprPorts, error) {
return result, nil
}
func (manager *RoomManagerCtx) getEprFromLabels(labels map[string]string) (EprPorts, error) {
var err error
epr := EprPorts{}
eprMinStr, ok := labels["m1k1o.neko_rooms.epr.min"]
if !ok {
return epr, fmt.Errorf("damaged container labels: epr.min not found")
}
eprMin, err := strconv.ParseUint(eprMinStr, 10, 16)
if err != nil {
return epr, err
}
eprMaxStr, ok := labels["m1k1o.neko_rooms.epr.max"]
if !ok {
return epr, fmt.Errorf("damaged container labels: epr.max not found")
}
eprMax, err := strconv.ParseUint(eprMaxStr, 10, 16)
if err != nil {
return epr, err
}
epr.Min = uint16(eprMin)
epr.Max = uint16(eprMax)
return epr, nil
}