remove tools configuration (#214)

Author: chatton

pkg/automationconfig/automation_config.go

@@ -14,14 +14,13 @@ const (
 )
 
 type AutomationConfig struct {
-	Version      int                    `json:"version"`
-	Processes    []Process              `json:"processes"`
-	ReplicaSets  []ReplicaSet           `json:"replicaSets"`
-	Auth         Auth                   `json:"auth"`
-	TLS          TLS                    `json:"tls"`
-	Versions     []MongoDbVersionConfig `json:"mongoDbVersions"`
-	ToolsVersion ToolsVersion           `json:"mongoDbToolsVersion"`
-	Options      Options                `json:"options"`
+	Version     int                    `json:"version"`
+	Processes   []Process              `json:"processes"`
+	ReplicaSets []ReplicaSet           `json:"replicaSets"`
+	Auth        Auth                   `json:"auth"`
+	TLS         TLS                    `json:"tls"`
+	Versions    []MongoDbVersionConfig `json:"mongoDbVersions"`
+	Options     Options                `json:"options"`
 }
 
 type Process struct {

pkg/automationconfig/automation_config_builder.go

@@ -37,7 +37,6 @@ type Builder struct {
 	previousAC         AutomationConfig
 	// MongoDB installable versions
 	versions      []MongoDbVersionConfig
-	toolsVersion  ToolsVersion
 	modifications []Modification
 }
 
@@ -85,11 +84,6 @@ func (b *Builder) SetFCV(fcv string) *Builder {
 	return b
 }
 
-func (b *Builder) SetToolsVersion(version ToolsVersion) *Builder {
-	b.toolsVersion = version
-	return b
-}
-
 func (b *Builder) AddVersion(version MongoDbVersionConfig) *Builder {
 	for idx := range version.Builds {
 		if version.Builds[idx].Modules == nil {
@@ -153,10 +147,9 @@ func (b *Builder) Build() (AutomationConfig, error) {
 				ProtocolVersion: "1",
 			},
 		},
-		Versions:     b.versions,
-		ToolsVersion: b.toolsVersion,
-		Options:      Options{DownloadBase: "/var/lib/mongodb-mms-automation"},
-		Auth:         auth,
+		Versions: b.versions,
+		Options:  Options{DownloadBase: "/var/lib/mongodb-mms-automation"},
+		Auth:     auth,
 		TLS: TLS{
 			ClientCertificateMode: ClientCertificateModeOptional,
 		},

pkg/controller/mongodb/replica_set_controller.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/util/scale"
 
-	"github.com/mongodb/mongodb-kubernetes-operator/pkg/util/envvar"
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/util/status"
 
 	"github.com/pkg/errors"
@@ -65,7 +64,6 @@ const (
 	agentHealthStatusFilePathEnv = "AGENT_STATUS_FILEPATH"
 	mongodbImageEnv              = "MONGODB_IMAGE"
 	mongodbRepoUrl               = "MONGODB_REPO_URL"
-	mongodbToolsVersionEnv       = "MONGODB_TOOLS_VERSION"
 	headlessAgentEnv             = "HEADLESS_AGENT"
 	podNamespaceEnv              = "POD_NAMESPACE"
 	automationConfigEnv          = "AUTOMATION_CONFIG_MAP"
@@ -476,9 +474,7 @@ func buildAutomationConfig(mdb mdbv1.MongoDB, mdbVersionConfig automationconfig.
 		SetFCV(mdb.GetFCV()).
 		AddVersion(mdbVersionConfig).
 		AddModifications(getMongodConfigModification(mdb)).
-		AddModifications(modifications...).
-		SetToolsVersion(dummyToolsVersionConfig())
-
+		AddModifications(modifications...)
 	newAc, err := builder.Build()
 	if err != nil {
 		return automationconfig.AutomationConfig{}, err
@@ -487,21 +483,6 @@ func buildAutomationConfig(mdb mdbv1.MongoDB, mdbVersionConfig automationconfig.
 	return newAc, nil
 }
 
-// dummyToolsVersionConfig generates a dummy config for the tools settings in the automation config.
-// The agent will not uses any of these values but requires them to be set.
-// TODO: Remove this once the agent doesn't require any config: https://jira.mongodb.org/browse/CLOUDP-66024.
-func dummyToolsVersionConfig() automationconfig.ToolsVersion {
-	return automationconfig.ToolsVersion{
-		Version: envvar.GetEnvOrDefault(mongodbToolsVersionEnv, "100.1.0"),
-		URLs: map[string]map[string]string{
-			// The OS must be correctly set. Our Docker image uses Ubuntu 16.04.
-			"linux": {
-				"ubuntu1604": "https://dummy",
-			},
-		},
-	}
-}
-
 func readVersionManifestFromDisk() (automationconfig.VersionManifest, error) {
 	versionManifestBytes, err := ioutil.ReadFile(versionManifestFilePath)
 	if err != nil {