From 14450cdc914e0e6427d15157e455cc0a964ad3f7 Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Tue, 9 Jan 2024 19:42:37 +0200 Subject: [PATCH] pkg/apis, helm: update balloons config/CRD. It looks like the latest balloons configuration additions have been committed then merged without updating the configuration, CRDs and clientsets. Let's fix it. Signed-off-by: Krisztian Litkey --- config/crd/bases/config.nri_balloonspolicies.yaml | 7 ++++++- .../balloons/crds/config.nri_balloonspolicies.yaml | 4 ++-- .../resmgr/policy/balloons/zz_generated.deepcopy.go | 10 ++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/config/crd/bases/config.nri_balloonspolicies.yaml b/config/crd/bases/config.nri_balloonspolicies.yaml index 178c7d280..61cb9f473 100644 --- a/config/crd/bases/config.nri_balloonspolicies.yaml +++ b/config/crd/bases/config.nri_balloonspolicies.yaml @@ -106,6 +106,12 @@ spec: items: type: string type: array + preferCloseToDevices: + description: 'PreferCloseToDevices: prefer creating new balloons + of this type close to listed devices.' + items: + type: string + type: array preferNewBalloons: description: 'PreferNewBalloons: prefer creating new balloons over adding containers to existing balloons. The default is @@ -297,7 +303,6 @@ spec: description: Reserved (CPU) resources for kube-system namespace. type: object required: - - idleCPUClass - reservedResources type: object status: diff --git a/deployment/helm/balloons/crds/config.nri_balloonspolicies.yaml b/deployment/helm/balloons/crds/config.nri_balloonspolicies.yaml index 07121dd55..61cb9f473 100644 --- a/deployment/helm/balloons/crds/config.nri_balloonspolicies.yaml +++ b/deployment/helm/balloons/crds/config.nri_balloonspolicies.yaml @@ -107,7 +107,8 @@ spec: type: string type: array preferCloseToDevices: - description: prefer creating new balloons of this type close to listed devices. + description: 'PreferCloseToDevices: prefer creating new balloons + of this type close to listed devices.' items: type: string type: array @@ -302,7 +303,6 @@ spec: description: Reserved (CPU) resources for kube-system namespace. type: object required: - - idleCPUClass - reservedResources type: object status: diff --git a/pkg/apis/config/v1alpha1/resmgr/policy/balloons/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/resmgr/policy/balloons/zz_generated.deepcopy.go index c443ed6e3..be332eaae 100644 --- a/pkg/apis/config/v1alpha1/resmgr/policy/balloons/zz_generated.deepcopy.go +++ b/pkg/apis/config/v1alpha1/resmgr/policy/balloons/zz_generated.deepcopy.go @@ -41,6 +41,16 @@ func (in *BalloonDef) DeepCopyInto(out *BalloonDef) { *out = new(bool) **out = **in } + if in.PreferCloseToDevices != nil { + in, out := &in.PreferCloseToDevices, &out.PreferCloseToDevices + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.PreferFarFromDevices != nil { + in, out := &in.PreferFarFromDevices, &out.PreferFarFromDevices + *out = make([]string, len(*in)) + copy(*out, *in) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BalloonDef.