Skip to content

[topology] Add optional default for topologyConstraint LabelSelector #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fmount merged 3 commits into from
Feb 5, 2025
Merged

[topology] Add optional default for topologyConstraint LabelSelector #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c7b13c
[topology] Add optional default for topologyConstraint LabelSelector
olliewalsh Jan 22, 2025
4d07147
Add helper functions to create labelselectors
olliewalsh Feb 5, 2025
381715a
Skip defaultLabelSelector logic when not set
olliewalsh Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions modules/common/labels/labels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package labels

import (
"github.com/openstack-k8s-operators/lib-common/modules/common"
"github.com/openstack-k8s-operators/lib-common/modules/common/util"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down Expand Up @@ -60,3 +61,28 @@ func GetLabels(

return util.MergeStringMaps(labelSelector, custom)
}

// GetSingleLabelSelector - create a simple label selector for a single key/value label
func GetSingleLabelSelector(
key string,
value string,
) metav1.LabelSelector {
return metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: key,
Operator: metav1.LabelSelectorOpIn,
Values: []string{
value,
},
},
},
}
}

// GetAppLabelSelector - create a simple label selector for the default AppSelector "service" label
func GetAppLabelSelector(
name string,
) metav1.LabelSelector {
return GetSingleLabelSelector(common.AppSelector, name)
}
26 changes: 26 additions & 0 deletions modules/common/topology/topology.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ package topology
import (
"context"
"fmt"

topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
"github.com/openstack-k8s-operators/lib-common/modules/common/util"
k8s_errors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
)
Expand All @@ -33,6 +35,7 @@ func EnsureTopologyRef(
h *helper.Helper,
topologyRef *TopoRef,
finalizer string,
defaultLabelSelector *metav1.LabelSelector,
) (*topologyv1.Topology, string, error) {

var err error
Expand All @@ -52,12 +55,35 @@ func EnsureTopologyRef(
if err != nil {
return topology, hash, err
}

// Add finalizer (if not present) to the resource consumed by the Service
if controllerutil.AddFinalizer(topology, fmt.Sprintf("%s-%s", h.GetFinalizer(), finalizer)) {
if err := h.GetClient().Update(ctx, topology); err != nil {
return topology, hash, err
}
}

if defaultLabelSelector != nil {
// Set default LabelSelector on topologyConstraints if not set, similar to cluster level default:
// https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/#cluster-level-default-constraints
topology = topology.DeepCopy()

topologyConstraints := topology.Spec.TopologySpreadConstraints
if topologyConstraints != nil {
for i := 0; i < len(*topologyConstraints); i++ {
current := &(*topologyConstraints)[i]
if current.LabelSelector == nil {
current.LabelSelector = defaultLabelSelector
}
}
}

hash, err = util.ObjectHash(topology.Spec)
if err != nil {
return topology, hash, err
}
}

return topology, hash, nil
}

Expand Down