Add static pod support to mesos scheduler and executor.
- the mesos scheduler gets a --static-pods-config parameter with a directory with pods specs. They are zipped and sent over to newly started mesos executors. - the mesos executor receives the zipper static pod config via ExecutorInfo.Data and starts up the pods via the kubelet FileSource mechanism. - both - the scheduler and the executor side - are fully unit tested
This commit is contained in:

committed by
James DeFelice

parent
188f52a090
commit
7af8bf6ed3
19
contrib/mesos/pkg/archive/doc.go
Normal file
19
contrib/mesos/pkg/archive/doc.go
Normal file
@@ -0,0 +1,19 @@
|
||||
/*
|
||||
Copyright 2015 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 archive provides utilities to archive and unarchive filesystem
|
||||
// hierarchies.
|
||||
package archive
|
137
contrib/mesos/pkg/archive/zip.go
Normal file
137
contrib/mesos/pkg/archive/zip.go
Normal file
@@ -0,0 +1,137 @@
|
||||
/*
|
||||
Copyright 2015 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 archive
|
||||
|
||||
import (
|
||||
"archive/zip"
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
)
|
||||
|
||||
// ZipWalker returns a filepath.WalkFunc that adds every filesystem node
|
||||
// to the given *zip.Writer.
|
||||
func ZipWalker(zw *zip.Writer) filepath.WalkFunc {
|
||||
var base string
|
||||
return func(path string, info os.FileInfo, err error) error {
|
||||
if base == "" {
|
||||
base = path
|
||||
}
|
||||
|
||||
header, err := zip.FileInfoHeader(info)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if header.Name, err = filepath.Rel(base, path); err != nil {
|
||||
return err
|
||||
} else if info.IsDir() {
|
||||
header.Name = header.Name + string(filepath.Separator)
|
||||
} else {
|
||||
header.Method = zip.Deflate
|
||||
}
|
||||
|
||||
w, err := zw.CreateHeader(header)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if info.IsDir() {
|
||||
return nil
|
||||
}
|
||||
|
||||
f, err := os.Open(path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = io.Copy(w, f)
|
||||
f.Close()
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// Create a zip of all files in a directory recursively, return a byte array and
|
||||
// the number of files archived.
|
||||
func ZipDir(path string) ([]byte, int, error) {
|
||||
var buf bytes.Buffer
|
||||
zw := zip.NewWriter(&buf)
|
||||
zipWalker := ZipWalker(zw)
|
||||
numberManifests := 0
|
||||
err := filepath.Walk(path, filepath.WalkFunc(func(path string, info os.FileInfo, err error) error {
|
||||
if !info.IsDir() {
|
||||
numberManifests++
|
||||
}
|
||||
return zipWalker(path, info, err)
|
||||
}))
|
||||
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
} else if err = zw.Close(); err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
return buf.Bytes(), numberManifests, nil
|
||||
}
|
||||
|
||||
// UnzipDir unzips all files from a given zip byte array into a given directory.
|
||||
// The directory is created if it does not exist yet.
|
||||
func UnzipDir(data []byte, destPath string) error {
|
||||
// open zip
|
||||
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
|
||||
if err != nil {
|
||||
return fmt.Errorf("Unzip archive read error: %v", err)
|
||||
}
|
||||
|
||||
for _, file := range zr.File {
|
||||
// skip directories
|
||||
if file.FileInfo().IsDir() {
|
||||
continue
|
||||
}
|
||||
|
||||
// open file
|
||||
rc, err := file.Open()
|
||||
defer rc.Close()
|
||||
if err != nil {
|
||||
return fmt.Errorf("Unzip file read error: %v", err)
|
||||
}
|
||||
|
||||
// make sure the directory of the file exists, otherwise create
|
||||
destPath := filepath.Clean(filepath.Join(destPath, file.Name))
|
||||
destBasedir := path.Dir(destPath)
|
||||
err = os.MkdirAll(destBasedir, 0755)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Unzip mkdir error: %v", err)
|
||||
}
|
||||
|
||||
// create file
|
||||
f, err := os.Create(destPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Unzip file creation error: %v", err)
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
// write file
|
||||
if _, err := io.Copy(f, rc); err != nil {
|
||||
return fmt.Errorf("Unzip file write error: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
66
contrib/mesos/pkg/archive/zip_test.go
Normal file
66
contrib/mesos/pkg/archive/zip_test.go
Normal file
@@ -0,0 +1,66 @@
|
||||
/*
|
||||
Copyright 2015 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 archive
|
||||
|
||||
import (
|
||||
"archive/zip"
|
||||
"bytes"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestZipWalker(t *testing.T) {
|
||||
dir, err := ioutil.TempDir(os.TempDir(), "")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
tree := map[string]string{"a/b/c": "12345", "a/b/d": "54321", "a/e": "00000"}
|
||||
for path, content := range tree {
|
||||
path = filepath.Join(dir, path)
|
||||
if err := os.MkdirAll(filepath.Dir(path), os.ModeTemporary|0700); err != nil {
|
||||
t.Fatal(err)
|
||||
} else if err = ioutil.WriteFile(path, []byte(content), 0700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
zw := zip.NewWriter(&buf)
|
||||
if err := filepath.Walk(dir, ZipWalker(zw)); err != nil {
|
||||
t.Fatal(err)
|
||||
} else if err = zw.Close(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
zr, err := zip.NewReader(bytes.NewReader(buf.Bytes()), int64(buf.Len()))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
for _, file := range zr.File {
|
||||
if rc, err := file.Open(); err != nil {
|
||||
t.Fatal(err)
|
||||
} else if got, err := ioutil.ReadAll(rc); err != nil {
|
||||
t.Error(err)
|
||||
} else if want := []byte(tree[file.Name]); !bytes.Equal(got, want) {
|
||||
t.Errorf("%s\ngot: %s\nwant: %s", file.Name, got, want)
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user