Fix panic

kyma-project · Dec 13, 2024 · c526d0e · c526d0e
1 parent 71a3b88
commit c526d0e
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/api/v1alpha2/istio_merge.go b/api/v1alpha2/istio_merge.go
@@ -260,34 +260,37 @@ 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 {
-			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 {
-			err = valuesMap.SetPath("global.proxy.resources.limits.memory", *i.Spec.Components.Proxy.K8S.Resources.Limits.Memory)
-			if err != nil {
-				return iopv1alpha1.IstioOperator{}, err
-			}
-		}
-
-		if i.Spec.Components.Proxy.K8S.Resources.Requests != nil {
-			if i.Spec.Components.Proxy.K8S.Resources.Requests.Cpu != nil {
-				err = valuesMap.SetPath("global.proxy.resources.requests.cpu", *i.Spec.Components.Proxy.K8S.Resources.Requests.Cpu)
+			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.Requests.Memory != nil {
-				err = valuesMap.SetPath("global.proxy.resources.requests.memory", *i.Spec.Components.Proxy.K8S.Resources.Requests.Memory)
+			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
 				}
 			}
 		}
 
+		if i.Spec.Components.Proxy.K8S.Resources.Requests != nil {
+			if i.Spec.Components.Proxy.K8S.Resources.Requests != nil {
+				if i.Spec.Components.Proxy.K8S.Resources.Requests.Cpu != nil {
+					err = valuesMap.SetPath("global.proxy.resources.requests.cpu", *i.Spec.Components.Proxy.K8S.Resources.Requests.Cpu)
+					if err != nil {
+						return iopv1alpha1.IstioOperator{}, err
+					}
+				}
+
+				if i.Spec.Components.Proxy.K8S.Resources.Requests.Memory != nil {
+					err = valuesMap.SetPath("global.proxy.resources.requests.memory", *i.Spec.Components.Proxy.K8S.Resources.Requests.Memory)
+					if err != nil {
+						return iopv1alpha1.IstioOperator{}, err
+					}
+				}
+			}
+		}
 		op.Spec.Values, err = values.ConvertMap[json.RawMessage](valuesMap)
 	}