@@ -136,15 +136,15 @@ func (r *AgentMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request
136136 return ctrl.Result {}, r .updateStatus (ctx , log , agentMachine , err )
137137 }
138138
139- machineConfigPool , ignitionTokenSecretRef , err := r .processBootstrapDataSecret (ctx , log , machine )
139+ machineConfigPool , ignitionTokenSecretRef , ignitionEndpointHTTPHeaders , err := r .processBootstrapDataSecret (ctx , log , machine )
140140 if err != nil {
141141 return ctrl.Result {}, err
142142 }
143143
144144 // If the AgentMachine doesn't have an agent, find one and set the agentRef
145145 if agentMachine .Status .AgentRef == nil {
146146 var foundAgent * aiv1beta1.Agent
147- foundAgent , err = r .findAgent (ctx , log , agentMachine , agentCluster .Status .ClusterDeploymentRef , machineConfigPool , ignitionTokenSecretRef )
147+ foundAgent , err = r .findAgent (ctx , log , agentMachine , agentCluster .Status .ClusterDeploymentRef , machineConfigPool , ignitionTokenSecretRef , ignitionEndpointHTTPHeaders )
148148 if foundAgent == nil || err != nil {
149149 return ctrl.Result {}, r .updateStatus (ctx , log , agentMachine , err )
150150 }
@@ -257,6 +257,7 @@ func (r *AgentMachineReconciler) handleDeletionHook(ctx context.Context, log log
257257 delete (agent .ObjectMeta .Annotations , AgentMachineRefNamespace )
258258 agent .Spec .MachineConfigPool = ""
259259 agent .Spec .IgnitionEndpointTokenReference = nil
260+ agent .Spec .IgnitionEndpointHTTPHeaders = nil
260261 agent .Spec .ClusterDeploymentName = nil
261262 if err := r .Update (ctx , agent ); err != nil {
262263 log .WithError (err ).Error ("failed to remove the Agent's ClusterDeployment ref" )
@@ -307,7 +308,7 @@ func (r *AgentMachineReconciler) getAgentCluster(ctx context.Context, log logrus
307308
308309func (r * AgentMachineReconciler ) findAgent (ctx context.Context , log logrus.FieldLogger , agentMachine * capiproviderv1.AgentMachine ,
309310 clusterDeploymentRef capiproviderv1.ClusterDeploymentReference , machineConfigPool string ,
310- ignitionTokenSecretRef * aiv1beta1.IgnitionEndpointTokenReference ) (* aiv1beta1.Agent , error ) {
311+ ignitionTokenSecretRef * aiv1beta1.IgnitionEndpointTokenReference , ignitionEndpointHTTPHeaders map [ string ] string ) (* aiv1beta1.Agent , error ) {
311312
312313 foundAgent , err := r .findAgentWithAgentMachineLabel (ctx , log , agentMachine )
313314 if err != nil {
@@ -343,7 +344,7 @@ func (r *AgentMachineReconciler) findAgent(ctx context.Context, log logrus.Field
343344 if isValidAgent (& agents .Items [i ]) {
344345 foundAgent = & agents .Items [i ]
345346 log .Infof ("Found agent to associate with AgentMachine: %s/%s" , foundAgent .Namespace , foundAgent .Name )
346- err = r .updateFoundAgent (ctx , log , agentMachine , foundAgent , clusterDeploymentRef , machineConfigPool , ignitionTokenSecretRef )
347+ err = r .updateFoundAgent (ctx , log , agentMachine , foundAgent , clusterDeploymentRef , machineConfigPool , ignitionTokenSecretRef , ignitionEndpointHTTPHeaders )
347348 if err != nil {
348349 // If we failed to update the agent then it might have already been taken, try the others
349350 log .WithError (err ).Infof ("failed to update found agent, trying other agents" )
@@ -412,7 +413,7 @@ func (r *AgentMachineReconciler) updateAgentMachineWithFoundAgent(ctx context.Co
412413func (r * AgentMachineReconciler ) updateFoundAgent (ctx context.Context , log logrus.FieldLogger ,
413414 agentMachine * capiproviderv1.AgentMachine , agent * aiv1beta1.Agent ,
414415 clusterDeploymentRef capiproviderv1.ClusterDeploymentReference , machineConfigPool string ,
415- ignitionTokenSecretRef * aiv1beta1.IgnitionEndpointTokenReference ) error {
416+ ignitionTokenSecretRef * aiv1beta1.IgnitionEndpointTokenReference , ignitionEndpointHTTPHeaders map [ string ] string ) error {
416417
417418 log .Infof ("Updating Agent %s/%s to be referenced by AgentMachine" , agent .Namespace , agent .Name )
418419 if agent .ObjectMeta .Labels == nil {
@@ -426,6 +427,7 @@ func (r *AgentMachineReconciler) updateFoundAgent(ctx context.Context, log logru
426427 agent .Spec .ClusterDeploymentName = & aiv1beta1.ClusterReference {Namespace : clusterDeploymentRef .Namespace , Name : clusterDeploymentRef .Name }
427428 agent .Spec .MachineConfigPool = machineConfigPool
428429 agent .Spec .IgnitionEndpointTokenReference = ignitionTokenSecretRef
430+ agent .Spec .IgnitionEndpointHTTPHeaders = ignitionEndpointHTTPHeaders
429431
430432 if err := r .AgentClient .Update (ctx , agent ); err != nil {
431433 log .WithError (err ).Errorf ("failed to update found Agent %s" , agent .Name )
@@ -435,22 +437,23 @@ func (r *AgentMachineReconciler) updateFoundAgent(ctx context.Context, log logru
435437}
436438
437439func (r * AgentMachineReconciler ) processBootstrapDataSecret (ctx context.Context , log logrus.FieldLogger ,
438- machine * clusterv1.Machine ) (string , * aiv1beta1.IgnitionEndpointTokenReference , error ) {
440+ machine * clusterv1.Machine ) (string , * aiv1beta1.IgnitionEndpointTokenReference , map [ string ] string , error ) {
439441
440442 machineConfigPool := ""
441443 var ignitionTokenSecretRef * aiv1beta1.IgnitionEndpointTokenReference
444+ ignitionEndpointHTTPHeaders := make (map [string ]string )
442445
443446 if machine .Spec .Bootstrap .DataSecretName == nil {
444447 log .Info ("No data secret, continuing" )
445- return machineConfigPool , ignitionTokenSecretRef , nil
448+ return machineConfigPool , ignitionTokenSecretRef , ignitionEndpointHTTPHeaders , nil
446449 }
447450
448451 // For now we assume that if we have bootstrap data then it is an ignition config containing the ignition source and token.
449452 bootstrapDataSecret := & corev1.Secret {}
450453 bootstrapDataSecretRef := types.NamespacedName {Namespace : machine .Namespace , Name : * machine .Spec .Bootstrap .DataSecretName }
451454 if err := r .Get (ctx , bootstrapDataSecretRef , bootstrapDataSecret ); err != nil {
452455 log .WithError (err ).Errorf ("Failed to get user-data secret %s" , * machine .Spec .Bootstrap .DataSecretName )
453- return machineConfigPool , ignitionTokenSecretRef , err
456+ return machineConfigPool , ignitionTokenSecretRef , ignitionEndpointHTTPHeaders , err
454457 }
455458 if err := ensureSecretLabel (ctx , r .AgentClient , bootstrapDataSecret ); err != nil {
456459 log .WithError (err ).Warnf ("Failed to label secret %s/%s for backup" , bootstrapDataSecret .Name , bootstrapDataSecret .Namespace )
@@ -459,28 +462,30 @@ func (r *AgentMachineReconciler) processBootstrapDataSecret(ctx context.Context,
459462 ignitionConfig := & ignitionapi.Config {}
460463 if err := json .Unmarshal (bootstrapDataSecret .Data ["value" ], ignitionConfig ); err != nil {
461464 log .WithError (err ).Errorf ("Failed to unmarshal user-data secret %s" , * machine .Spec .Bootstrap .DataSecretName )
462- return machineConfigPool , ignitionTokenSecretRef , err
465+ return machineConfigPool , ignitionTokenSecretRef , ignitionEndpointHTTPHeaders , err
463466 }
464467
465468 if len (ignitionConfig .Ignition .Config .Merge ) != 1 {
466469 log .Errorf ("expected one ignition source in secret %s but found %d" , * machine .Spec .Bootstrap .DataSecretName , len (ignitionConfig .Ignition .Config .Merge ))
467- return machineConfigPool , ignitionTokenSecretRef , errors .New ("did not find one ignition source as expected" )
470+ return machineConfigPool , ignitionTokenSecretRef , ignitionEndpointHTTPHeaders , errors .New ("did not find one ignition source as expected" )
468471 }
469472
470473 ignitionSource := ignitionConfig .Ignition .Config .Merge [0 ]
471474 machineConfigPool = (* ignitionSource .Source )[strings .LastIndex ((* ignitionSource .Source ), "/" )+ 1 :]
472475
473476 token := ""
474477 for _ , header := range ignitionSource .HTTPHeaders {
475- if header .Name != "Authorization" {
476- continue
477- }
478- expectedPrefix := "Bearer "
479- if ! strings .HasPrefix (* header .Value , expectedPrefix ) {
480- log .Errorf ("did not find expected prefix for bearer token in user-data secret %s" , * machine .Spec .Bootstrap .DataSecretName )
481- return machineConfigPool , ignitionTokenSecretRef , errors .New ("did not find expected prefix for bearer token" )
478+ if header .Name == "Authorization" {
479+ expectedPrefix := "Bearer "
480+ if ! strings .HasPrefix (* header .Value , expectedPrefix ) {
481+ log .Errorf ("did not find expected prefix for bearer token in user-data secret %s" , * machine .Spec .Bootstrap .DataSecretName )
482+ return machineConfigPool , ignitionTokenSecretRef , ignitionEndpointHTTPHeaders , errors .New ("did not find expected prefix for bearer token" )
483+ }
484+ token = (* header .Value )[len (expectedPrefix ):]
485+ } else {
486+ ignitionEndpointHTTPHeaders [header .Name ] = * header .Value
482487 }
483- token = ( * header . Value )[ len ( expectedPrefix ):]
488+
484489 }
485490
486491 ignitionTokenSecretName := fmt .Sprintf ("agent-%s" , * machine .Spec .Bootstrap .DataSecretName )
@@ -505,10 +510,10 @@ func (r *AgentMachineReconciler) processBootstrapDataSecret(ctx context.Context,
505510 }
506511 if err != nil {
507512 log .WithError (err ).Error ("Failed to create ignitionTokenSecret" )
508- return machineConfigPool , ignitionTokenSecretRef , err
513+ return machineConfigPool , ignitionTokenSecretRef , ignitionEndpointHTTPHeaders , err
509514 }
510515
511- return machineConfigPool , ignitionTokenSecretRef , nil
516+ return machineConfigPool , ignitionTokenSecretRef , ignitionEndpointHTTPHeaders , nil
512517}
513518
514519func isValidAgent (agent * aiv1beta1.Agent ) bool {
0 commit comments