Merge remote-tracking branch 'upstream/main' into feat/includes

Author: marc-gr

.buildkite/pipeline.serverless.yml

@@ -3,8 +3,8 @@ env:
   SETUP_GVM_VERSION: 'v0.5.2' # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151
   DOCKER_COMPOSE_VERSION: "v2.24.1"
   DOCKER_VERSION: "26.1.2"
-  KIND_VERSION: 'v0.20.0'
-  K8S_VERSION: 'v1.31.0'
+  KIND_VERSION: 'v0.27.0'
+  K8S_VERSION: 'v1.32.0'
   GH_CLI_VERSION: "2.29.0"
   YQ_VERSION: 'v4.44.3'
 

.buildkite/pipeline.trigger.integration.tests.sh

@@ -22,6 +22,8 @@ STACK_COMMAND_TESTS=(
     test-stack-command-8x
     test-stack-command-9x
     test-stack-command-with-apm-server
+    test-stack-command-with-basic-subscription
+    test-stack-command-with-self-monitor
 )
 
 for test in "${STACK_COMMAND_TESTS[@]}"; do

.buildkite/pipeline.yml

@@ -2,8 +2,8 @@ env:
   SETUP_GVM_VERSION: 'v0.5.2' # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151
   DOCKER_COMPOSE_VERSION: "v2.24.1"
   DOCKER_VERSION: "26.1.2"
-  KIND_VERSION: 'v0.20.0'
-  K8S_VERSION: 'v1.31.0'
+  KIND_VERSION: 'v0.27.0'
+  K8S_VERSION: 'v1.32.0'
   YQ_VERSION: 'v4.44.3'
 
   # Agent images used in pipeline steps

.buildkite/scripts/install_deps.sh

@@ -99,7 +99,7 @@ with_kubernetes() {
     kind version
     which kind
 
-    retry 5 curl -sSLo "${WORKSPACE}/bin/kubectl" "https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/${platform_type_lowercase}/${arch_type}/kubectl"
+    retry 5 curl -sSLo "${WORKSPACE}/bin/kubectl" "https://dl.k8s.io/release/${K8S_VERSION}/bin/${platform_type_lowercase}/${arch_type}/kubectl"
     chmod +x "${WORKSPACE}/bin/kubectl"
     kubectl version --client
     which kubectl

.github/workflows/bump-elastic-stack-version.yml

@@ -35,7 +35,7 @@ jobs:
           echo "UPDATECLI_ACTION=apply" >> $GITHUB_ENV
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@b0d4fd84ae72108930c9adb83bb4beba1acbaf9f #v2.79.0
+        uses: updatecli/updatecli-action@f11c0cb3aca7a018d6000dc86a57eb3442277219 #v2.81.0
 
       - name: Update default stack version
         # --experimental needed for commitusingapi option.

.go-version

@@ -1 +1 @@
-1.23.1
+1.24.2

Makefile

@@ -73,17 +73,20 @@ test-stack-command-86:
 	./scripts/test-stack-command.sh 8.6.2
 
 test-stack-command-8x:
-	./scripts/test-stack-command.sh 8.19.0-db9b3944-SNAPSHOT
+	./scripts/test-stack-command.sh 8.19.0-173c69af-SNAPSHOT
 
 test-stack-command-9x:
-	./scripts/test-stack-command.sh 9.1.0-53a55661-SNAPSHOT
+	./scripts/test-stack-command.sh 9.1.0-d08b0bd6-SNAPSHOT
 
 test-stack-command-with-apm-server:
 	APM_SERVER_ENABLED=true ./scripts/test-stack-command.sh
 
 test-stack-command-with-self-monitor:
 	SELF_MONITOR_ENABLED=true ./scripts/test-stack-command.sh
 
+test-stack-command-with-basic-subscription:
+	ELASTIC_SUBSCRIPTION=basic ./scripts/test-stack-command.sh
+
 test-stack-command: test-stack-command-default test-stack-command-7x test-stack-command-800 test-stack-command-8x test-stack-command-9x test-stack-command-with-apm-server
 
 test-check-packages: test-check-packages-with-kind test-check-packages-other test-check-packages-parallel test-check-packages-with-custom-agent test-check-packages-benchmarks test-check-packages-false-positives test-check-packages-with-logstash

README.md

@@ -226,7 +226,7 @@ Run system benchmarks for the package.
 
 _Context: package_
 
-Use this command to build a package. Currently it supports only the "integration" package type.
+Use this command to build a package.
 
 Built packages are stored in the "build/" folder located at the root folder of the local Git repository checkout that contains your package folder. The command will also render the README file in your package folder if there is a corresponding template file present in "_dev/build/docs/README.md". All "_dev" directories under your package will be omitted. For details on how to generate and syntax of this README, see the [HOWTO guide](./docs/howto/add_package_readme.md).
 
@@ -541,7 +541,7 @@ You can customize your stack using profile settings, see [Elastic Package profil
 There are different providers supported, that can be selected with the --provider flag.
 - compose: Starts a local stack using Docker Compose. This is the default.
 - environment: Prepares an existing stack to be used to test packages. Missing components are started locally using Docker Compose. Environment variables are used to configure the access to the existing Elasticsearch and Kibana instances. You can learn more about this in [this document](./docs/howto/use_existing_stack.md).
-- serverless: Uses Elastic Cloud to start a serverless project. Requires an Elastic Cloud API key.
+- serverless: Uses Elastic Cloud to start a serverless project. Requires an Elastic Cloud API key. You can learn more about this in [this document](./docs/howto/use_serverless_stack.md).
 
 ### `elastic-package stack update`
 
@@ -676,6 +676,9 @@ The following settings are available per profile:
   the serverless stack provider.
 * `stack.serverless.region` can be used to select the region to use when starting
   serverless projects.
+* `stack.elastic_subscription` allows to select the Elastic subscription type to be used in the stack.
+  Currently, it is supported "basic" and "[trial](https://www.elastic.co/guide/en/elasticsearch/reference/current/start-trial.html)",
+  which enables all subscription features for 30 days.  Defaults to "trial".
 
 ## Useful environment variables
 

cmd/build.go

@@ -19,7 +19,7 @@ import (
 	"github.com/elastic/elastic-package/internal/packages"
 )
 
-const buildLongDescription = `Use this command to build a package. Currently it supports only the "integration" package type.
+const buildLongDescription = `Use this command to build a package.
 
 Built packages are stored in the "build/" folder located at the root folder of the local Git repository checkout that contains your package folder. The command will also render the README file in your package folder if there is a corresponding template file present in "_dev/build/docs/README.md". All "_dev" directories under your package will be omitted. For details on how to generate and syntax of this README, see the [HOWTO guide](./docs/howto/add_package_readme.md).
 

cmd/stack.go

@@ -52,7 +52,7 @@ You can customize your stack using profile settings, see [Elastic Package profil
 There are different providers supported, that can be selected with the --provider flag.
 - compose: Starts a local stack using Docker Compose. This is the default.
 - environment: Prepares an existing stack to be used to test packages. Missing components are started locally using Docker Compose. Environment variables are used to configure the access to the existing Elasticsearch and Kibana instances. You can learn more about this in [this document](./docs/howto/use_existing_stack.md).
-- serverless: Uses Elastic Cloud to start a serverless project. Requires an Elastic Cloud API key.`
+- serverless: Uses Elastic Cloud to start a serverless project. Requires an Elastic Cloud API key. You can learn more about this in [this document](./docs/howto/use_serverless_stack.md).`
 
 const stackShellinitLongDescription = `Use this command to export to the current shell the configuration of the stack managed by elastic-package.