Update the static custom entries

This commit updates the static custom entries to be in struct format and not string. also add ports 111 and 53 for UDP. Signed-off-by: Lior Noy <[email protected]>
openshift-kni · May 2, 2024 · c1a2171 · c1a2171
1 parent 4709dfb
commit c1a2171
Show file tree

Hide file tree

Showing 2 changed files with 525 additions and 562 deletions.
diff --git a/commatrix/commatrix.go b/commatrix/commatrix.go
@@ -94,54 +94,29 @@ func addFromFile(fp string) ([]types.ComDetails, error) {
 
 func getStaticEntries(e Env, d Deployment) ([]types.ComDetails, error) {
 	comDetails := []types.ComDetails{}
-	add := []types.ComDetails{}
 
 	switch e {
 	case Baremetal:
-		err := json.Unmarshal([]byte(baremetalStaticEntriesMaster), &add)
-		if err != nil {
-			return nil, fmt.Errorf("failed to unmarshal static entries: %v", err)
-		}
-		comDetails = append(comDetails, add...)
+		comDetails = append(comDetails, baremetalStaticEntriesMaster...)
 		if d == SNO {
 			break
 		}
-		err = json.Unmarshal([]byte(baremetalStaticEntriesWorker), &add)
-		if err != nil {
-			return nil, fmt.Errorf("failed to unmarshal static entries: %v", err)
-		}
-		comDetails = append(comDetails, add...)
+		comDetails = append(comDetails, baremetalStaticEntriesWorker...)
 	case AWS:
-		err := json.Unmarshal([]byte(awsCloudStaticEntriesMaster), &add)
-		if err != nil {
-			return nil, fmt.Errorf("failed to unmarshal static entries: %v", err)
-		}
-		comDetails = append(comDetails, add...)
+		comDetails = append(comDetails, awsCloudStaticEntriesMaster...)
 		if d == SNO {
 			break
 		}
-		err = json.Unmarshal([]byte(awsCloudStaticEntriesWorker), &add)
-		if err != nil {
-			return nil, fmt.Errorf("failed to unmarshal static entries: %v", err)
-		}
-		comDetails = append(comDetails, add...)
+		comDetails = append(comDetails, awsCloudStaticEntriesWorker...)
 	default:
 		return nil, fmt.Errorf("invalid value for cluster environment")
 	}
 
-	err := json.Unmarshal([]byte(generalStaticEntriesMaster), &add)
-	if err != nil {
-		return nil, fmt.Errorf("failed to unmarshal static entries: %v", err)
-	}
-	comDetails = append(comDetails, add...)
+	comDetails = append(comDetails, generalStaticEntriesMaster...)
 	if d == SNO {
 		return comDetails, nil
 	}
 
-	err = json.Unmarshal([]byte(generalStaticEntriesWorker), &add)
-	if err != nil {
-		return nil, fmt.Errorf("failed to unmarshal static entries: %v", err)
-	}
-	comDetails = append(comDetails, add...)
+	comDetails = append(comDetails, generalStaticEntriesWorker...)
 	return comDetails, nil
 }