Skip to content
This repository has been archived by the owner on Jun 25, 2024. It is now read-only.

Commit

Permalink
Merge pull request #823 from rabi/refactor
Browse files Browse the repository at this point in the history 
Refactor SetupWithManager() code
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] committed Apr 15, 2024
2 parents 24a9fad + 04999ae commit 8758cb0
Showing 1 changed file with 125 additions and 132 deletions.
257 changes: 125 additions & 132 deletions controllers/openstackdataplanenodeset_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,172 +538,165 @@ func checkDeployment(helper *helper.Helper,
// SetupWithManager sets up the controller with the Manager.
func (r *OpenStackDataPlaneNodeSetReconciler) SetupWithManager(mgr ctrl.Manager) error {
// index for ConfigMaps listed on ansibleVarsFrom
if err := mgr.GetFieldIndexer().IndexField(context.Background(), &dataplanev1.OpenStackDataPlaneNodeSet{}, "spec.ansibleVarsFrom.ansible.configMaps", func(rawObj client.Object) []string {
// Extract the ConfigMap name from the OpenStackDataPlaneNodeSet Spec, if one is provided
nodeSet := rawObj.(*dataplanev1.OpenStackDataPlaneNodeSet)
configMaps := []string{}
if len(nodeSet.Spec.NodeTemplate.Ansible.AnsibleVarsFrom) > 0 {
for _, ref := range nodeSet.Spec.NodeTemplate.Ansible.AnsibleVarsFrom {
if ref.ConfigMapRef != nil {
configMaps = append(configMaps, ref.ConfigMapRef.Name)
}
}
}
for _, node := range nodeSet.Spec.Nodes {
if len(node.Ansible.AnsibleVarsFrom) > 0 {
for _, ref := range node.Ansible.AnsibleVarsFrom {
if err := mgr.GetFieldIndexer().IndexField(context.Background(),
&dataplanev1.OpenStackDataPlaneNodeSet{}, "spec.ansibleVarsFrom.ansible.configMaps",
func(rawObj client.Object) []string {
nodeSet := rawObj.(*dataplanev1.OpenStackDataPlaneNodeSet)
configMaps := make([]string, 0)

appendConfigMaps := func(varsFrom []dataplanev1.AnsibleVarsFromSource) {
for _, ref := range varsFrom {
if ref.ConfigMapRef != nil {
configMaps = append(configMaps, ref.ConfigMapRef.Name)
}
}
}
}
return configMaps
}); err != nil {

appendConfigMaps(nodeSet.Spec.NodeTemplate.Ansible.AnsibleVarsFrom)
for _, node := range nodeSet.Spec.Nodes {
appendConfigMaps(node.Ansible.AnsibleVarsFrom)
}
return configMaps
}); err != nil {
return err
}

// index for Secrets listed on ansibleVarsFrom
if err := mgr.GetFieldIndexer().IndexField(context.Background(), &dataplanev1.OpenStackDataPlaneNodeSet{}, "spec.ansibleVarsFrom.ansible.secrets", func(rawObj client.Object) []string {
// Extract the Secret name from the OpenStackDataPlaneNodeSet Spec, if one is provided
nodeSet := rawObj.(*dataplanev1.OpenStackDataPlaneNodeSet)
secrets := []string{}
if len(nodeSet.Spec.NodeTemplate.AnsibleSSHPrivateKeySecret) > 0 {
secrets = append(secrets, nodeSet.Spec.NodeTemplate.AnsibleSSHPrivateKeySecret)
}
if len(nodeSet.Spec.NodeTemplate.Ansible.AnsibleVarsFrom) > 0 {
for _, ref := range nodeSet.Spec.NodeTemplate.Ansible.AnsibleVarsFrom {
if ref.SecretRef != nil {
secrets = append(secrets, ref.SecretRef.Name)
}
if err := mgr.GetFieldIndexer().IndexField(context.Background(),
&dataplanev1.OpenStackDataPlaneNodeSet{}, "spec.ansibleVarsFrom.ansible.secrets",
func(rawObj client.Object) []string {
nodeSet := rawObj.(*dataplanev1.OpenStackDataPlaneNodeSet)
secrets := make([]string, 0, len(nodeSet.Spec.Nodes)+1)
if nodeSet.Spec.NodeTemplate.AnsibleSSHPrivateKeySecret != "" {
secrets = append(secrets, nodeSet.Spec.NodeTemplate.AnsibleSSHPrivateKeySecret)
}
}
for _, node := range nodeSet.Spec.Nodes {
if len(node.Ansible.AnsibleVarsFrom) > 0 {
for _, ref := range node.Ansible.AnsibleVarsFrom {

appendSecrets := func(varsFrom []dataplanev1.AnsibleVarsFromSource) {
for _, ref := range varsFrom {
if ref.SecretRef != nil {
secrets = append(secrets, ref.SecretRef.Name)
}
}
}
}
return secrets
}); err != nil {

appendSecrets(nodeSet.Spec.NodeTemplate.Ansible.AnsibleVarsFrom)
for _, node := range nodeSet.Spec.Nodes {
appendSecrets(node.Ansible.AnsibleVarsFrom)
}
return secrets
}); err != nil {
return err
}
varsFromWatcher := handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []reconcile.Request {
Log := r.GetLogger(ctx)
nodeSets := &dataplanev1.OpenStackDataPlaneNodeSetList{}
kind := strings.ToLower(obj.GetObjectKind().GroupVersionKind().Kind)
return ctrl.NewControllerManagedBy(mgr).
For(&dataplanev1.OpenStackDataPlaneNodeSet{}).
Owns(&ansibleeev1.OpenStackAnsibleEE{}).
Owns(&baremetalv1.OpenStackBaremetalSet{}).
Owns(&infranetworkv1.IPSet{}).
Owns(&infranetworkv1.DNSData{}).
Owns(&corev1.Secret{}).
Watches(&infranetworkv1.DNSMasq{},
handler.EnqueueRequestsFromMapFunc(r.dnsMasqWatcherFn)).
Watches(&dataplanev1.OpenStackDataPlaneDeployment{},
handler.EnqueueRequestsFromMapFunc(r.deploymentWatcherFn)).
Watches(&corev1.ConfigMap{},
handler.EnqueueRequestsFromMapFunc(r.secretWatcherFn),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(&corev1.Secret{},
handler.EnqueueRequestsFromMapFunc(r.secretWatcherFn),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Complete(r)
}

selector := "spec.ansibleVarsFrom.ansible.configMaps"
if kind == "secret" {
selector = "spec.ansibleVarsFrom.ansible.secrets"
}
func (r *OpenStackDataPlaneNodeSetReconciler) secretWatcherFn(
ctx context.Context, obj client.Object) []reconcile.Request {
Log := r.GetLogger(ctx)
nodeSets := &dataplanev1.OpenStackDataPlaneNodeSetList{}
kind := strings.ToLower(obj.GetObjectKind().GroupVersionKind().Kind)

listOpts := &client.ListOptions{
FieldSelector: fields.OneTermEqualSelector(selector, obj.GetName()),
Namespace: obj.GetNamespace(),
}
selector := "spec.ansibleVarsFrom.ansible.configMaps"
if kind == "secret" {
selector = "spec.ansibleVarsFrom.ansible.secrets"
}

if err := r.List(ctx, nodeSets, listOpts); err != nil {
Log.Error(err, "Unable to retrieve OpenStackDataPlaneNodeSetList %w")
return nil
}
listOpts := &client.ListOptions{
FieldSelector: fields.OneTermEqualSelector(selector, obj.GetName()),
Namespace: obj.GetNamespace(),
}

requests := make([]reconcile.Request, len(nodeSets.Items))
for i, nodeSet := range nodeSets.Items {
requests[i] = reconcile.Request{
NamespacedName: types.NamespacedName{
Namespace: obj.GetNamespace(),
Name: nodeSet.Name,
},
}
Log.Info(
fmt.Sprintf(
"reconcile loop for openstackdataplanenodeset %s triggered by %s %s",
nodeSet.Name, kind, obj.GetName()))
}
return requests
})
if err := r.List(ctx, nodeSets, listOpts); err != nil {
Log.Error(err, "Unable to retrieve OpenStackDataPlaneNodeSetList")
return nil
}

dnsMasqWatcher := handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []reconcile.Request {
Log := r.GetLogger(ctx)
result := []reconcile.Request{}
requests := make([]reconcile.Request, 0, len(nodeSets.Items))
for _, nodeSet := range nodeSets.Items {
requests = append(requests, reconcile.Request{
NamespacedName: types.NamespacedName{
Namespace: obj.GetNamespace(),
Name: nodeSet.Name,
},
})
Log.Info(fmt.Sprintf("reconcile loop for openstackdataplanenodeset %s triggered by %s %s",
nodeSet.Name, kind, obj.GetName()))
}
return requests
}

// For each DNSMasq change event get the list of all
// OpenStackDataPlaneNodeSet to trigger reconcile for the
// ones in the same namespace.
nodeSets := &dataplanev1.OpenStackDataPlaneNodeSetList{}
func (r *OpenStackDataPlaneNodeSetReconciler) dnsMasqWatcherFn(
ctx context.Context, obj client.Object) []reconcile.Request {
Log := r.GetLogger(ctx)
nodeSets := &dataplanev1.OpenStackDataPlaneNodeSetList{}

listOpts := []client.ListOption{
client.InNamespace(obj.GetNamespace()),
}
if err := r.Client.List(ctx, nodeSets, listOpts...); err != nil {
Log.Error(err, "Unable to retrieve OpenStackDataPlaneNodeSetList %w")
return nil
}
listOpts := []client.ListOption{
client.InNamespace(obj.GetNamespace()),
}
if err := r.Client.List(ctx, nodeSets, listOpts...); err != nil {
Log.Error(err, "Unable to retrieve OpenStackDataPlaneNodeSetList")
return nil
}

// For each NodeSet instance create a reconcile request
for _, i := range nodeSets.Items {
name := client.ObjectKey{
requests := make([]reconcile.Request, 0, len(nodeSets.Items))
for _, nodeSet := range nodeSets.Items {
requests = append(requests, reconcile.Request{
NamespacedName: types.NamespacedName{
Namespace: obj.GetNamespace(),
Name: i.Name,
}
result = append(result, reconcile.Request{NamespacedName: name})
}
return result
})
Name: nodeSet.Name,
},
})
}
return requests
}

deploymentWatcher := handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []reconcile.Request {
Log := r.GetLogger(ctx)
var namespace string = obj.GetNamespace()
result := []reconcile.Request{}
func (r *OpenStackDataPlaneNodeSetReconciler) deploymentWatcherFn(
ctx context.Context, obj client.Object) []reconcile.Request {
Log := r.GetLogger(ctx)
namespace := obj.GetNamespace()
deployment := obj.(*dataplanev1.OpenStackDataPlaneDeployment)

deployment := obj.(*dataplanev1.OpenStackDataPlaneDeployment)
for _, nodeSet := range deployment.Spec.NodeSets {
name := client.ObjectKey{
requests := make([]reconcile.Request, 0, len(deployment.Spec.NodeSets))
for _, nodeSet := range deployment.Spec.NodeSets {
requests = append(requests, reconcile.Request{
NamespacedName: types.NamespacedName{
Namespace: namespace,
Name: nodeSet,
}
result = append(result, reconcile.Request{NamespacedName: name})
}
podsInterface := r.Kclient.CoreV1().Pods(namespace)
// List service pods in the given namespace
podsList, err := podsInterface.List(context.TODO(), v1.ListOptions{
LabelSelector: fmt.Sprintf("openstackdataplanedeployment=%s", deployment.Name),
FieldSelector: "status.phase=Failed",
},
})
}

if err != nil {
Log.Error(err, "unable to retrieve list of pods for dataplane diagnostic")
} else {
for _, pod := range podsList.Items {
Log.Info(
fmt.Sprintf(
"openstackansibleee job %s failed due to %s with message: %s",
pod.Name, pod.Status.Reason, pod.Status.Message))
}
}
return result
podsInterface := r.Kclient.CoreV1().Pods(namespace)
podsList, err := podsInterface.List(ctx, v1.ListOptions{
LabelSelector: fmt.Sprintf("openstackdataplanedeployment=%s", deployment.Name),
FieldSelector: "status.phase=Failed",
})

return ctrl.NewControllerManagedBy(mgr).
For(&dataplanev1.OpenStackDataPlaneNodeSet{}).
Owns(&ansibleeev1.OpenStackAnsibleEE{}).
Owns(&baremetalv1.OpenStackBaremetalSet{}).
Owns(&infranetworkv1.IPSet{}).
Owns(&infranetworkv1.DNSData{}).
Owns(&corev1.Secret{}).
Watches(&infranetworkv1.DNSMasq{},
dnsMasqWatcher).
Watches(&dataplanev1.OpenStackDataPlaneDeployment{},
deploymentWatcher).
Watches(&corev1.ConfigMap{},
varsFromWatcher, builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(&corev1.Secret{},
varsFromWatcher, builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Complete(r)
if err != nil {
Log.Error(err, "unable to retrieve list of pods for dataplane diagnostic")
} else {
for _, pod := range podsList.Items {
Log.Info(fmt.Sprintf("openstackansibleee job %s failed due to %s with message: %s", pod.Name, pod.Status.Reason, pod.Status.Message))
}
}
return requests
}

// GetSpecConfigHash initialises a new struct with only the field we want to check for variances in.
Expand Down

0 comments on commit 8758cb0

Please sign in to comment.