Skip to content

Commit ff0baf4

Browse files
controller/registry: don't set memory limits for target (#3015)
It's not allowed for core components to have memory limits, to ensure that that source of crash-looping pods does not occur to the core payload. Signed-off-by: Steve Kuznetsov <[email protected]>
1 parent a827c02 commit ff0baf4

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

Diff for: pkg/controller/registry/reconciler/reconciler.go

-3
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,6 @@ func Pod(source *operatorsv1alpha1.CatalogSource, name string, img string, saNam
227227
if pod.Spec.Containers[0].Resources.Limits == nil {
228228
pod.Spec.Containers[0].Resources.Limits = map[corev1.ResourceName]resource.Quantity{}
229229
}
230-
double := *grpcPodConfig.MemoryTarget
231-
double.Add(double.DeepCopy())
232-
pod.Spec.Containers[0].Resources.Limits[corev1.ResourceMemory] = double
233230

234231
grpcPodConfig.MemoryTarget.Format = resource.BinarySI
235232
pod.Spec.Containers[0].Env = append(pod.Spec.Containers[0].Env, corev1.EnvVar{

Diff for: pkg/controller/registry/reconciler/reconciler_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func TestPodMemoryTarget(t *testing.T) {
107107
ObjectMeta: metav1.ObjectMeta{
108108
GenerateName: "test-",
109109
Namespace: "testns",
110-
Labels: map[string]string{"olm.pod-spec-hash": "855b6c6cf6"},
110+
Labels: map[string]string{"olm.pod-spec-hash": "5c6bb6945f"},
111111
Annotations: map[string]string{"cluster-autoscaler.kubernetes.io/safe-to-evict": "true"},
112112
},
113113
Spec: corev1.PodSpec{
@@ -150,9 +150,7 @@ func TestPodMemoryTarget(t *testing.T) {
150150
corev1.ResourceCPU: resource.MustParse("10m"),
151151
corev1.ResourceMemory: resource.MustParse("5Mi"),
152152
},
153-
Limits: corev1.ResourceList{
154-
corev1.ResourceMemory: resource.MustParse("10Mi"),
155-
},
153+
Limits: corev1.ResourceList{},
156154
},
157155
SecurityContext: &corev1.SecurityContext{
158156
ReadOnlyRootFilesystem: pointer.Bool(false),

0 commit comments

Comments
 (0)