jgf: refactor to use shared functions and fix containment

Problem: the containment paths are currently not set,
and each resource type has a separate function.
Solution: create a shared node generation function
that uses a common resource counter, where the counter
manages the global and resource-specific counts. This
scoped commit includes refactor of those JGF functions,
which also means removing resources that are not present
in the graph (e.g., rack and socket) and ensuring that
we do not recreate the subnet since we loop through
nodes (and might hit the same one twice). I am also
removing the NFD features because I think they are
changed and might lead to error if someone has them.
We should assess which of them we want/need and add
them back strategically. I have a local test but want
to push this first to give a look over / run current
tests to determine if other changes are needed.

Signed-off-by: vsoch <[email protected]>

.github/workflows/e2e-test.yaml

@@ -23,7 +23,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v4
       with:
-        go-version: ^1.19
+        go-version: ^1.21
 
     - name: Build Containers
       run: |
@@ -56,7 +56,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v4
       with:
-        go-version: ^1.19
+        go-version: ^1.21
 
     - name: Build Container
       run: |
@@ -87,7 +87,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v4
       with:
-        go-version: ^1.19
+        go-version: ^1.21
 
     - name: Download fluence artifact
       uses: actions/download-artifact@v4

src/fluence/cmd/main.go

@@ -40,7 +40,7 @@ func main() {
 
 	// Fluxion GRPC
 	flux := fluxion.Fluxion{}
-	flux.InitFluxion(policy, label)
+	flux.InitFluxion(*policy, *label)
 
 	lis, err := net.Listen("tcp", port)
 	if err != nil {

src/fluence/fluxion/fluxion.go

@@ -20,11 +20,11 @@ type Fluxion struct {
 }
 
 // InitFluxion creates a new client to interaction with the fluxion API (via go bindings)
-func (fluxion *Fluxion) InitFluxion(policy *string, label *string) {
+func (fluxion *Fluxion) InitFluxion(policy string, label string) {
 	fluxion.cli = fluxcli.NewReapiClient()
 
 	klog.Infof("[Fluence] Created flux resource client %s", fluxion.cli)
-	err := utils.CreateJGF(defaults.KubernetesJsonGraphFormat, label)
+	err := utils.CreateInClusterJGF(defaults.KubernetesJsonGraphFormat, label)
 	if err != nil {
 		return
 	}
@@ -36,8 +36,8 @@ func (fluxion *Fluxion) InitFluxion(policy *string, label *string) {
 	}
 
 	p := "{}"
-	if *policy != "" {
-		p = string("{\"matcher_policy\": \"" + *policy + "\"}")
+	if policy != "" {
+		p = string("{\"matcher_policy\": \"" + policy + "\"}")
 		klog.Infof("[Fluence] match policy: %s", p)
 	}
 	fluxion.cli.InitContext(string(jgf), p)