Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #257 from mortenlj/master

Browse Source 
Skip writing manifest when using `--no-deploy`
This commit is contained in:
Darren Shepherd 2019-03-25 09:51:16 -07:00 committed by GitHub
commit 9a57e6fd0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/deploy/controller.go
View File

@ -35,14 +35,13 @@ const (
startKey = "_start_"
)
func WatchFiles(ctx context.Context, skips []string, bases ...string) error {
func WatchFiles(ctx context.Context, bases ...string) error {
server := norman.GetServer(ctx)
addons := v1.ClientsFrom(ctx).Addon
w := &watcher{
addonCache: addons.Cache(),
addons: addons,
skips: skips,
bases: bases,
restConfig: *server.Runtime.LocalConfig,
discovery: server.K8sClient.Discovery(),
@ -64,7 +63,6 @@ type watcher struct {
addonCache v1.AddonClientCache
addons v1.AddonClient
bases []string
skips []string
restConfig rest.Config
discovery discovery.DiscoveryInterface
clients map[schema.GroupVersionKind]*objectclient.ObjectClient
@ -107,9 +105,6 @@ func (w *watcher) listFilesIn(base string, force bool) error {
}
skips := map[string]bool{}
for _, skip := range w.skips {
skips[skip] = true
}
for _, file := range files {
if strings.HasSuffix(file.Name(), ".skip") {
skips[strings.TrimSuffix(file.Name(), ".skip")] = true

10
pkg/deploy/stage.go
View File

@ -9,10 +9,18 @@ import (
"path/filepath"
)
func Stage(dataDir string, templateVars map[string]string) error {
func Stage(dataDir string, templateVars map[string]string, skipList []string) error {
os.MkdirAll(dataDir, 0700)
skips := map[string]bool{}
for _, skip := range skipList {
skips[skip] = true
}
for _, name := range AssetNames() {
if skips[name] {
continue
}
content, err := Asset(name)
if err != nil {
return err

4
pkg/server/server.go
View File

@ -126,10 +126,10 @@ func startNorman(ctx context.Context, config *Config) (string, error) {
func(ctx context.Context) error {
dataDir := filepath.Join(controlConfig.DataDir, "manifests")
templateVars := map[string]string{"%{CLUSTER_DNS}%": controlConfig.ClusterDNS.String()}
if err := deploy.Stage(dataDir, templateVars); err != nil {
if err := deploy.Stage(dataDir, templateVars, controlConfig.Skips); err != nil {
return err
}
if err := deploy.WatchFiles(ctx, controlConfig.Skips, dataDir); err != nil {
if err := deploy.WatchFiles(ctx, dataDir); err != nil {
return err
}
return nil