X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3fbea8f4814e1bbc6ec650576daf63f72d121250..caf81587353b5e490e01f7f45aef78aef0ef18c0:/lib/config/export.go

diff --git a/lib/config/export.go b/lib/config/export.go
index 25d1b7a2cb..b125d7dc91 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,
@@ -108,6 +113,7 @@ var whitelist = map[string]bool{
 	"Containers.SLURM":                             false,
 	"Containers.StaleLockTimeout":                  false,
 	"Containers.SupportedDockerImageFormats":       true,
+	"Containers.SupportedDockerImageFormats.*":     true,
 	"Containers.UsePreemptibleInstances":           true,
 	"EnableBetaController14287":                    false,
 	"Git":                                          false,