Skip to content

[OCTRL-1091] Hostname resolving in environment controller #839

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

Open
justonedev1 wants to merge 1 commit into
base: master
Choose a base branch
from
+57 −18
Open

[OCTRL-1091] Hostname resolving in environment controller #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion control-operator/ecs-manifests/environment/test_env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
taskTemplates:
tasks:
mtichak-ost.cern.ch:
# mtichak-ost:
# mtichak-xps-cern:
# - name: readout
# argsCLI:
Expand Down Expand Up @@ -187,7 +188,8 @@ taskTemplates:
spec:
state: standby
tasks:
mtichak-ost.cern.ch:
# mtichak-ost.cern.ch:
mtichak-ost:
- name: readout
spec:
pod:
Expand Down
71 changes: 54 additions & 17 deletions control-operator/internal/controller/environment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type EnvironmentReconciler struct {
}

func (r *EnvironmentReconciler) runTasksFromReferenceOnNode(ctx context.Context, taskReferences []aliecsv1alpha1.TaskReference,
nodename string, req ctrl.Request, environment *aliecsv1alpha1.Environment, log logr.Logger,
nodename string, resolvedNodename string, req ctrl.Request, environment *aliecsv1alpha1.Environment, log logr.Logger,
) (*ctrl.Result, error) {
for _, taskReference := range taskReferences {
log.Info("geting stored template for task", "task", taskReference.Name)
Expand Down Expand Up @@ -106,7 +106,8 @@ func (r *EnvironmentReconciler) runTasksFromReferenceOnNode(ctx context.Context,
task.Spec.Pod.Containers[0].Args = append(task.Spec.Pod.Containers[0].Args, taskReference.ArgsCLI...)
maps.Copy(task.Spec.Arguments, taskReference.ArgsTransition)

task.Spec.Pod.NodeName = nodename
task.Spec.Pod.NodeName = resolvedNodename
task.Spec.NodeName = resolvedNodename
task.Spec.State = environment.Spec.State

task.Labels = labels(environment, nodename)
Expand All @@ -128,7 +129,7 @@ func (r *EnvironmentReconciler) runTasksFromReferenceOnNode(ctx context.Context,
}

func (r *EnvironmentReconciler) runTaskFromDefinitionOnNode(ctx context.Context, taskDefs []aliecsv1alpha1.TaskDefinition,
nodename string, req ctrl.Request, environment *aliecsv1alpha1.Environment, log logr.Logger,
nodename string, resolvedNodename string, req ctrl.Request, environment *aliecsv1alpha1.Environment, log logr.Logger,
) (*ctrl.Result, error) {
for _, taskDef := range taskDefs {
task := &aliecsv1alpha1.Task{}
Expand All @@ -148,7 +149,8 @@ func (r *EnvironmentReconciler) runTaskFromDefinitionOnNode(ctx context.Context,
maps.Copy(task.Spec.Arguments, taskDef.Spec.Arguments)
}

task.Spec.Pod.NodeName = nodename
task.Spec.Pod.NodeName = resolvedNodename
task.Spec.NodeName = resolvedNodename
task.Spec.State = environment.Spec.State

task.Labels = labels(environment, nodename)
Expand Down Expand Up @@ -246,24 +248,31 @@ func (r *EnvironmentReconciler) Reconcile(ctx context.Context, req ctrl.Request)
}

if environment.Status.State == "" {
nodeNames, err := r.listAndParseNodes(ctx)
if err != nil {
return ctrl.Result{}, err
}

for nodename, tasksReferences := range environment.TaskTemplates.Tasks {
log.Info("creating tasks for hostname from references", "hostname", nodename, "number of tasks", len(tasksReferences))
if res, err := r.checkNodeExistence(ctx, nodename); err != nil {
return res, err
resolvedName, err := resolveNodeName(nodeNames, nodename)
if err != nil {
return ctrl.Result{}, err
}

if res, err := r.runTasksFromReferenceOnNode(ctx, tasksReferences, nodename, req, environment, log); res != nil {
if res, err := r.runTasksFromReferenceOnNode(ctx, tasksReferences, nodename, resolvedName, req, environment, log); res != nil {
return *res, err
}
}

for nodename, taskTemplates := range environment.Spec.Tasks {
log.Info("creating tasks for hostname from definitions", "hostname", nodename, "number of tasks", len(taskTemplates))
if res, err := r.checkNodeExistence(ctx, nodename); err != nil {
return res, err
resolvedName, err := resolveNodeName(nodeNames, nodename)
if err != nil {
return ctrl.Result{}, err
}

if res, err := r.runTaskFromDefinitionOnNode(ctx, taskTemplates, nodename, req, environment, log); res != nil {
if res, err := r.runTaskFromDefinitionOnNode(ctx, taskTemplates, nodename, resolvedName, req, environment, log); res != nil {
return *res, err
}
}
Expand Down Expand Up @@ -311,15 +320,43 @@ func (r *EnvironmentReconciler) Reconcile(ctx context.Context, req ctrl.Request)
return ctrl.Result{}, nil
}

func (r *EnvironmentReconciler) checkNodeExistence(ctx context.Context, nodename string) (ctrl.Result, error) {
node := &v1.Node{}
if err := r.Get(ctx, types.NamespacedName{Name: nodename}, node); err != nil {
if k8serrors.IsNotFound(err) {
return ctrl.Result{}, fmt.Errorf("node %s not found in cluster", nodename)
var filterList = []string{"cern", "ch"}

// listAndParseNodes asks k8s cluster for all nodes and it creates map out of them containing the node names
// and also partial node names while filtering those from `filterList`, so map will contain following for example:
// { "flp001.cern.ch": "flp001.cern.ch", "flp001": "flp001.cern.ch" }
func (r *EnvironmentReconciler) listAndParseNodes(ctx context.Context) (map[string]string, error) {
nodeList := &v1.NodeList{}
nodeNames := make(map[string]string)
if err := r.List(ctx, nodeList); err != nil {
return nodeNames, fmt.Errorf("listing nodes: %w", err)
}

for _, node := range nodeList.Items {
if val, ok := nodeNames[node.Name]; ok {
return nil, fmt.Errorf("duplicate node names %s and %s ", node.Name, val)
}
nodeNames[node.Name] = node.Name
for _, nodePart := range strings.Split(node.Name, ".") {
if !slices.Contains(filterList, nodePart) {
if val, ok := nodeNames[nodePart]; ok {
return nil, fmt.Errorf("duplicate partial node names %s and %s ", nodePart, val)
}
nodeNames[nodePart] = node.Name
}
}
return ctrl.Result{}, err
}
return ctrl.Result{}, nil

return nodeNames, nil
}

// resolveNodeNames checks created map in listAndParseNodes for any match
func resolveNodeName(nodes map[string]string, nodename string) (string, error) {
if res, ok := nodes[nodename]; !ok {
return "", fmt.Errorf("node not in cluster: %s", nodename)
} else {
return res, nil
}
}

func aggregateState(tasks []aliecsv1alpha1.Task, previousState string) string {
Expand Down
Loading