Merge branch '3.2' into 3.2-into-3.3

jack-w-shaw · Aug 14, 2023 · 56b2ae8 · 56b2ae8
2 parents a2ecdd4 + 7ccdfdb
commit 56b2ae8
Show file tree

Hide file tree

Showing 37 changed files with 93 additions and 421 deletions.
diff --git a/apiserver/facades/client/application/deployrepository.go b/apiserver/facades/client/application/deployrepository.go
@@ -608,8 +608,14 @@ func (v *deployFromRepositoryValidator) deducePlatform(arg params.DeployFromRepo
 		}
 	}
 	if argBase != nil {
-		platform.OS = argBase.Name
-		platform.Channel = argBase.Channel
+		base, err := corebase.ParseBase(argBase.Name, argBase.Channel)
+		if err != nil {
+			return corecharm.Platform{}, usedModelDefaultBase, err
+		}
+		platform.OS = base.OS
+		// platform channels don't model the concept of a risk
+		// so ensure that only the track is included
+		platform.Channel = base.Channel.Track
 	}
 
 	// Initial validation of platform from known data.
@@ -642,7 +648,9 @@ func (v *deployFromRepositoryValidator) deducePlatform(arg params.DeployFromRepo
 				return corecharm.Platform{}, usedModelDefaultBase, err
 			}
 			platform.OS = defaultBase.OS
-			platform.Channel = defaultBase.Channel.String()
+			// platform channels don't model the concept of a risk
+			// so ensure that only the track is included
+			platform.Channel = defaultBase.Channel.Track
 			usedModelDefaultBase = true
 		}
 	}

diff --git a/apiserver/facades/client/application/deployrepository_test.go b/apiserver/facades/client/application/deployrepository_test.go
@@ -593,6 +593,28 @@ func (s *validatorSuite) TestDeducePlatformSimple(c *gc.C) {
 	c.Assert(plat, gc.DeepEquals, corecharm.Platform{Architecture: "amd64"})
 }
 
+func (s *validatorSuite) TestDeducePlatformRiskInChannel(c *gc.C) {
+	defer s.setupMocks(c).Finish()
+	//model constraint default
+	s.state.EXPECT().ModelConstraints().Return(constraints.Value{Arch: strptr("amd64")}, nil)
+
+	arg := params.DeployFromRepositoryArg{
+		CharmName: "testme",
+		Base: &params.Base{
+			Name:    "ubuntu",
+			Channel: "22.10/stable",
+		},
+	}
+	plat, usedModelDefaultBase, err := s.getValidator().deducePlatform(arg)
+	c.Assert(err, gc.IsNil)
+	c.Assert(usedModelDefaultBase, jc.IsFalse)
+	c.Assert(plat, gc.DeepEquals, corecharm.Platform{
+		Architecture: "amd64",
+		OS:           "ubuntu",
+		Channel:      "22.10",
+	})
+}
+
 func (s *validatorSuite) TestDeducePlatformArgArchBase(c *gc.C) {
 	defer s.setupMocks(c).Finish()
 
@@ -635,7 +657,7 @@ func (s *validatorSuite) TestDeducePlatformModelDefaultBase(c *gc.C) {
 	c.Assert(plat, gc.DeepEquals, corecharm.Platform{
 		Architecture: "amd64",
 		OS:           "ubuntu",
-		Channel:      "22.04/stable",
+		Channel:      "22.04",
 	})
 }
 

diff --git a/cloudconfig/cloudinit/cloudinit_opensuse.go b/cloudconfig/cloudinit/cloudinit_opensuse.go
diff --git a/cloudconfig/cloudinit/interface.go b/cloudconfig/cloudinit/interface.go
@@ -447,17 +447,6 @@ func New(osname string, opts ...func(*cloudConfig)) (CloudConfig, error) {
 			cloudConfig: cfg,
 			helper:      centOSHelper{},
 		}, nil
-	case os.OpenSUSE:
-		cfg.paccmder = map[jujupackaging.PackageManagerName]commands.PackageCommander{
-			jujupackaging.ZypperPackageManager: commands.NewZypperPackageCommander(),
-		}
-		cfg.pacconfer = map[jujupackaging.PackageManagerName]config.PackagingConfigurer{
-			jujupackaging.ZypperPackageManager: config.NewZypperPackagingConfigurer(osname),
-		}
-		return &centOSCloudConfig{
-			cloudConfig: cfg,
-			helper:      openSUSEHelper{paccmder: commands.NewZypperPackageCommander()},
-		}, nil
 	default:
 		return nil, errors.NotFoundf("cloudconfig for os %q", osname)
 	}

