From 93bd55987714e8a77c79811ef0803ba9c3081442 Mon Sep 17 00:00:00 2001 From: Chwila Date: Fri, 13 Dec 2024 16:00:38 +0100 Subject: [PATCH] Fix panic --- api/v1alpha2/istio_merge.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/v1alpha2/istio_merge.go b/api/v1alpha2/istio_merge.go index 8f1cc6a2f8..b5191924f8 100644 --- 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