chore(storage-naming): update to storage api invocations in release_server and environment

pull/1092/head
fibonacci1729 9 years ago
parent ec1315cea6
commit 837d79a32c

@ -31,7 +31,6 @@ import (
"k8s.io/helm/pkg/kube" "k8s.io/helm/pkg/kube"
"k8s.io/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/proto/hapi/chart"
"k8s.io/helm/pkg/storage" "k8s.io/helm/pkg/storage"
"k8s.io/helm/pkg/storage/driver"
"k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/client/unversioned"
) )
@ -208,7 +207,7 @@ func New() *Environment {
return &Environment{ return &Environment{
EngineYard: ey, EngineYard: ey,
Releases: storage.Init(driver.NewMemory()), Releases: storage.Init(nil),
KubeClient: kube.New(nil), KubeClient: kube.New(nil),
} }
} }

@ -158,7 +158,7 @@ func (s *releaseServer) GetReleaseStatus(c ctx.Context, req *services.GetRelease
if req.Name == "" { if req.Name == "" {
return nil, errMissingRelease return nil, errMissingRelease
} }
rel, err := s.env.Releases.Get(req.Name) rel, err := s.env.Releases.Get(req.Name, req.Version)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -183,7 +183,7 @@ func (s *releaseServer) GetReleaseContent(c ctx.Context, req *services.GetReleas
if req.Name == "" { if req.Name == "" {
return nil, errMissingRelease return nil, errMissingRelease
} }
rel, err := s.env.Releases.Get(req.Name) rel, err := s.env.Releases.Get(req.Name, req.Version)
return &services.GetReleaseContentResponse{Release: rel}, err return &services.GetReleaseContentResponse{Release: rel}, err
} }
@ -250,7 +250,7 @@ func (s *releaseServer) prepareUpdate(req *services.UpdateReleaseRequest) (*rele
} }
// finds the non-deleted release with the given name // finds the non-deleted release with the given name
currentRelease, err := s.env.Releases.Get(req.Name) currentRelease, err := s.env.Releases.Get(req.Name, req.Version)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@ -302,7 +302,7 @@ func (s *releaseServer) uniqName(start string, reuse bool) (string, error) {
return "", fmt.Errorf("release name %q exceeds max length of %d", start, releaseNameMaxLen) return "", fmt.Errorf("release name %q exceeds max length of %d", start, releaseNameMaxLen)
} }
if rel, err := s.env.Releases.Get(start); err == driver.ErrReleaseNotFound { if rel, err := s.env.Releases.Get(start, 0); err == driver.ErrReleaseNotFound {
return start, nil return start, nil
} else if st := rel.Info.Status.Code; reuse && (st == release.Status_DELETED || st == release.Status_FAILED) { } else if st := rel.Info.Status.Code; reuse && (st == release.Status_DELETED || st == release.Status_FAILED) {
// Allowe re-use of names if the previous release is marked deleted. // Allowe re-use of names if the previous release is marked deleted.
@ -323,7 +323,7 @@ func (s *releaseServer) uniqName(start string, reuse bool) (string, error) {
log.Printf("info: Candidate name %q exceeds maximum length %d. Skipping.", name, releaseNameMaxLen) log.Printf("info: Candidate name %q exceeds maximum length %d. Skipping.", name, releaseNameMaxLen)
continue continue
} }
if _, err := s.env.Releases.Get(name); err == driver.ErrReleaseNotFound { if _, err := s.env.Releases.Get(name, 0); err == driver.ErrReleaseNotFound {
return name, nil return name, nil
} }
log.Printf("info: Name %q is taken. Searching again.", name) log.Printf("info: Name %q is taken. Searching again.", name)
@ -525,7 +525,7 @@ func (s *releaseServer) UninstallRelease(c ctx.Context, req *services.UninstallR
return nil, errMissingRelease return nil, errMissingRelease
} }
rel, err := s.env.Releases.Get(req.Name) rel, err := s.env.Releases.Get(req.Name, 0)
if err != nil { if err != nil {
log.Printf("uninstall: Release not loaded: %s", req.Name) log.Printf("uninstall: Release not loaded: %s", req.Name)
return nil, err return nil, err

Loading…
Cancel
Save