server-manager/kubernetes-operator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug where server ports is nil
Some checks failed
Build and Push Docker Image / Build image (push) Has been cancelled
Details

Browse Source
This commit is contained in:
ACoolName 2025-04-07 13:45:53 +03:00
parent 7776d546e9
commit 8f005effa3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/controller/servermanager_controller.go
View File

@ -157,6 +157,11 @@ func (r *ServerManagerReconciler) Reconcile(ctx context.Context, req ctrl.Reques
logging.Error(err, "Failed to get image") logging.Error(err, "Failed to get image")
return reconcile.Result{}, err 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) serverPod := r.ServerPod(s, pvc, image)
found := &corev1.Pod{} found := &corev1.Pod{}
@ -635,9 +640,6 @@ func (r *ServerManagerReconciler) ServerPvc(s *servermanagerv1alpha1.ServerManag
func (r *ServerManagerReconciler) ServerPod(s *servermanagerv1alpha1.ServerManager, pvc *corev1.PersistentVolumeClaim, image *servermanagerv1alpha1.Image) *corev1.Pod { func (r *ServerManagerReconciler) ServerPod(s *servermanagerv1alpha1.ServerManager, pvc *corev1.PersistentVolumeClaim, image *servermanagerv1alpha1.Image) *corev1.Pod {
serverPorts := image.Spec.Ports serverPorts := image.Spec.Ports
if len(s.Spec.Server.Ports) > 0 {
serverPorts = s.Spec.Server.Ports
}
ports := make([]corev1.ContainerPort, len(serverPorts)) ports := make([]corev1.ContainerPort, len(serverPorts))