For older machine agents, there needs to be a symlink for the series …

…based tools
sdg0919 · Sep 30, 2021 · 2576744 · 2576744
1 parent e35ba7d
commit 2576744
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 8 deletions.
diff --git a/cloudconfig/userdatacfg_test.go b/cloudconfig/userdatacfg_test.go
@@ -40,6 +40,7 @@ import (
 	jujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/testing"
 	"github.com/juju/juju/tools"
+	"github.com/juju/os/v2/series"
 )
 
 type cloudinitSuite struct {
@@ -97,7 +98,7 @@ type testInstanceConfig instancecfg.InstanceConfig
 
 // makeTestConfig returns a minimal instance config for a non state
 // server machine (unless bootstrap is true) for the given series.
-func makeTestConfig(series string, bootstrap bool, build int) *testInstanceConfig {
+func makeTestConfig(series string, bootstrap bool, vers version.Number, build int) *testInstanceConfig {
 	const defaultMachineID = "99"
 
 	cfg := new(testInstanceConfig)
@@ -117,7 +118,7 @@ func makeTestConfig(series string, bootstrap bool, build int) *testInstanceConfi
 		ModelTag: testing.ModelTag,
 	}
 	cfg.setMachineID(defaultMachineID)
-	cfg.setSeries(series, build)
+	cfg.setSeries(series, vers, build)
 	if bootstrap {
 		return cfg.setController()
 	} else {
@@ -144,13 +145,13 @@ func makeTestConfig(series string, bootstrap bool, build int) *testInstanceConfi
 
 // makeBootstrapConfig is a shortcut to call makeTestConfig(series, true).
 func makeBootstrapConfig(series string, build int) *testInstanceConfig {
-	return makeTestConfig(series, true, build)
+	return makeTestConfig(series, true, version.MustParse("1.2.3"), build)
 }
 
 // makeNormalConfig is a shortcut to call makeTestConfig(series,
 // false).
 func makeNormalConfig(series string, build int) *testInstanceConfig {
-	return makeTestConfig(series, false, build)
+	return makeTestConfig(series, false, version.MustParse("1.2.3"), build)
 }
 
 // setMachineID updates MachineId, MachineAgentServiceName,
@@ -196,13 +197,13 @@ func (cfg *testInstanceConfig) setEnableOSUpdateAndUpgrade(updateEnabled, upgrad
 
 // setSeries sets the series-specific fields (Tools, Release, DataDir,
 // LogDir, and CloudInitOutputLog) to match the given series.
-func (cfg *testInstanceConfig) setSeries(series string, build int) *testInstanceConfig {
+func (cfg *testInstanceConfig) setSeries(series string, vers version.Number, build int) *testInstanceConfig {
 	osType := coreseries.DefaultOSTypeNameFromSeries(series)
 	ver := ""
 	if build > 0 {
-		ver = fmt.Sprintf("1.2.3.%d-%s-amd64", build, osType)
+		ver = fmt.Sprintf("%s.%d-%s-amd64", vers.String(), build, osType)
 	} else {
-		ver = fmt.Sprintf("1.2.3-%s-amd64", osType)
+		ver = fmt.Sprintf("%s-%s-amd64", vers.String(), osType)
 	}
 	err := ((*instancecfg.InstanceConfig)(cfg)).SetTools(tools.List{
 		newSimpleTools(ver),
@@ -586,6 +587,22 @@ printf '%s\\n' '.*custom-image-metadata:.*us-east1.*.*' > '/var/lib/juju/bootstr
 		expectScripts: `
 install -D -m 644 /dev/null '.*publicsimplestreamskey'
 printf '%s\\n' 'publickey' > '.*publicsimplestreamskey'
+`,
+	},
+
+	// check that for older 2.8 agents the series tools is symlinked.
+	{
+		cfg: makeTestConfig("bionic", false, version.MustParse("2.8.0"), 0).mutate(func(cfg *testInstanceConfig) {
+		}).setMachineID("1"),
+		inexactMatch:      true,
+		upgradedToVersion: "2.8.0",
+		expectScripts: `
+sha256sum \$bin/tools.tar.gz > \$bin/juju2.8.0-ubuntu-amd64.sha256
+grep '1234' \$bin/juju2.8.0-ubuntu-amd64.sha256 .*
+tar zxf \$bin/tools.tar.gz -C \$bin
+ln -s \$bin /var/lib/juju/tools/2.8.0-bionic-amd64
+printf %s '{"version":"2.8.0-ubuntu-amd64".*
+mkdir -p '/var/lib/juju/agents/machine-1'
 `,
 	},
 }
@@ -641,7 +658,8 @@ func getStateInitializationParams(c *gc.C, scripts []string) instancecfg.StateIn
 
 // TestCloudInit checks that the output from the various tests
 // in cloudinitTests is well formed.
-func (*cloudinitSuite) TestCloudInit(c *gc.C) {
+func (s *cloudinitSuite) TestCloudInit(c *gc.C) {
+	s.PatchValue(&series.HostSeries, func() (string, error) { return "bionic", nil })
 	for i, test := range cloudinitTests {
 
 		c.Logf("test %d", i)

diff --git a/cloudconfig/userdatacfg_unix.go b/cloudconfig/userdatacfg_unix.go
@@ -23,12 +23,14 @@ import (
 	"github.com/juju/version/v2"
 
 	"github.com/juju/juju/agent"
+	agenttools "github.com/juju/juju/agent/tools"
 	"github.com/juju/juju/cloudconfig/cloudinit"
 	"github.com/juju/juju/core/os"
 	"github.com/juju/juju/environs/simplestreams"
 	"github.com/juju/juju/juju/osenv"
 	"github.com/juju/juju/service"
 	"github.com/juju/juju/service/upstart"
+	"github.com/juju/os/v2/series"
 )
 
 var logger = loggo.GetLogger("juju.cloudconfig")
@@ -581,6 +583,21 @@ func (w *unixConfigure) addDownloadToolsCmds() error {
 		"tar zxf $bin/tools.tar.gz -C $bin",
 	)
 
+	// When adding a machine to a 2.8 or earlier model on a 2.9 controller,
+	// we need to add a symlink named after the series so that the 2.x agent
+	// can still find the binaries when deploying units.
+	if vers := w.icfg.AgentVersion(); vers.Major == 2 && vers.Minor <= 8 {
+		hostSeries, err := series.HostSeries()
+		if err != nil {
+			return err
+		}
+		legacyVers := w.icfg.AgentVersion()
+		legacyVers.Release = hostSeries
+		w.conf.AddScripts(
+			fmt.Sprintf("ln -s $bin %s", agenttools.SharedToolsDir(w.icfg.DataDir, legacyVers)),
+		)
+	}
+
 	toolsJson, err := json.Marshal(tools)
 	if err != nil {
 		return err