diff --git a/apiserver/facades/controller/caasoperatorprovisioner/provisioner.go b/apiserver/facades/controller/caasoperatorprovisioner/provisioner.go index 15f37544f75..f9be753cc67 100644 --- a/apiserver/facades/controller/caasoperatorprovisioner/provisioner.go +++ b/apiserver/facades/controller/caasoperatorprovisioner/provisioner.go @@ -23,7 +23,6 @@ import ( "github.com/juju/juju/state/watcher" "github.com/juju/juju/storage" "github.com/juju/juju/storage/poolmanager" - "github.com/juju/juju/version" ) type API struct { @@ -114,7 +113,7 @@ func (a *API) OperatorProvisioningInfo() (params.OperatorProvisioningInfo, error ) } - imagePath := podcfg.GetJujuOCIImagePath(cfg, vers.ToPatch(), version.OfficialBuild) + imagePath := podcfg.GetJujuOCIImagePath(cfg, vers.ToPatch(), 0) storageClassName, _ := modelConfig.AllAttrs()[provider.OperatorStorageKey].(string) if storageClassName == "" { return params.OperatorProvisioningInfo{}, errors.New("no operator storage class defined") diff --git a/apiserver/facades/controller/caasoperatorprovisioner/provisioner_test.go b/apiserver/facades/controller/caasoperatorprovisioner/provisioner_test.go index d61fda8b282..a4262e2ac0e 100644 --- a/apiserver/facades/controller/caasoperatorprovisioner/provisioner_test.go +++ b/apiserver/facades/controller/caasoperatorprovisioner/provisioner_test.go @@ -133,7 +133,7 @@ func (s *CAASProvisionerSuite) TestOperatorProvisioningInfoDefault(c *gc.C) { result, err := s.api.OperatorProvisioningInfo() c.Assert(err, jc.ErrorIsNil) c.Assert(result, jc.DeepEquals, params.OperatorProvisioningInfo{ - ImagePath: "jujusolutions/jujud-operator:2.6-beta3.666", + ImagePath: "jujusolutions/jujud-operator:2.6-beta3", Version: version.MustParse("2.6-beta3"), APIAddresses: []string{"10.0.0.1:1"}, Tags: map[string]string{ @@ -159,7 +159,7 @@ func (s *CAASProvisionerSuite) TestOperatorProvisioningInfo(c *gc.C) { result, err := s.api.OperatorProvisioningInfo() c.Assert(err, jc.ErrorIsNil) c.Assert(result, jc.DeepEquals, params.OperatorProvisioningInfo{ - ImagePath: s.st.operatorRepo + "/jujud-operator:" + "2.6-beta3.666", + ImagePath: s.st.operatorRepo + "/jujud-operator:" + "2.6-beta3", Version: version.MustParse("2.6-beta3"), APIAddresses: []string{"10.0.0.1:1"}, Tags: map[string]string{ @@ -186,7 +186,7 @@ func (s *CAASProvisionerSuite) TestOperatorProvisioningInfoNoStoragePool(c *gc.C result, err := s.api.OperatorProvisioningInfo() c.Assert(err, jc.ErrorIsNil) c.Assert(result, jc.DeepEquals, params.OperatorProvisioningInfo{ - ImagePath: s.st.operatorRepo + "/jujud-operator:" + "2.6-beta3.666", + ImagePath: s.st.operatorRepo + "/jujud-operator:" + "2.6-beta3", Version: version.MustParse("2.6-beta3"), APIAddresses: []string{"10.0.0.1:1"}, Tags: map[string]string{ diff --git a/apiserver/facades/controller/caasunitprovisioner/provisioner.go b/apiserver/facades/controller/caasunitprovisioner/provisioner.go index ed5f6f2141a..f17d6bc684d 100644 --- a/apiserver/facades/controller/caasunitprovisioner/provisioner.go +++ b/apiserver/facades/controller/caasunitprovisioner/provisioner.go @@ -31,7 +31,6 @@ import ( "github.com/juju/juju/state/watcher" "github.com/juju/juju/storage" "github.com/juju/juju/storage/poolmanager" - "github.com/juju/juju/version" ) var logger = loggo.GetLogger("juju.apiserver.controller.caasunitprovisioner") @@ -277,7 +276,7 @@ func (f *Facade) provisioningInfo(model Model, tagString string) (*params.Kubern fmt.Sprintf("agent version is missing in model config %q", modelConfig.Name()), ) } - operatorImagePath := podcfg.GetJujuOCIImagePath(controllerCfg, vers.ToPatch(), version.OfficialBuild) + operatorImagePath := podcfg.GetJujuOCIImagePath(controllerCfg, vers.ToPatch(), 0) filesystemParams, err := f.applicationFilesystemParams(app, controllerCfg, modelConfig) if err != nil { diff --git a/apiserver/facades/controller/caasunitprovisioner/provisioner_test.go b/apiserver/facades/controller/caasunitprovisioner/provisioner_test.go index c56ab7d9197..23c78200248 100644 --- a/apiserver/facades/controller/caasunitprovisioner/provisioner_test.go +++ b/apiserver/facades/controller/caasunitprovisioner/provisioner_test.go @@ -202,7 +202,7 @@ func (s *CAASProvisionerSuite) TestProvisioningInfo(c *gc.C) { DeploymentType: "stateful", ServiceType: "loadbalancer", }, - OperatorImagePath: fmt.Sprintf("jujusolutions/jujud-operator:%s", jujuversion.Current.String()+".666"), + OperatorImagePath: fmt.Sprintf("jujusolutions/jujud-operator:%s", jujuversion.Current.String()), Devices: []params.KubernetesDeviceParams{ { Type: "nvidia.com/gpu", diff --git a/caas/kubernetes/provider/bootstrap_test.go b/caas/kubernetes/provider/bootstrap_test.go index 456e5630664..f241a7f1c6f 100644 --- a/caas/kubernetes/provider/bootstrap_test.go +++ b/caas/kubernetes/provider/bootstrap_test.go @@ -560,7 +560,7 @@ func (s *bootstrapSuite) TestBootstrap(c *gc.C) { { Name: "api-server", ImagePullPolicy: core.PullIfNotPresent, - Image: "jujusolutions/jujud-operator:" + jujuversion.Current.String() + ".666", + Image: "jujusolutions/jujud-operator:" + jujuversion.Current.String(), Command: []string{ "/bin/sh", }, diff --git a/cloudconfig/podcfg/image.go b/cloudconfig/podcfg/image.go index b579c3b0bd1..44dbc5c1d13 100644 --- a/cloudconfig/podcfg/image.go +++ b/cloudconfig/podcfg/image.go @@ -20,7 +20,7 @@ const ( // GetControllerImagePath returns oci image path of jujud for a controller. func (cfg *ControllerPodConfig) GetControllerImagePath() string { - return GetJujuOCIImagePath(cfg.Controller.Config, cfg.JujuVersion, cfg.OfficialBuild) + return GetJujuOCIImagePath(cfg.Controller.Config, cfg.JujuVersion, 0) } // GetJujuDbOCIImagePath returns the juju-db oci image path. diff --git a/cloudconfig/podcfg/podcfg_test.go b/cloudconfig/podcfg/podcfg_test.go index 876145fd6a9..e4f513f9973 100644 --- a/cloudconfig/podcfg/podcfg_test.go +++ b/cloudconfig/podcfg/podcfg_test.go @@ -66,7 +66,7 @@ func (*podcfgSuite) TestOperatorImagesDefaultRepo(c *gc.C) { c.Assert(err, jc.ErrorIsNil) podConfig.JujuVersion = version.MustParse("6.6.6") podConfig.OfficialBuild = 666 - c.Assert(podConfig.GetControllerImagePath(), gc.Equals, "jujusolutions/jujud-operator:6.6.6.666") + c.Assert(podConfig.GetControllerImagePath(), gc.Equals, "jujusolutions/jujud-operator:6.6.6") c.Assert(podConfig.GetJujuDbOCIImagePath(), gc.Equals, "jujusolutions/juju-db:4.0") } @@ -82,7 +82,7 @@ func (*podcfgSuite) TestOperatorImagesCustomRepo(c *gc.C) { c.Assert(err, jc.ErrorIsNil) podConfig.JujuVersion = version.MustParse("6.6.6") podConfig.OfficialBuild = 666 - c.Assert(podConfig.GetControllerImagePath(), gc.Equals, "path/to/my/repo/jujud-operator:6.6.6.666") + c.Assert(podConfig.GetControllerImagePath(), gc.Equals, "path/to/my/repo/jujud-operator:6.6.6") c.Assert(podConfig.GetJujuDbOCIImagePath(), gc.Equals, "path/to/my/repo/juju-db:4.0") }