added kubernetes support
This commit is contained in:
@@ -98,6 +98,7 @@ func convertImageInspectToInstanceImage(image image.InspectResponse) instanceman
|
||||
fmt.Printf("image: %#v\nconfig: %#v\nports: %#v\n", image, image.Config, ports)
|
||||
|
||||
return instancemanager.Image{
|
||||
Id: image.RepoTags[0],
|
||||
Registry: modelsImage.Registry,
|
||||
Tag: modelsImage.Tag,
|
||||
Command: strings.Join(image.Config.Cmd, " "),
|
||||
@@ -115,7 +116,6 @@ func convertContainerLabelsToStruct(labels map[string]string) (*ContainerLabels,
|
||||
}
|
||||
|
||||
err = json.Unmarshal(rawLabels, &containerLabels)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -132,7 +132,6 @@ func convertVolumeLabelsToStruct(labels map[string]string) (*VolumeLabels, error
|
||||
}
|
||||
|
||||
err = json.Unmarshal(rawLabels, &volumeLabels)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -149,7 +148,6 @@ func convertImageLabelsToStruct(labels map[string]string) (*ImageLabels, error)
|
||||
}
|
||||
|
||||
err = json.Unmarshal(rawLabels, &imageLabels)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@@ -119,11 +119,22 @@ func (i *InstanceManager) ListServers(ctx context.Context) ([]instancemanager.Se
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
ports := make([]models.Port, len(serverManager.Status.Server.HostPorts))
|
||||
|
||||
for i, port := range serverManager.Status.Server.HostPorts {
|
||||
ports[i] = models.Port{
|
||||
Protocol: models.PortProtocol(port.Protocol),
|
||||
PublicPort: uint16(port.HostPort),
|
||||
ContainerPort: uint16(port.TargetPort),
|
||||
}
|
||||
}
|
||||
|
||||
servers[index] = instancemanager.Server{
|
||||
Id: serverManager.Name,
|
||||
Running: serverManager.Spec.Server.On,
|
||||
RunningCommand: strings.Join(serverManager.Status.Server.Args, " "),
|
||||
Ports: ports,
|
||||
Domain: serverManager.Status.Server.Domain,
|
||||
RunningImage: &models.Image{
|
||||
Registry: image.Registry,
|
||||
Tag: image.Tag,
|
||||
@@ -308,6 +319,8 @@ func (i *InstanceManager) StartFileBrowser(ctx context.Context, serverId string)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
serverManager.Spec.Browser.On = true
|
||||
|
||||
err = i.client.Update(ctx, serverManager)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -333,6 +346,8 @@ func (i *InstanceManager) StopFileBrowser(ctx context.Context, serverId string)
|
||||
return err
|
||||
}
|
||||
|
||||
serverManager.Spec.Browser.On = false
|
||||
|
||||
err = i.client.Update(ctx, serverManager)
|
||||
if err != nil {
|
||||
return err
|
||||
|
Reference in New Issue
Block a user