Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
8f005effa3 | |||
7776d546e9 |
@@ -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,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 {
|
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))
|
||||||
|
|
||||||
for i, port := range s.Spec.Server.Ports {
|
for i, port := range serverPorts {
|
||||||
ports[i] = corev1.ContainerPort{
|
ports[i] = corev1.ContainerPort{
|
||||||
ContainerPort: port.Port,
|
ContainerPort: port.Port,
|
||||||
Protocol: port.Protocol,
|
Protocol: port.Protocol,
|
||||||
|
Reference in New Issue
Block a user