fix: run placement group discovery

Author: supershal

pkg/handlers/aws/mutation/placementgroupnfd/embedded/placementgroup_discovery.sh

@@ -4,8 +4,8 @@ set -euo pipefail
 # This script is used to discover the placement group for the node.
 # The script will be placed in /etc/kubernetes/node-feature-discovery/source.d/
 # The script will be executed by the node feature discovery's local feature hook.
-
-
+PLACEMENT_GROUP_FEATURE_DIR="/etc/kubernetes/node-feature-discovery/features.d"
+PLACEMENT_GROUP_FEATURE_FILE="${PLACEMENT_GROUP_FEATURE_DIR}/placementgroup"
 # Fetch IMDSv2 token
 TOKEN=$(curl -s -X PUT "http://169.254.169.254/latest/api/token" \
           -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
@@ -21,14 +21,17 @@ PG_RESPONSE=$(curl -s -w "%{http_code}" -H "X-aws-ec2-metadata-token: $TOKEN" \
 PARTITION_HTTP_CODE="${PARTITION_RESPONSE: -3}" # last 3 characters are the HTTP status code
 PARTITION_CONTENT="${PARTITION_RESPONSE%???}" # remove the last 3 characters to get the content
 
+mkdir -p "${PLACEMENT_GROUP_FEATURE_DIR}"
+touch "${PLACEMENT_GROUP_FEATURE_FILE}"
+
 # Only print features if HTTP 200 response
 if [ "$PARTITION_HTTP_CODE" = "200" ] && [ -n "$PARTITION_CONTENT" ]; then
-    echo "feature.node.kubernetes.io/partition=${PARTITION_CONTENT}"
+    echo "feature.node.kubernetes.io/partition=${PARTITION_CONTENT}" >> "${PLACEMENT_GROUP_FEATURE_FILE}"
 fi
 
 PG_HTTP_CODE="${PG_RESPONSE: -3}" # last 3 characters are the HTTP status code
 PG_CONTENT="${PG_RESPONSE%???}" # remove the last 3 characters to get the content
 
 if [ "$PG_HTTP_CODE" = "200" ] && [ -n "$PG_CONTENT" ]; then
-    echo "feature.node.kubernetes.io/aws-placement-group=${PG_CONTENT}"
+    echo "feature.node.kubernetes.io/aws-placement-group=${PG_CONTENT}" >> "${PLACEMENT_GROUP_FEATURE_FILE}"
 fi

pkg/handlers/aws/mutation/placementgroupnfd/inject_controlplane.go

@@ -79,11 +79,18 @@ func (h *controlPlanePatchHandler) Mutate(
 				"patchedObjectKind", obj.GetObjectKind().GroupVersionKind().String(),
 				"patchedObjectName", client.ObjectKeyFromObject(obj),
 			).Info("setting placement group for local node feature discovery in AWS controlplane KubeadmControlPlaneTemplate")
-			obj.Spec.Template.Spec.KubeadmConfigSpec.Files = append(obj.Spec.Template.Spec.KubeadmConfigSpec.Files, cabpkv1.File{
-				Path:        PlacementGroupDiscoveryScriptFileOnRemote,
-				Content:     string(PlacementgroupDiscoveryScript),
-				Permissions: "0700",
-			})
+			obj.Spec.Template.Spec.KubeadmConfigSpec.Files = append(
+				obj.Spec.Template.Spec.KubeadmConfigSpec.Files,
+				cabpkv1.File{
+					Path:        PlacementGroupDiscoveryScriptFileOnRemote,
+					Content:     string(PlacementgroupDiscoveryScript),
+					Permissions: "0700",
+				},
+			)
+			obj.Spec.Template.Spec.KubeadmConfigSpec.PreKubeadmCommands = append(
+				obj.Spec.Template.Spec.KubeadmConfigSpec.PreKubeadmCommands,
+				PlacementGroupDiscoveryScriptFileOnRemote,
+			)
 			return nil
 		},
 	)

pkg/handlers/aws/mutation/placementgroupnfd/inject_worker.go

@@ -82,6 +82,10 @@ func (h *workerPatchHandler) Mutate(
 				Content:     string(PlacementgroupDiscoveryScript),
 				Permissions: "0700",
 			})
+			obj.Spec.Template.Spec.PreKubeadmCommands = append(
+				obj.Spec.Template.Spec.PreKubeadmCommands,
+				PlacementGroupDiscoveryScriptFileOnRemote,
+			)
 			return nil
 		},
 	)

pkg/handlers/eks/mutation/placementgroupnfd/inject_worker.go

@@ -83,6 +83,10 @@ func (h *workerPatchHandler) Mutate(
 				Content:     string(awsplacementgroupnfd.PlacementgroupDiscoveryScript),
 				Permissions: "0700",
 			})
+			obj.Spec.Template.Spec.PreNodeadmCommands = append(
+				obj.Spec.Template.Spec.PreNodeadmCommands,
+				awsplacementgroupnfd.PlacementGroupDiscoveryScriptFileOnRemote,
+			)
 			return nil
 		},
 	)