X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d71c797d3bbfd26d571fb46a14262b5c01b95ff4..8b873a9b3b8865a4d451263e48b49122b9c32759:/lib/config/export.go

diff --git a/lib/config/export.go b/lib/config/export.go
index cdc8539f10..a0be827f04 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -26,6 +26,10 @@ func ExportJSON(w io.Writer, cluster *arvados.Cluster) error {
 	if err != nil {
 		return err
 	}
+
+	// ClusterID is not marshalled by default (see `json:"-"`).
+	// Add it back here so it is included in the exported config.
+	m["ClusterID"] = cluster.ClusterID
 	err = redactUnsafe(m, "", "")
 	if err != nil {
 		return err
@@ -55,6 +59,7 @@ func ExportJSON(w io.Writer, cluster *arvados.Cluster) error {
 // exists.
 var whitelist = map[string]bool{
 	// | sort -t'"' -k2,2
+	"ClusterID":                                    true,
 	"API":                                          true,
 	"API.AsyncPermissionsUpdateInterval":           false,
 	"API.DisabledAPIs":                             false,
@@ -92,13 +97,8 @@ var whitelist = map[string]bool{
 	"Containers.DefaultKeepCacheRAM":               true,
 	"Containers.DispatchPrivateKey":                false,
 	"Containers.JobsAPI":                           true,
-	"Containers.JobsAPI.CrunchJobUser":             false,
-	"Containers.JobsAPI.CrunchJobWrapper":          false,
-	"Containers.JobsAPI.CrunchRefreshTrigger":      false,
-	"Containers.JobsAPI.DefaultDockerImage":        false,
 	"Containers.JobsAPI.Enable":                    true,
 	"Containers.JobsAPI.GitInternalDir":            false,
-	"Containers.JobsAPI.ReuseJobIfOutputsDiffer":   false,
 	"Containers.Logging":                           false,
 	"Containers.LogReuseDecisions":                 false,
 	"Containers.MaxComputeVMs":                     false,