|
|
|
@@ -561,7 +561,7 @@ func (r *ServerManagerReconciler) BrowserPod(s *servermanagerv1alpha1.ServerMana
|
|
|
|
ImagePullPolicy: corev1.PullIfNotPresent,
|
|
|
|
ImagePullPolicy: corev1.PullIfNotPresent,
|
|
|
|
Ports: ports,
|
|
|
|
Ports: ports,
|
|
|
|
Command: []string{"/bin/sh"},
|
|
|
|
Command: []string{"/bin/sh"},
|
|
|
|
Args: []string{"-c", fmt.Sprintf("rm /tmp/database/filebrowser.db; /filebrowser config init -d /tmp/database/filebrowser.db && /filebrowser config set --auth.method=proxy --auth.header=%s -d /tmp/database/filebrowser.db", r.Config.Browser.AuthHeader)},
|
|
|
|
Args: []string{"-c", fmt.Sprintf("rm /tmp/database/filebrowser.db; filebrowser config init -d /tmp/database/filebrowser.db && filebrowser config set --auth.method=noauth --auth.header=%s --perm.admin=true -d /tmp/database/filebrowser.db", r.Config.Browser.AuthHeader)},
|
|
|
|
VolumeMounts: []corev1.VolumeMount{
|
|
|
|
VolumeMounts: []corev1.VolumeMount{
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Name: "browser-volume",
|
|
|
|
Name: "browser-volume",
|
|
|
|
@@ -576,7 +576,7 @@ func (r *ServerManagerReconciler) BrowserPod(s *servermanagerv1alpha1.ServerMana
|
|
|
|
Image: "filebrowser/filebrowser",
|
|
|
|
Image: "filebrowser/filebrowser",
|
|
|
|
ImagePullPolicy: corev1.PullIfNotPresent,
|
|
|
|
ImagePullPolicy: corev1.PullIfNotPresent,
|
|
|
|
Ports: ports,
|
|
|
|
Ports: ports,
|
|
|
|
Args: []string{"-d", "/tmp/database/filebrowser.db", "-r", "/tmp/data", "-b", r.GenerateBrowserSubPath(s)},
|
|
|
|
Args: []string{"--noauth", "-d", "/tmp/database/filebrowser.db", "-r", "/tmp/data", "-b", r.GenerateBrowserSubPath(s)},
|
|
|
|
VolumeMounts: []corev1.VolumeMount{
|
|
|
|
VolumeMounts: []corev1.VolumeMount{
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Name: "volume",
|
|
|
|
Name: "volume",
|
|
|
|
@@ -599,7 +599,7 @@ func (r *ServerManagerReconciler) BrowserPod(s *servermanagerv1alpha1.ServerMana
|
|
|
|
func (r *ServerManagerReconciler) ServerService(s *servermanagerv1alpha1.ServerManager) *corev1.Service {
|
|
|
|
func (r *ServerManagerReconciler) ServerService(s *servermanagerv1alpha1.ServerManager) *corev1.Service {
|
|
|
|
ports := make([]corev1.ServicePort, len(s.Spec.Server.Ports))
|
|
|
|
ports := make([]corev1.ServicePort, len(s.Spec.Server.Ports))
|
|
|
|
for i, port := range s.Spec.Server.Ports {
|
|
|
|
for i, port := range s.Spec.Server.Ports {
|
|
|
|
ports[i] = corev1.ServicePort{NodePort: 0, Port: port.Port, TargetPort: intstr.FromInt32(port.Port), Name: fmt.Sprintf("%s-%d", strings.ToLower(string(port.Protocol)), port.Port)}
|
|
|
|
ports[i] = corev1.ServicePort{NodePort: 0, Port: port.Port, TargetPort: intstr.FromInt32(port.Port), Name: fmt.Sprintf("%s-%d", strings.ToLower(string(port.Protocol)), port.Port), Protocol: port.Protocol}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
service := &corev1.Service{
|
|
|
|
service := &corev1.Service{
|
|
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
|
|
|