mirror of https://github.com/helm/helm
Merge pull request #3966 from adamreese/dev-v3-local-repo
ref(*): remove local repository (dead code)pull/3976/head
commit
7bf0cb6c46
@ -1,29 +0,0 @@
|
|||||||
// +build !windows
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright 2017 The Kubernetes Authors All rights reserved.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"k8s.io/helm/pkg/helm/helmpath"
|
|
||||||
)
|
|
||||||
|
|
||||||
func createLink(indexFile, cacheFile string, home helmpath.Home) error {
|
|
||||||
return os.Symlink(indexFile, cacheFile)
|
|
||||||
}
|
|
@ -1,29 +0,0 @@
|
|||||||
// +build windows
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright 2017 The Kubernetes Authors All rights reserved.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"k8s.io/helm/pkg/helm/helmpath"
|
|
||||||
)
|
|
||||||
|
|
||||||
func createLink(indexFile, cacheFile string, home helmpath.Home) error {
|
|
||||||
return os.Link(indexFile, cacheFile)
|
|
||||||
}
|
|
@ -1,137 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2016 The Kubernetes Authors All rights reserved.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package repo
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
htemplate "html/template"
|
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/ghodss/yaml"
|
|
||||||
|
|
||||||
"k8s.io/helm/pkg/chartutil"
|
|
||||||
"k8s.io/helm/pkg/hapi/chart"
|
|
||||||
"k8s.io/helm/pkg/provenance"
|
|
||||||
)
|
|
||||||
|
|
||||||
const indexHTMLTemplate = `
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>Helm Repository</title>
|
|
||||||
</head>
|
|
||||||
<h1>Helm Charts Repository</h1>
|
|
||||||
<ul>
|
|
||||||
{{range $name, $ver := .Index.Entries}}
|
|
||||||
<li>{{$name}}<ul>{{range $ver}}
|
|
||||||
<li><a href="{{index .URLs 0}}">{{.Name}}-{{.Version}}</a></li>
|
|
||||||
{{end}}</ul>
|
|
||||||
</li>
|
|
||||||
{{end}}
|
|
||||||
</ul>
|
|
||||||
<body>
|
|
||||||
<p>Last Generated: {{.Index.Generated}}</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
`
|
|
||||||
|
|
||||||
// RepositoryServer is an HTTP handler for serving a chart repository.
|
|
||||||
type RepositoryServer struct {
|
|
||||||
RepoPath string
|
|
||||||
}
|
|
||||||
|
|
||||||
// ServeHTTP implements the http.Handler interface.
|
|
||||||
func (s *RepositoryServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
||||||
uri := r.URL.Path
|
|
||||||
switch uri {
|
|
||||||
case "/", "/charts/", "/charts/index.html", "/charts/index":
|
|
||||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
|
||||||
s.htmlIndex(w, r)
|
|
||||||
default:
|
|
||||||
file := strings.TrimPrefix(uri, "/charts/")
|
|
||||||
http.ServeFile(w, r, filepath.Join(s.RepoPath, file))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// StartLocalRepo starts a web server and serves files from the given path
|
|
||||||
func StartLocalRepo(path, address string) error {
|
|
||||||
if address == "" {
|
|
||||||
address = "127.0.0.1:8879"
|
|
||||||
}
|
|
||||||
s := &RepositoryServer{RepoPath: path}
|
|
||||||
return http.ListenAndServe(address, s)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *RepositoryServer) htmlIndex(w http.ResponseWriter, r *http.Request) {
|
|
||||||
t := htemplate.Must(htemplate.New("index.html").Parse(indexHTMLTemplate))
|
|
||||||
// load index
|
|
||||||
lrp := filepath.Join(s.RepoPath, "index.yaml")
|
|
||||||
i, err := LoadIndexFile(lrp)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, err.Error(), 500)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
data := map[string]interface{}{
|
|
||||||
"Index": i,
|
|
||||||
}
|
|
||||||
if err := t.Execute(w, data); err != nil {
|
|
||||||
fmt.Fprintf(w, "Template error: %s", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddChartToLocalRepo saves a chart in the given path and then reindexes the index file
|
|
||||||
func AddChartToLocalRepo(ch *chart.Chart, path string) error {
|
|
||||||
_, err := chartutil.Save(ch, path)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return Reindex(ch, path+"/index.yaml")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reindex adds an entry to the index file at the given path
|
|
||||||
func Reindex(ch *chart.Chart, path string) error {
|
|
||||||
name := ch.Metadata.Name + "-" + ch.Metadata.Version
|
|
||||||
y, err := LoadIndexFile(path)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
found := false
|
|
||||||
for k := range y.Entries {
|
|
||||||
if k == name {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !found {
|
|
||||||
dig, err := provenance.DigestFile(path)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
y.Add(ch.Metadata, name+".tgz", "http://127.0.0.1:8879/charts", "sha256:"+dig)
|
|
||||||
|
|
||||||
out, err := yaml.Marshal(y)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
ioutil.WriteFile(path, out, 0644)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
@ -1,67 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2016 The Kubernetes Authors All rights reserved.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package repo
|
|
||||||
|
|
||||||
import (
|
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestRepositoryServer(t *testing.T) {
|
|
||||||
expectedIndexYAML, err := ioutil.ReadFile("testdata/server/index.yaml")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
path string
|
|
||||||
expect string
|
|
||||||
}{
|
|
||||||
{"index YAML", "/charts/index.yaml", string(expectedIndexYAML)},
|
|
||||||
{"index HTML", "/charts/index.html", "<html>"},
|
|
||||||
{"charts root", "/charts/", "<html>"},
|
|
||||||
{"root", "/", "<html>"},
|
|
||||||
{"file", "/test.txt", "Hello World"},
|
|
||||||
}
|
|
||||||
|
|
||||||
s := &RepositoryServer{RepoPath: "testdata/server"}
|
|
||||||
srv, err := startLocalServerForTests(s)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
defer srv.Close()
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
res, err := http.Get(srv.URL + tt.path)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("%s: error getting %s: %s", tt.name, tt.path, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
body, err := ioutil.ReadAll(res.Body)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("%s: error reading %s: %s", tt.name, tt.path, err)
|
|
||||||
}
|
|
||||||
res.Body.Close()
|
|
||||||
if !strings.Contains(string(body), tt.expect) {
|
|
||||||
t.Errorf("%s: expected to find %q in %q", tt.name, tt.expect, string(body))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in new issue