diff --git a/cloudconfig/machinecloudconfig.go b/cloudconfig/machinecloudconfig.go
@@ -81,7 +81,7 @@ func NewMachineInitReaderFromConfig(cfg MachineInitReaderConfig) InitReader {
 // machine. It is sourced from both Cloud-Init and Curtin data.
 func (r *MachineInitReader) GetInitConfig() (map[string]interface{}, error) {
 	switch utilsos.OSTypeForName(r.config.Base.OS) {
-	case utilsos.Ubuntu, utilsos.CentOS, utilsos.OpenSUSE:
+	case utilsos.Ubuntu, utilsos.CentOS:
 		hostSeries, err := osseries.HostSeries()
 		series, err2 := corebase.GetSeriesFromBase(r.config.Base)
 		if err != nil || err2 != nil || series != hostSeries {

diff --git a/cloudconfig/machinecloudconfig_test.go b/cloudconfig/machinecloudconfig_test.go
@@ -83,12 +83,6 @@ var cloudinitDataVerifyTests = []cloudinitDataVerifyTest{
 		containerBase: corebase.MakeDefaultBase("centos", "7"),
 		result:        expectedResult,
 	},
-	{
-		description:   "centos8 on centos8",
-		machineBase:   corebase.MakeDefaultBase("centos", "8"),
-		containerBase: corebase.MakeDefaultBase("centos", "8"),
-		result:        expectedResult,
-	},
 }
 
 func (s *fromHostSuite) TestGetMachineCloudInitDataVerifySeries(c *gc.C) {

diff --git a/cloudconfig/userdatacfg.go b/cloudconfig/userdatacfg.go
@@ -72,8 +72,6 @@ func NewUserdataConfig(icfg *instancecfg.InstanceConfig, conf cloudinit.CloudCon
 		return &unixConfigure{base}, nil
 	case os.CentOS:
 		return &unixConfigure{base}, nil
-	case os.OpenSUSE:
-		return &unixConfigure{base}, nil
 	default:
 		return nil, errors.NotSupportedf("OS %s", icfg.Base.OS)
 	}
@@ -143,8 +141,6 @@ func SetUbuntuUser(conf cloudinit.CloudConfig, authorizedKeys string) {
 		groups = UbuntuGroups
 	case os.CentOS:
 		groups = CentOSGroups
-	case os.OpenSUSE:
-		groups = OpenSUSEGroups
 	}
 	conf.AddUser(&cloudinit.User{
 		Name:              "ubuntu",

diff --git a/cloudconfig/userdatacfg_test.go b/cloudconfig/userdatacfg_test.go
@@ -429,18 +429,6 @@ systemctl is-active firewalld &> /dev/null && systemctl stop firewalld || true
 sed -i "s/\^\.\*requiretty/#Defaults requiretty/" /etc/sudoers
 `,
 	},
-	// OpenSUSE non controller
-	{
-		cfg:               makeNormalConfig(corebase.MakeDefaultBase("opensuse", "opensuse42"), 0),
-		inexactMatch:      true,
-		upgradedToVersion: "1.2.3",
-		expectScripts: `
-systemctl is-enabled firewalld &> /dev/null && systemctl mask firewalld || true
-systemctl is-active firewalld &> /dev/null && systemctl stop firewalld || true
-sed -i "s/\^\.\*requiretty/#Defaults requiretty/" /etc/sudoers
-`,
-	},
-
 	// check that it works ok with compound machine ids.
 	{
 		cfg: makeNormalConfig(jammy, 0).mutate(func(cfg *testInstanceConfig) {
@@ -1418,14 +1406,3 @@ func (*cloudinitSuite) TestCloudInitBootstrapInitialSSHKeys(c *gc.C) {
 		`ssh-keygen -t ed25519 -N "" -f /etc/ssh/ssh_host_ed25519_key || true`,
 	})
 }
-
-func (*cloudinitSuite) TestSetUbuntuUserOpenSUSE(c *gc.C) {
-	ci, err := cloudinit.New("opensuse")
-	c.Assert(err, jc.ErrorIsNil)
-	cloudconfig.SetUbuntuUser(ci, "akey\n#also\nbkey")
-	data, err := ci.RenderYAML()
-	c.Assert(err, jc.ErrorIsNil)
-	keys := []string{"akey", "bkey"}
-	expected := expectedUbuntuUser(cloudconfig.OpenSUSEGroups, keys)
-	c.Assert(string(data), jc.YAMLEquals, expected)
-}
diff --git a/cloudconfig/userdatacfg_unix.go b/cloudconfig/userdatacfg_unix.go
@@ -125,10 +125,6 @@ var (
 	// CentOSGroups is the set of unix groups to add the "ubuntu" user to
 	// when initializing a CentOS system.
 	CentOSGroups = []string{"adm", "systemd-journal", "wheel"}
-
-	// OpenSUSEGroups is the set of unix groups to add the "ubuntu" user to
-	// when initializing a OpenSUSE system.
-	OpenSUSEGroups = []string{"users"}
 )
 
 type unixConfigure struct {
@@ -187,19 +183,6 @@ func (w *unixConfigure) ConfigureBasic() error {
 
 			`sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers`,
 		)
-	case os.OpenSUSE:
-		w.conf.AddScripts(
-			// Mask and stop firewalld, if enabled, so it cannot start. See
-			// http://pad.lv/1492066. firewalld might be missing, in which case
-			// is-enabled and is-active prints an error, which is why the output
-			// is suppressed.
-			"systemctl is-enabled firewalld &> /dev/null && systemctl mask firewalld || true",
-			"systemctl is-active firewalld &> /dev/null && systemctl stop firewalld || true",
-			`sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers`,
-			//Scripts assume ubuntu group for ubuntu user...
-			`(grep ubuntu /etc/group) || groupadd ubuntu`,
-			`usermod -g ubuntu -G ubuntu,users ubuntu`,
-		)
 	}
 	SetUbuntuUser(w.conf, w.icfg.AuthorizedKeys)
 
@@ -237,7 +220,7 @@ func (w *unixConfigure) ConfigureBasic() error {
 func (w *unixConfigure) setDataDirPermissions() string {
 	var user string
 	switch w.os {
-	case os.CentOS, os.OpenSUSE:
+	case os.CentOS:
 		user = "root"
 	default:
 		user = "syslog"

diff --git a/cmd/juju/application/deploy_test.go b/cmd/juju/application/deploy_test.go
@@ -152,7 +152,7 @@ func (s *DeploySuiteBase) SetUpTest(c *gc.C) {
 	s.PatchValue(&deployer.SupportedJujuSeries,
 		func(time.Time, string, string) (set.Strings, error) {
 			return set.NewStrings(
-				"centos7", "centos8", "centos9", "genericlinux", "kubernetes", "opensuseleap",
+				"centos7", "centos9", "genericlinux", "kubernetes",
 				"jammy", "focal", "jammy", "xenial",
 			), nil
 		},
@@ -1042,7 +1042,7 @@ func (s *CAASDeploySuiteBase) SetUpTest(c *gc.C) {
 	s.PatchValue(&deployer.SupportedJujuSeries,
 		func(time.Time, string, string) (set.Strings, error) {
 			return set.NewStrings(
-				"centos7", "centos8", "centos9", "genericlinux", "kubernetes", "opensuseleap",
+				"centos7", "centos9", "genericlinux", "kubernetes",
 				"jammy", "focal", "jammy", "xenial",
 			), nil
 		},
@@ -1483,7 +1483,7 @@ func (s *DeploySuite) setupNonESMBase(c *gc.C) (corebase.Base, string) {
 	s.PatchValue(&deployer.SupportedJujuSeries,
 		func(time.Time, string, string) (set.Strings, error) {
 			return set.NewStrings(
-				"centos7", "centos8", "centos9", "genericlinux", "kubernetes", "opensuseleap",
+				"centos7", "centos9", "genericlinux", "kubernetes",
 				"jammy", "focal", "jammy", "xenial",
 			), nil
 		},
@@ -1911,7 +1911,7 @@ func (s *DeployUnitTestSuite) SetUpTest(c *gc.C) {
 	s.PatchValue(&deployer.SupportedJujuSeries,
 		func(time.Time, string, string) (set.Strings, error) {
 			return set.NewStrings(
-				"centos7", "centos8", "centos9", "genericlinux", "kubernetes", "opensuseleap",
+				"centos7", "centos9", "genericlinux", "kubernetes",
 				"jammy", "focal", "jammy", "xenial",
 			), nil
 		},

diff --git a/cmd/juju/application/deployer/deployer_test.go b/cmd/juju/application/deployer/deployer_test.go
@@ -59,7 +59,7 @@ func (s *deployerSuite) SetUpTest(_ *gc.C) {
 	s.PatchValue(&SupportedJujuSeries,
 		func(time.Time, string, string) (set.Strings, error) {
 			return set.NewStrings(
-				"centos7", "centos8", "centos9", "genericlinux", "kubernetes", "opensuseleap",
+				"centos7", "centos9", "genericlinux", "kubernetes",
 				"jammy", "focal", "bionic", "xenial",
 			), nil
 		},

diff --git a/cmd/juju/application/export_test.go b/cmd/juju/application/export_test.go
@@ -249,7 +249,7 @@ func (s *RepoSuiteBaseSuite) SetUpTest(c *gc.C) {
 	s.PatchValue(&deployer.SupportedJujuSeries,
 		func(time.Time, string, string) (set.Strings, error) {
 			return set.NewStrings(
-				"centos7", "centos8", "centos9", "genericlinux", "kubernetes", "opensuseleap",
+				"centos7", "centos9", "genericlinux", "kubernetes",
 				"jammy", "focal", "bionic", "xenial",
 			), nil
 		},

diff --git a/cmd/juju/application/refresh_test.go b/cmd/juju/application/refresh_test.go
@@ -435,7 +435,7 @@ func (s *RefreshErrorsStateSuite) SetUpSuite(c *gc.C) {
 	s.PatchValue(&deployer.SupportedJujuSeries,
 		func(time.Time, string, string) (set.Strings, error) {
 			return set.NewStrings(
-				"centos7", "centos8", "centos9", "genericlinux", "kubernetes", "opensuseleap",
+				"centos7", "centos9", "genericlinux", "kubernetes",
 				"jammy", "focal", "bionic", "xenial",
 			), nil
 		},
@@ -565,7 +565,7 @@ func (s *RefreshSuccessStateSuite) SetUpTest(c *gc.C) {
 	s.PatchValue(&deployer.SupportedJujuSeries,
 		func(time.Time, string, string) (set.Strings, error) {
 			return set.NewStrings(
-				"centos7", "centos8", "centos9", "genericlinux", "kubernetes", "opensuseleap",
+				"centos7", "centos9", "genericlinux", "kubernetes",
 				"jammy", "focal", "bionic", "xenial",
 			), nil
 		},

diff --git a/cmd/juju/application/unexpose_test.go b/cmd/juju/application/unexpose_test.go
@@ -36,7 +36,7 @@ func (s *UnexposeSuite) SetUpTest(c *gc.C) {
 	s.PatchValue(&deployer.SupportedJujuSeries,
 		func(time.Time, string, string) (set.Strings, error) {
 			return set.NewStrings(
-				"centos7", "centos8", "centos9", "genericlinux", "kubernetes", "opensuseleap",
+				"centos7", "centos9", "genericlinux", "kubernetes",
 				"jammy", "focal", "bionic", "xenial",
 			), nil
 		},

diff --git a/cmd/juju/machine/upgrademachine_test.go b/cmd/juju/machine/upgrademachine_test.go
@@ -72,7 +72,7 @@ func (s *UpgradeMachineSuite) SetUpTest(c *gc.C) {
 	s.PatchValue(&machine.SupportedJujuSeries,
 		func(time.Time, string, string) (set.Strings, error) {
 			return set.NewStrings(
-				"centos7", "centos8", "centos9", "genericlinux", "kubernetes", "opensuseleap",
+				"centos7", "centos9", "genericlinux", "kubernetes",
 				"jammy", "focal", "bionic", "xenial",
 			), nil
 		},

diff --git a/container/lxd/image.go b/container/lxd/image.go
@@ -221,10 +221,6 @@ func constructBaseRemoteAlias(base jujubase.Base, arch string) (string, error) {
 				return "centos/9-Stream/cloud/amd64", nil
 			}
 		}
-	case jujuos.OpenSUSE:
-		if base.Channel.Track == "opensuse42" && arch == jujuarch.AMD64 {
-			return "opensuse/42.2/amd64", nil
-		}
 	}
 	return "", errors.NotSupportedf("base %q", base.DisplayString())
 }