Merge pull request k8stopologyawareschedwg#71 from k8stopologyawaresc…

…hedwg/fix_cm Mount configmap with the correct name
ffromani · Nov 30, 2021 · a27c296 · a27c296
2 parents 10523ae + 0d7f5e6
commit a27c296
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pkg/manifests/rte/rte.go b/pkg/manifests/rte/rte.go
@@ -113,8 +113,12 @@ func (mf Manifests) Update(options UpdateOptions) Manifests {
 	ret.DaemonSet.Spec.Template.Spec.ServiceAccountName = mf.ServiceAccount.Name
 
 	rteConfigMapName := ""
+	if len(options.ConfigData) > 0 {
+		ret.ConfigMap = CreateConfigMap(ret.DaemonSet.Namespace, manifests.RTEConfigMapName, options.ConfigData)
+	}
+
 	if ret.ConfigMap != nil {
-		rteConfigMapName = manifests.RTEConfigMapName
+		rteConfigMapName = ret.ConfigMap.Name
 	}
 	manifests.UpdateResourceTopologyExporterDaemonSet(
 		ret.DaemonSet, rteConfigMapName, options.PullIfNotPresent, options.NodeSelector)
@@ -124,9 +128,6 @@ func (mf Manifests) Update(options UpdateOptions) Manifests {
 		manifests.UpdateSecurityContextConstraint(ret.SecurityContextConstraint, ret.ServiceAccount)
 	}
 
-	if len(options.ConfigData) > 0 {
-		ret.ConfigMap = CreateConfigMap(ret.DaemonSet.Namespace, ret.DaemonSet.Name, options.ConfigData)
-	}
 	return ret
 }
 

diff --git a/pkg/manifests/updates.go b/pkg/manifests/updates.go
@@ -16,7 +16,7 @@ import (
 
 const (
 	metricsPort        = 2112
-	rteConfigMountName = "rte-config"
+	rteConfigMountName = "rte-config-volume"
 	RTEConfigMapName   = "rte-config"
 )