Don't allow config map to override existing facts

main.go

@@ -51,7 +51,7 @@ func main() {
 	app.
 		Flag(
 			"additional-facts-config-map",
-			"Additional facts added to the dynamic facts in the cluster object. Keys in the configmap's data field override existing keys.").
+			"Additional facts added to the dynamic facts in the cluster object. Keys in the configmap's data field can't override existing keys.").
 		Default("additional-facts").
 		StringVar(&agent.AdditionalFactsConfigMap)
 	app.

pkg/agent/facts/facts.go

@@ -25,6 +25,15 @@ type FactCollector struct {
 
 func (col FactCollector) FetchDynamicFacts(ctx context.Context) (*api.DynamicClusterFacts, error) {
 	facts := api.DynamicClusterFacts{}
+
+	additionalFacts, err := col.fetchAdditionalFacts(ctx)
+	if err != nil {
+		klog.Errorf("Error fetching additional facts: %v", err)
+	}
+	for k, v := range additionalFacts {
+		facts[k] = v
+	}
+
 	kubeVersion, err := col.fetchKubernetesVersion(ctx)
 	if err != nil {
 		klog.Errorf("Error fetching kubernetes version: %v", err)
@@ -49,14 +58,6 @@ func (col FactCollector) FetchDynamicFacts(ctx context.Context) (*api.DynamicClu
 		facts["openshiftOAuthRoute"] = ocpOAuthRoute
 	}
 
-	additionalFacts, err := col.fetchAdditionalFacts(ctx)
-	if err != nil {
-		klog.Errorf("Error fetching additional facts: %v", err)
-	}
-	for k, v := range additionalFacts {
-		facts[k] = v
-	}
-
 	return &facts, nil
 }