added kubernetes support
This commit is contained in:
@@ -18,15 +18,14 @@ type ImageData struct {
|
||||
}
|
||||
|
||||
func convertImageToImageData(instanceImage instancemanager.Image) *ImageData {
|
||||
imageId := instanceImage.Registry + ":" + instanceImage.Tag
|
||||
|
||||
return &ImageData{
|
||||
Id: imageId,
|
||||
Id: instanceImage.Id,
|
||||
Name: instanceImage.Registry,
|
||||
Version: instanceImage.Tag,
|
||||
DisplayName: fmt.Sprintf("%s %s", instanceImage.Registry, instanceImage.Tag),
|
||||
}
|
||||
}
|
||||
|
||||
func (con ServersApi) GetImages(ctx *gin.Context) {
|
||||
images, err := con.InstanceManager.ListImages(ctx)
|
||||
if err != nil {
|
||||
|
@@ -80,23 +80,25 @@ func (con ServersApi) CreateServer(ctx *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
instanceImage, err := con.InstanceManager.GetImage(ctx, request.ImageId)
|
||||
if err != nil {
|
||||
ctx.AbortWithError(500, err)
|
||||
return
|
||||
}
|
||||
|
||||
instanceServer, err := con.InstanceManager.CreateServer(ctx)
|
||||
if err != nil {
|
||||
ctx.AbortWithError(500, err)
|
||||
return
|
||||
}
|
||||
|
||||
imageSegments := strings.Split(request.ImageId, ":")
|
||||
|
||||
registry := imageSegments[0]
|
||||
tag := imageSegments[1]
|
||||
|
||||
err = con.ServersDbHandler.CreateServer(ctx, dbhandler.Server{
|
||||
Id: instanceServer.Id,
|
||||
Owner: serverClaims.Username,
|
||||
Image: &models.Image{
|
||||
Registry: registry,
|
||||
Tag: tag,
|
||||
Id: instanceImage.Id,
|
||||
Registry: instanceImage.Registry,
|
||||
Tag: instanceImage.Tag,
|
||||
},
|
||||
Nickname: request.Nickname,
|
||||
Command: request.DefaultCommand,
|
||||
@@ -191,6 +193,7 @@ func (con ServersApi) GetServers(ctx *gin.Context) {
|
||||
server := serverConfigsMap[instanceServer.Id]
|
||||
|
||||
var image ImageInfo
|
||||
log.Printf("server=%#v\t|\tinstanceServer=%#v", server, instanceServer)
|
||||
|
||||
if instanceServer.Running {
|
||||
image = ImageInfo{
|
||||
@@ -198,6 +201,8 @@ func (con ServersApi) GetServers(ctx *gin.Context) {
|
||||
Version: instanceServer.RunningImage.Tag,
|
||||
}
|
||||
} else {
|
||||
log.Printf("serverImage:%#v", server.Image)
|
||||
|
||||
image = ImageInfo{
|
||||
Name: server.Image.Registry,
|
||||
Version: server.Image.Tag,
|
||||
|
Reference in New Issue
Block a user