Skip to content

Bump default memory limit for controller manager to 512Mi #1447

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

Closed
stuggi wants to merge 1 commit into from
Closed

Bump default memory limit for controller manager to 512Mi #1447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion bindata/operator/managers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{{ $leaseDuration := .LeaseDuration }}
{{ $renewDeadline := .RenewDeadline }}
{{ $retryPeriod := .RetryPeriod }}
{{ $managerMemoryLimit := .ManagerMemoryLimit }}
{{ range $operatorName, $operatorImage := .OperatorImages }}
apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -62,7 +63,7 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: '{{ $managerMemoryLimit }}'
requests:
cpu: 10m
memory: 128Mi

@dprince dprince May 21, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stuggi also, I think you would want to bump 'requests' too right?

Expand Down
2 changes: 1 addition & 1 deletion bindata/operator/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: '{{ .ManagerMemoryLimit }}'
requests:
cpu: 10m
memory: 128Mi
Expand Down
2 changes: 1 addition & 1 deletion bindata/operator/rabbit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
resources:
limits:
cpu: 200m
memory: 500Mi
memory: '{{ .ManagerMemoryLimit }}'
requests:
cpu: 5m
memory: 64Mi
Expand Down
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: '{{ .ManagerMemoryLimit }}'
requests:
cpu: 10m
memory: 128Mi
Expand Down
2 changes: 2 additions & 0 deletions config/operator/deployment/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ spec:
value: 20
- name: RETRY_PERIOD
value: 5
- name: MANAGER_MEMORY_LIMIT
value: 512Mi
image: controller:latest
name: operator
securityContext:
Expand Down
3 changes: 2 additions & 1 deletion config/operator/managers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{{ $leaseDuration := .LeaseDuration }}
{{ $renewDeadline := .RenewDeadline }}
{{ $retryPeriod := .RetryPeriod }}
{{ $managerMemoryLimit := .ManagerMemoryLimit }}
{{ range $operatorName, $operatorImage := .OperatorImages }}
apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -62,7 +63,7 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: '{{ $managerMemoryLimit }}'
requests:
cpu: 10m
memory: 128Mi
Expand Down
2 changes: 1 addition & 1 deletion config/operator/rabbit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
resources:
limits:
cpu: 200m
memory: 500Mi
memory: '{{ .ManagerMemoryLimit }}'
requests:
cpu: 5m
memory: 64Mi
Expand Down
5 changes: 4 additions & 1 deletion controllers/operator/openstack_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ var (
leaseDuration string
renewDeadline string
retryPeriod string
managerMemoryLimit string
)

// SetupEnv -
Expand Down Expand Up @@ -109,8 +110,9 @@ func SetupEnv() {
renewDeadline = envArr[1]
} else if envArr[0] == "RETRY_PERIOD" {
retryPeriod = envArr[1]
} else if envArr[0] == "MANAGER_MEMORY_LIMIT" {
managerMemoryLimit = envArr[1]
}

}
}

Expand Down Expand Up @@ -467,6 +469,7 @@ func (r *OpenStackReconciler) applyOperator(ctx context.Context, instance *opera
data.Data["LeaseDuration"] = leaseDuration
data.Data["RenewDeadline"] = renewDeadline
data.Data["RetryPeriod"] = retryPeriod
data.Data["ManagerMemoryLimit"] = managerMemoryLimit
data.Data["OpenStackServiceRelatedImages"] = envRelatedOpenStackServiceImages
return r.renderAndApply(ctx, instance, data, "operator", true)
}
Expand Down