|
|
|
@@ -157,6 +157,11 @@ func (r *ServerManagerReconciler) Reconcile(ctx context.Context, req ctrl.Reques
|
|
|
|
|
logging.Error(err, "Failed to get image")
|
|
|
|
|
return reconcile.Result{}, err
|
|
|
|
|
}
|
|
|
|
|
if len(s.Spec.Server.Ports) == 0 {
|
|
|
|
|
s.Spec.Server.Ports = image.Spec.Ports
|
|
|
|
|
err := r.Update(ctx, s)
|
|
|
|
|
return reconcile.Result{}, err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
serverPod := r.ServerPod(s, pvc, image)
|
|
|
|
|
found := &corev1.Pod{}
|
|
|
|
@@ -392,7 +397,7 @@ func (r *ServerManagerReconciler) GenerateBrowserUrl(s *servermanagerv1alpha1.Se
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (r *ServerManagerReconciler) GenerateBrowserSubPath(s *servermanagerv1alpha1.ServerManager) string {
|
|
|
|
|
if r.Config.Browser.SubPath == "" {
|
|
|
|
|
if r.Config.Browser.SubPath != "" {
|
|
|
|
|
return fmt.Sprintf("%s/%s/%s", r.Config.Browser.SubPath, s.Namespace, s.Name)
|
|
|
|
|
} else {
|
|
|
|
|
return fmt.Sprintf("/%s/%s", s.Namespace, s.Name)
|
|
|
|
@@ -635,13 +640,10 @@ func (r *ServerManagerReconciler) ServerPvc(s *servermanagerv1alpha1.ServerManag
|
|
|
|
|
|
|
|
|
|
func (r *ServerManagerReconciler) ServerPod(s *servermanagerv1alpha1.ServerManager, pvc *corev1.PersistentVolumeClaim, image *servermanagerv1alpha1.Image) *corev1.Pod {
|
|
|
|
|
serverPorts := image.Spec.Ports
|
|
|
|
|
if len(s.Spec.Server.Ports) > 0 {
|
|
|
|
|
serverPorts = s.Spec.Server.Ports
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ports := make([]corev1.ContainerPort, len(serverPorts))
|
|
|
|
|
|
|
|
|
|
for i, port := range s.Spec.Server.Ports {
|
|
|
|
|
for i, port := range serverPorts {
|
|
|
|
|
ports[i] = corev1.ContainerPort{
|
|
|
|
|
ContainerPort: port.Port,
|
|
|
|
|
Protocol: port.Protocol,
|
|
|
|
|