Fix panic

kyma-project · Dec 13, 2024 · 93bd559 · 93bd559
1 parent 71a3b88
commit 93bd559
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/api/v1alpha2/istio_merge.go b/api/v1alpha2/istio_merge.go
@@ -259,13 +259,13 @@ func (i *Istio) mergeResources(op iopv1alpha1.IstioOperator) (iopv1alpha1.IstioO
 	}
 
 	if i.Spec.Components.Proxy != nil && i.Spec.Components.Proxy.K8S != nil && i.Spec.Components.Proxy.K8S.Resources != nil {
-		if i.Spec.Components.Proxy.K8S.Resources.Limits != nil {
+		if i.Spec.Components.Proxy.K8S.Resources.Limits.Cpu != nil {
 			err = valuesMap.SetPath("global.proxy.resources.limits.cpu", *i.Spec.Components.Proxy.K8S.Resources.Limits.Cpu)
 			if err != nil {
 				return iopv1alpha1.IstioOperator{}, err
 			}
 		}
-		if i.Spec.Components.Proxy.K8S.Resources.Limits != nil {
+		if i.Spec.Components.Proxy.K8S.Resources.Limits.Memory != nil {
 			err = valuesMap.SetPath("global.proxy.resources.limits.memory", *i.Spec.Components.Proxy.K8S.Resources.Limits.Memory)
 			if err != nil {
 				return iopv1alpha1.IstioOperator{}, err