Merge branch 'master' into 14716-webdav-cluster-config

[arvados.git] / lib / config / export.go

diff --git a/lib/config/export.go b/lib/config/export.go
index 1cb84a2a18fb2e20de823f806d8f75aca261e7a7..a0be827f040e61dd8052def574a589404fab216d 100644 (file)
--- 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,
@@ -65,7 +70,7 @@ var whitelist = map[string]bool{
        "API.RailsSessionSecretToken":                  false,
        "API.RequestTimeout":                           true,
        "API.WebsocketClientEventQueue":                false,
-       "API.WebsocketKeepaliveTimeout":                true,
+       "API.SendTimeout":                              true,
        "API.WebsocketServerEventQueue":                false,
        "AuditLogs":                                    false,
        "AuditLogs.MaxAge":                             false,
@@ -84,6 +89,7 @@ var whitelist = map[string]bool{
        "Collections.PreserveVersionIfIdle":            true,
        "Collections.TrashSweepInterval":               false,
        "Collections.TrustAllContent":                  false,
+       "Collections.WebDAVCache":                      false,
        "Containers":                                   true,
        "Containers.CloudVMs":                          false,
        "Containers.CrunchRunCommand":                  false,
@@ -91,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,
@@ -108,6 +109,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,