Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/microsoft/kalypso-scheduler
Browse files Browse the repository at this point in the history
  • Loading branch information
@eedorenko
eedorenko committed Aug 2, 2024
2 parents 64e42e1 + e7b7c39 commit 9226980
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 53 deletions.
111 changes: 60 additions & 51 deletions controllers/assignment_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,9 @@ func (r *AssignmentReconciler) getConfigManifests(ctx context.Context, clusterTy
}

manifests, err := templater.ProcessTemplate(ctx, template)
if err != nil {
return nil, nil, err
}

return manifests, &contentType, nil
}
Expand Down Expand Up @@ -421,6 +424,12 @@ func (r *AssignmentReconciler) mergeObjects(existingObject interface{}, newObjec
}

func (r *AssignmentReconciler) getObjectFromConfigValue(configValue string) interface{} {
trimmedConfigValue := strings.TrimSpace(configValue)
if strings.HasPrefix(trimmedConfigValue, "'") && strings.HasSuffix(trimmedConfigValue, "'") {
trimmedConfigValue = strings.Trim(trimmedConfigValue, "'")
return trimmedConfigValue
}

var object interface{}
err := yaml.Unmarshal([]byte(configValue), &object)
if err != nil {
Expand Down Expand Up @@ -590,56 +599,56 @@ func (r *AssignmentReconciler) deleteGitHubIssue(ctx context.Context, logger log
return &schedulerv1alpha1.GitIssueStatus{}, nil
}

func (r *AssignmentReconciler) findAssignmentsForTemplate(ctx context.Context, object client.Object) []reconcile.Request {
//get template
template := &schedulerv1alpha1.Template{}
err := r.Get(ctx, client.ObjectKey{
Name: object.GetName(),
Namespace: object.GetNamespace(),
}, template)
if err != nil {
return []reconcile.Request{}
}

//get cluster types that use this template as a reconciler
clusterTypes := &schedulerv1alpha1.ClusterTypeList{}
err = r.List(ctx, clusterTypes, client.InNamespace(object.GetNamespace()), client.MatchingFields{ReconcilerField: template.Name})
if err != nil {
return []reconcile.Request{}
}

//get cluster types that use this template as a namespace service
clusterTypesNameSpace := &schedulerv1alpha1.ClusterTypeList{}
err = r.List(ctx, clusterTypesNameSpace, client.InNamespace(object.GetNamespace()), client.MatchingFields{NamespaceServiceField: template.Name})
if err != nil {
return []reconcile.Request{}
}

//append the two lists
clusterTypes.Items = append(clusterTypes.Items, clusterTypesNameSpace.Items...)

var requests []reconcile.Request
// iterate over the cluster types and find the assignments
for _, clusterType := range clusterTypes.Items {
assignments := &schedulerv1alpha1.AssignmentList{}
err = r.List(ctx, assignments, client.InNamespace(object.GetNamespace()), client.MatchingFields{ClusterTypeField: clusterType.Name})
if err != nil {
return []reconcile.Request{}
}

for _, item := range assignments.Items {
request := reconcile.Request{
NamespacedName: types.NamespacedName{
Name: item.GetName(),
Namespace: item.GetNamespace(),
},
}
requests = append(requests, request)
}
}

return requests
}
// func (r *AssignmentReconciler) findAssignmentsForTemplate(ctx context.Context, object client.Object) []reconcile.Request {
// //get template
// template := &schedulerv1alpha1.Template{}
// err := r.Get(ctx, client.ObjectKey{
// Name: object.GetName(),
// Namespace: object.GetNamespace(),
// }, template)
// if err != nil {
// return []reconcile.Request{}
// }

// //get cluster types that use this template as a reconciler
// clusterTypes := &schedulerv1alpha1.ClusterTypeList{}
// err = r.List(ctx, clusterTypes, client.InNamespace(object.GetNamespace()), client.MatchingFields{ReconcilerField: template.Name})
// if err != nil {
// return []reconcile.Request{}
// }

// //get cluster types that use this template as a namespace service
// clusterTypesNameSpace := &schedulerv1alpha1.ClusterTypeList{}
// err = r.List(ctx, clusterTypesNameSpace, client.InNamespace(object.GetNamespace()), client.MatchingFields{NamespaceServiceField: template.Name})
// if err != nil {
// return []reconcile.Request{}
// }

// //append the two lists
// clusterTypes.Items = append(clusterTypes.Items, clusterTypesNameSpace.Items...)

// var requests []reconcile.Request
// // iterate over the cluster types and find the assignments
// for _, clusterType := range clusterTypes.Items {
// assignments := &schedulerv1alpha1.AssignmentList{}
// err = r.List(ctx, assignments, client.InNamespace(object.GetNamespace()), client.MatchingFields{ClusterTypeField: clusterType.Name})
// if err != nil {
// return []reconcile.Request{}
// }

// for _, item := range assignments.Items {
// request := reconcile.Request{
// NamespacedName: types.NamespacedName{
// Name: item.GetName(),
// Namespace: item.GetNamespace(),
// },
// }
// requests = append(requests, request)
// }
// }

// return requests
// }

func (r *AssignmentReconciler) findAssignmentsInObjectNamespace(ctx context.Context, object client.Object) []reconcile.Request {

Expand Down Expand Up @@ -701,7 +710,7 @@ func (r *AssignmentReconciler) SetupWithManager(mgr ctrl.Manager) error {
Owns(&schedulerv1alpha1.AssignmentPackage{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
Watches(
&schedulerv1alpha1.Template{},
handler.EnqueueRequestsFromMapFunc(r.findAssignmentsForTemplate)).
handler.EnqueueRequestsFromMapFunc(r.findAssignmentsInObjectNamespace)).
Watches(
&corev1.ConfigMap{},
handler.EnqueueRequestsFromMapFunc(r.findAssignmentsInObjectNamespace)).
Expand Down
39 changes: 37 additions & 2 deletions scheduler/templater.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ type templater struct {
var _ Templater = (*templater)(nil)

var funcMap = template.FuncMap{
"toYaml": toYAML,
"hash": hash,
"toYaml": toYAML,
"stringify": stringify,
"hash": hash,
"unquote": unquote,
}

type dataType struct {
Expand Down Expand Up @@ -104,6 +106,12 @@ func (h *templater) replaceTemplateVariables(s string) (*string, error) {
return nil, err
}
rs := buf.String()

// handle nested templates
if strings.Contains(rs, "{{") {
return h.replaceTemplateVariables(rs)
}

return &rs, nil
}

Expand Down Expand Up @@ -155,3 +163,30 @@ func hash(v interface{}) string {
}
return strconv.FormatUint(hashValue, 10)
}

func stringify(v interface{}) string {
// if v is a a map, iterate over keys, if a key is an array or a map, marshal it into string
if m, ok := v.(map[string]interface{}); ok {
newMap := make(map[string]interface{}, len(v.(map[string]interface{})))
for key, value := range m {
newMap[key] = value
switch value.(type) {
case map[string]interface{}, []interface{}:
data, err := yaml.Marshal(value)
if err != nil {
return ""
}
newMap[key] = string(data)
}
}
return toYAML(newMap)
}
return toYAML(v)
}

func unquote(v interface{}) string {
if s, ok := v.(string); ok {
return strings.Trim(strings.Trim(strings.TrimSpace(s), "\""), "'")
}
return ""
}

0 comments on commit 9226980

Please # to comment.