sync: update external libs (rh-ecosystem-edge#1073)

Co-authored-by: klaskosk <[email protected]>

Author: github-actions[bot]

pkg/schemes/nvidiagpu/nvidiagputypes/clusterpolicy_types.go

@@ -26,6 +26,7 @@ import (
 	promv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -2094,3 +2095,29 @@ func (c *CCManagerSpec) IsEnabled() bool {
 	}
 	return *c.Enabled
 }
+
+// +kubebuilder:object:generate=false
+type ConfigWithName interface {
+	GetName() string
+}
+
+// GetConfigMapName returns the config's name if it's non-empty and differs from defaultName,
+// otherwise returns defaultName. The boolean indicates whether a custom name was used.
+func GetConfigMapName[T ConfigWithName](config T, defaultName string) (string, bool) {
+	if name := config.GetName(); name != "" {
+		return name, name != defaultName
+	}
+	return defaultName, false
+}
+
+func (c *MIGGPUClientsConfigSpec) GetName() string {
+	return ptr.Deref(c, MIGGPUClientsConfigSpec{}).Name
+}
+
+func (c *MIGPartedConfigSpec) GetName() string {
+	return ptr.Deref(c, MIGPartedConfigSpec{}).Name
+}
+
+func (c *VGPUDevicesConfigSpec) GetName() string {
+	return ptr.Deref(c, VGPUDevicesConfigSpec{}).Name
+}

pkg/schemes/ocs/noobaa/noobaa_types.go

@@ -157,7 +157,7 @@ type NooBaaSpec struct {
 
 	// Affinity (optional) passed through to noobaa's pods
 	// +optional
-	Affinity *corev1.Affinity `json:"affinity,omitempty"`
+	Affinity *AffinitySpec `json:"affinity,omitempty"`
 
 	// ImagePullSecret (optional) sets a pull secret for the system image
 	// +optional
@@ -242,6 +242,24 @@ type NooBaaSpec struct {
 	BucketNotifications BucketNotificationsSpec `json:"bucketNotifications,omitempty"`
 }
 
+// Affinity is a group of affinity scheduling rules.
+type AffinitySpec struct {
+	// Describes node affinity scheduling rules for the pod.
+	// +optional
+	NodeAffinity *corev1.NodeAffinity `json:"nodeAffinity,omitempty" protobuf:"bytes,1,opt,name=nodeAffinity"`
+	// Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
+	// +optional
+	PodAffinity *corev1.PodAffinity `json:"podAffinity,omitempty" protobuf:"bytes,2,opt,name=podAffinity"`
+	// Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
+	// +optional
+	PodAntiAffinity *corev1.PodAntiAffinity `json:"podAntiAffinity,omitempty" protobuf:"bytes,3,opt,name=podAntiAffinity"`
+
+	// TopologyKey (optional) the TopologyKey to pass as the domain for TopologySpreadConstraint and Affinity of noobaa components
+	// It is used by the endpoints and the DB pods to control pods distribution between topology domains (host/zone)
+	// +optional
+	TopologyKey string `json:"topologyKey,omitempty"`
+}
+
 // AutoscalerSpec defines different actoscaling spec such as autoscaler type and prometheus namespace
 type AutoscalerSpec struct {
 	// Type of autoscaling (optional) for noobaa-endpoint, hpav2(default) and keda - Prometheus metrics based
@@ -640,7 +658,7 @@ const (
 	// DeleteOBCConfirmation represents the validation to destry obc
 	DeleteOBCConfirmation CleanupConfirmationProperty = "yes-really-destroy-obc"
 
-	// SkipTopologyConstraints is Annotation name for disabling default topology Constraints
+	// SkipTopologyConstraints is Annotation name for skipping the reconciliation of the default topology Constraints
 	SkipTopologyConstraints = "noobaa.io/skip_topology_spread_constraints"
 
 	// DisableDBDefaultMonitoring is Annotation name for disabling default db monitoring