3 Commits

Author SHA1 Message Date
a54c905cc7 updated deployment to latest version
Some checks failed
Build and Push Docker Image / Build image (push) Has been cancelled
2025-04-07 13:48:24 +03:00
8f005effa3 fixed bug where server ports is nil
Some checks failed
Build and Push Docker Image / Build image (push) Has been cancelled
2025-04-07 13:45:53 +03:00
7776d546e9 fixed bug where server ports is nil
All checks were successful
Build and Push Docker Image / Build image (push) Successful in 1m45s
2025-04-07 13:36:07 +03:00
2 changed files with 7 additions and 5 deletions

View File

@@ -65,7 +65,7 @@ spec:
containers:
- command:
- /manager
image: git.acooldomain.co/server-manager/kubernetes-operator:v0.0.3
image: git.acooldomain.co/server-manager/kubernetes-operator:v0.0.5
env:
- name: CONFIG_PATH
value: /etc/server-manager/config.yaml

View File

@@ -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{}
@@ -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,