Skip to content

Commit 7d823a9

Browse files
committed
Add serverless flag to stack up
The idea behind this pull request is to be able to run a `serverless` stack of Elasticsearch with the following command: ``` elastic-package stack up --version=8.8.0-SNAPSHOT -v --serverless ``` I'm opening this PR as draft as I have a few questions on how to implement it best.
1 parent cb10ae3 commit 7d823a9

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

cmd/stack.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ func setupStackCommand() *cobraext.Command {
7373
return cobraext.FlagParsingError(err, cobraext.StackVersionFlagName)
7474
}
7575

76+
/*serverless, err := cmd.Flags().GetString(cobraext.ServerlessFlagName)
77+
if err != nil {
78+
return cobraext.FlagParsingError(err, cobraext.ServerlessFlagName)
79+
}*/
80+
7681
profile, err := getProfileFlag(cmd)
7782
if err != nil {
7883
return err

internal/cobraext/flags.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ const (
170170
ZipPackageFilePathFlagShorthand = "z"
171171
ZipPackageFilePathFlagDescription = "path to the zip package file (*.zip)"
172172

173+
ServerlessFlagName = "serverless"
174+
ServerlessFlagDescription = "serverless flag (true or false)"
175+
173176
// To be removed promote commands flags
174177
DirectionFlagName = "direction"
175178
DirectionFlagDescription = "promotion direction"

internal/stack/_static/docker-compose-stack.yml.tmpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{{ $username := fact "username" }}
22
{{ $password := fact "password" }}
3+
{{ $serverless := fact "serverless" }}
34
version: '2.3'
45
services:
56
elasticsearch:
@@ -9,7 +10,7 @@ services:
910
start_period: 300s
1011
interval: 5s
1112
environment:
12-
- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
13+
- "ES_JAVA_OPTS=-Xms1g -Xmx1g -Des.serverless={{ $serverless }}"
1314
- "ELASTIC_PASSWORD={{ $password }}"
1415
volumes:
1516
- "./elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml"

internal/stack/resources.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ const (
4747

4848
elasticsearchUsername = "elastic"
4949
elasticsearchPassword = "changeme"
50+
51+
serverless = "false"
5052
)
5153

5254
var (
@@ -118,6 +120,8 @@ func applyResources(profile *profile.Profile, stackVersion string) error {
118120
"username": elasticsearchUsername,
119121
"password": elasticsearchPassword,
120122

123+
"serverless": serverless,
124+
121125
"geoip_dir": profile.Config("stack.geoip_dir", "./ingest-geoip"),
122126
})
123127

0 commit comments

Comments
 (0)