Skip to content

Avoid to apply PipeCD config file #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pipecd-bot merged 3 commits into from
Aug 5, 2020
Merged

Avoid to apply PipeCD config file #582

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b88524a
Avoid to apply PipeCD config file
nakabonne Aug 5, 2020
fc4ab27
Use config file name
nakabonne Aug 5, 2020
9aed817
Remove unused ctx
nakabonne Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions pkg/app/piped/cloudprovider/kubernetes/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,12 @@ var (
)

type provider struct {
appName string
appDir string
repoDir string
input config.KubernetesDeploymentInput
logger *zap.Logger
appName string
appDir string
repoDir string
configFileName string
input config.KubernetesDeploymentInput
logger *zap.Logger

kubectl *Kubectl
kustomize *Kustomize
Expand All @@ -111,18 +112,19 @@ func initSharedGitClient(logger *zap.Logger) error {
return err
}

func NewProvider(appName, appDir, repoDir string, input config.KubernetesDeploymentInput, logger *zap.Logger) Provider {
func NewProvider(appName, appDir, repoDir, configFileName string, input config.KubernetesDeploymentInput, logger *zap.Logger) Provider {
return &provider{
appName: appName,
appDir: appDir,
repoDir: repoDir,
input: input,
logger: logger.Named("kubernetes-provider"),
appName: appName,
appDir: appDir,
repoDir: repoDir,
configFileName: configFileName,
input: input,
logger: logger.Named("kubernetes-provider"),
}
}

func NewManifestLoader(appName, appDir, repoDir string, input config.KubernetesDeploymentInput, logger *zap.Logger) ManifestLoader {
return NewProvider(appName, appDir, repoDir, input, logger)
func NewManifestLoader(appName, appDir, repoDir, configFileName string, input config.KubernetesDeploymentInput, logger *zap.Logger) ManifestLoader {
return NewProvider(appName, appDir, repoDir, configFileName, input, logger)
}

func (p *provider) init(ctx context.Context) {
Expand Down Expand Up @@ -195,7 +197,7 @@ func (p *provider) LoadManifests(ctx context.Context) (manifests []Manifest, err
manifests, err = ParseManifests(data)

case TemplatingMethodNone:
manifests, err = LoadPlainYAMLManifests(ctx, p.appDir, p.input.Manifests)
manifests, err = LoadPlainYAMLManifests(ctx, p.appDir, p.input.Manifests, p.configFileName)

default:
err = fmt.Errorf("unsupport templating method %v", p.templatingMethod)
Expand Down
6 changes: 4 additions & 2 deletions pkg/app/piped/cloudprovider/kubernetes/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func ParseFromStructuredObject(s interface{}) (Manifest, error) {
}, nil
}

func LoadPlainYAMLManifests(ctx context.Context, dir string, names []string) ([]Manifest, error) {
func LoadPlainYAMLManifests(ctx context.Context, dir string, names []string, configFileName string) ([]Manifest, error) {
Comment thread
nakabonne marked this conversation as resolved.
Outdated
// If no name was specified we have to walk the app directory to collect the manifest list.
if len(names) == 0 {
err := filepath.Walk(dir, func(path string, f os.FileInfo, err error) error {
Expand All @@ -176,10 +176,12 @@ func LoadPlainYAMLManifests(ctx context.Context, dir string, names []string) ([]
if ext != ".yaml" && ext != ".yml" && ext != ".json" {
return nil
}
// TODO: Allow to check other than default configuration name too
if f.Name() == model.DefaultDeploymentConfigFileName {
return nil
}
if f.Name() == configFileName {
return nil
}
names = append(names, f.Name())
return nil
})
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/piped/driftdetector/kubernetes/detector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ func (d *detector) loadHeadManifests(ctx context.Context, app *model.Application
err = fmt.Errorf("failed to load deployment configuration: %w", err)
return nil, err
}
loader := provider.NewManifestLoader(app.Name, appDir, repoDir, cfg.KubernetesDeploymentSpec.Input, d.logger)
loader := provider.NewManifestLoader(app.Name, appDir, repoDir, app.GitPath.ConfigFilename, cfg.KubernetesDeploymentSpec.Input, d.logger)
manifests, err = loader.LoadManifests(ctx)
if err != nil {
err = fmt.Errorf("failed to load new manifests: %w", err)
Expand Down
4 changes: 2 additions & 2 deletions pkg/app/piped/executor/kubernetes/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func (e *Executor) Execute(sig executor.StopSignal) model.StageStatus {
ctx = sig.Context()
appDir = filepath.Join(e.RepoDir, e.Deployment.GitPath.Path)
)
e.provider = provider.NewProvider(e.Deployment.ApplicationName, appDir, e.RepoDir, e.config.Input, e.Logger)
e.provider = provider.NewProvider(e.Deployment.ApplicationName, appDir, e.RepoDir, e.Deployment.GitPath.ConfigFilename, e.config.Input, e.Logger)

e.Logger.Info("start executing kubernetes stage",
zap.String("stage-name", e.Stage.Name),
Expand Down Expand Up @@ -163,7 +163,7 @@ func (e *Executor) loadRunningManifests(ctx context.Context) (manifests []provid
// When the manifests were not in the cache we have to load them.
var (
appDir = filepath.Join(e.RepoDir, e.Deployment.GitPath.Path)
p = provider.NewProvider(e.Deployment.ApplicationName, appDir, e.RunningRepoDir, e.config.Input, e.Logger)
p = provider.NewProvider(e.Deployment.ApplicationName, appDir, e.RunningRepoDir, e.Deployment.GitPath.ConfigFilename, e.config.Input, e.Logger)
)
manifests, err = p.LoadManifests(ctx)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/app/piped/planner/kubernetes/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (p *Planner) Plan(ctx context.Context, in planner.Input) (out planner.Outpu
newManifests, ok := manifestCache.Get(in.Deployment.Trigger.Commit.Hash)
if !ok {
// When the manifests were not in the cache we have to load them.
loader := provider.NewManifestLoader(in.Deployment.ApplicationName, in.AppDir, in.RepoDir, cfg.Input, in.Logger)
loader := provider.NewManifestLoader(in.Deployment.ApplicationName, in.AppDir, in.RepoDir, in.Deployment.GitPath.ConfigFilename, cfg.Input, in.Logger)
newManifests, err = loader.LoadManifests(ctx)
if err != nil {
err = fmt.Errorf("failed to load new manifests: %w", err)
Expand Down Expand Up @@ -139,7 +139,7 @@ func (p *Planner) Plan(ctx context.Context, in planner.Input) (out planner.Outpu
oldManifests, ok := manifestCache.Get(in.MostRecentSuccessfulCommitHash)
if !ok {
// When the manifests were not in the cache we have to load them.
loader := provider.NewManifestLoader(in.Deployment.ApplicationName, in.AppDir, in.RepoDir, cfg.Input, in.Logger)
loader := provider.NewManifestLoader(in.Deployment.ApplicationName, in.AppDir, in.RepoDir, in.Deployment.GitPath.ConfigFilename, cfg.Input, in.Logger)
oldManifests, err = loader.LoadManifests(ctx)
if err != nil {
err = fmt.Errorf("failed to load previously deployed manifests: %w", err)
Expand Down