Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

[8.0](backport #1764) fix: properly copy files from compose to elastic-package #1765

Merged
mdelapenya merged 1 commit into from
Nov 3, 2021
Merged

[8.0](backport #1764) fix: properly copy files from compose to elastic-package #1765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions internal/deploy/elastic_package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ func (ep *EPServiceManager) Add(ctx context.Context, profile ServiceRequest, ser

func checkElasticPackageProfile(ctx context.Context, kibanaProfile string) error {
// check compose profile
// The kibana config file is only valid in 8.0.0, for other maintenance branches it's kibana.config.default.yml
kibanaProfileFile := filepath.Join(config.OpDir(), "compose", "profiles", "fleet", kibanaProfile, "kibana.config.8x.yml")
kibanaProfileFile := filepath.Join(config.OpDir(), "compose", "profiles", "fleet", kibanaProfile, "kibana.config.yml")
found, err := io.Exists(kibanaProfileFile)
if !found || err != nil {
return err
Expand Down Expand Up @@ -111,7 +110,8 @@ func checkElasticPackageProfile(ctx context.Context, kibanaProfile string) error
log.Trace("Not creating a new Elastic Package profile for " + kibanaProfile + ". Kibana config will be overriden")
}

elasticPackageProfileFile := filepath.Join(elasticPackageProfile, "stack", "kibana.config.yml")
// The kibana config file is only valid in 8.0.0, for other maintenance branches it's kibana.config.default.yml
elasticPackageProfileFile := filepath.Join(elasticPackageProfile, "stack", "kibana.config.8x.yml")
Copy link
Copy Markdown
Contributor

@mdelapenya mdelapenya Nov 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mtojek the 8x file name is valid for the 8.0 branch of the stack?

Copy link
Copy Markdown

@mtojek mtojek Nov 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't meant to be branch or specific stack version like 8.0.0, but in general the stack family 8x.

Copy link
Copy Markdown
Contributor

@mdelapenya mdelapenya Nov 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I asked because for our 7.15 and 7.16 branches, we are using here kibana.config.default.yml file, but in master and 8.0, we are going to use kibana.config.8x.yml, to follow elastic-package's behaviour


// copy compose's kibana's config to elastic-package's config
err = io.CopyFile(kibanaProfileFile, elasticPackageProfileFile, 10000)
Expand Down