Skip to content

feat/FPM-configuration-based-on-resources-calculation #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Patrick Derks (TrayserCassa) merged 5 commits into from
May 12, 2026
Merged

feat/FPM-configuration-based-on-resources-calculation #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08f5910
feat/FPM-configuration-based-on-resources-calculation
ViewlessNote Apr 16, 2026
9b701d2
feat: distinguish betwen env's
ViewlessNote Apr 21, 2026
52cb202
fix: type Component
ViewlessNote Apr 21, 2026
8f3f7a6
fix: code review changes
ViewlessNote Apr 23, 2026
51423a5
feat: check if memory is 0 befor calculating
ViewlessNote Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ type RedisSpec struct {
}

type FPMSpec struct {
// +kubebuilder:validation:Enum=static;dynamic;ondemand
// +kubebuilder:validation:Enum=static;dynamic;ondemand;operator
// +kubebuilder:default=static
ProcessManagement string `json:"processManagement"`

Expand Down
2 changes: 1 addition & 1 deletion api/v1/store_env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func (s *Store) getSessionCache() []corev1.EnvVar {
}

func (f *FPMSpec) getFPMConfiguration() []corev1.EnvVar {
if f.ProcessManagement != "dynamic" {
if f.ProcessManagement != "dynamic" && f.ProcessManagement != "operator" {
return []corev1.EnvVar{
{
Name: "FPM_PM",
Expand Down
10 changes: 9 additions & 1 deletion internal/deployment/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,16 @@ func AdminDeployment(store v1.Store) *appsv1.Deployment {

annotations := util.GetDefaultContainerAnnotations(appName, store, store.Spec.AdminDeploymentContainer.Annotations)

// Merge containerSpec.ExtraEnvs to override with merged values from AdminDeploymentContainer
envs := util.MergeEnv(store.GetEnv(), containerSpec.ExtraEnvs)
if store.Spec.FPM.ProcessManagement == "operator" {
if containerSpec.Resources.Limits.Memory() != nil && containerSpec.Resources.Limits.Memory().Value() != 0 {
phpEnvs := GetCalculatedPHPFPMValues(int(containerSpec.Resources.Limits.Memory().Value() / (1024 * 1024)))
envs = util.MergeEnv(envs, phpEnvs)
} else {
phpEnvs := GetCalculatedPHPFPMValues(2048)
envs = util.MergeEnv(envs, phpEnvs)
}
}

containers := append(containerSpec.ExtraContainers, corev1.Container{
LivenessProbe: &corev1.Probe{
Expand Down
11 changes: 10 additions & 1 deletion internal/deployment/storefront.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,17 @@ func StorefrontDeployment(store v1.Store) *appsv1.Deployment {

annotations := util.GetDefaultContainerAnnotations(appName, store, store.Spec.StorefrontDeploymentContainer.Annotations)

// Merge containerSpec.ExtraEnvs to override with merged values from StorefrontDeploymentContainer
envs := util.MergeEnv(store.GetEnv(), containerSpec.ExtraEnvs)
if store.Spec.FPM.ProcessManagement == "operator" {
if containerSpec.Resources.Limits.Memory() != nil && containerSpec.Resources.Limits.Memory().Value() != 0 {
phpEnvs := GetCalculatedPHPFPMValues(int(containerSpec.Resources.Limits.Memory().Value() / (1024 * 1024)))
envs = util.MergeEnv(envs, phpEnvs)
} else {
phpEnvs := GetCalculatedPHPFPMValues(2048)
envs = util.MergeEnv(envs, phpEnvs)
fmt.Println("envs: ", phpEnvs)
}
}

containers := append(containerSpec.ExtraContainers, corev1.Container{
Name: DEPLOYMENT_STOREFRONT_CONTAINER_NAME,
Expand Down
39 changes: 39 additions & 0 deletions internal/deployment/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,23 @@ package deployment
import (
"context"
"fmt"
"math"

v1 "github.com/shopware/shopware-operator/api/v1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
)

const (
startServersRatio = 0.25
minSpareServersRatio = 0.2
maxSpareServersRatio = 0.375
memoryPerChildMiB = 80 //Every PHP-FPM process in an empty shop uses 70.6MiB
)

func getDeploymentCondition(
deployment *appsv1.Deployment,
storeReplicas int32,
Expand Down Expand Up @@ -92,3 +101,33 @@ func GetStoreDeploymentImage(
}
return "", fmt.Errorf("could not find storefront deployment container")
}

func GetCalculatedPHPFPMValues(memoryLimitMiB int) []corev1.EnvVar {
maxChildren := int(math.Round(float64(memoryLimitMiB / memoryPerChildMiB)))
startServers := int(math.Round(float64(maxChildren) * startServersRatio))
minSpare := int(math.Round(float64(maxChildren) * minSpareServersRatio))
maxSpare := int(math.Round(float64(maxChildren)*maxSpareServersRatio) + 1)

return []corev1.EnvVar{
{
Name: "FPM_PM",
Value: "dynamic",
},
{
Name: "FPM_PM_MAX_CHILDREN",
Value: fmt.Sprintf("%d", maxChildren),
},
{
Name: "FPM_PM_START_SERVERS",
Value: fmt.Sprintf("%d", startServers),
},
{
Name: "FPM_PM_MIN_SPARE_SERVERS",
Value: fmt.Sprintf("%d", minSpare),
},
{
Name: "FPM_PM_MAX_SPARE_SERVERS",
Value: fmt.Sprintf("%d", maxSpare),
},
}
}
Loading