feat: add helm package mage target

.buildkite/pipeline.elastic-agent-helm-charts.yml

@@ -1,13 +1,17 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+env:
+  HELM_REPO_ENV: ${HELM_REPO_ENV:-dev}
+  SNAPSHOT: ${SNAPSHOT:-true}
 
 steps:
-
   - label: ":elastic-stack: Create helm chart"
     command: |
-      echo "TBC"
-
-  - wait: ~
-
-  - label: ":elastic-stack: Publish helm chart"
-    command: |
-      echo "TBC"
+      .buildkite/scripts/steps/helm-charts.sh
+    plugins:
+      - elastic/oblt-google-auth#feature/support-different-projects:
+          lifetime: 1800 # seconds
+          project-id: "elastic-observability-ci"
+          project-number: "911195782929"
+    agents:
+      provider: "gcp"
+      machineType: "n1-standard-8"

.buildkite/scripts/steps/helm-charts.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# This script runs the helm-charts for the given environment
+# uploads the package to GCS and
+# triggers the unified-release-publish-helm-charts pipeline.
+
+# shellcheck disable=SC1091
+source .buildkite/scripts/common.sh
+
+set -euo pipefail
+
+echo "--- mage helm:package"
+mage helm:package
+
+echo "--- upload package tests"
+STORAGE=elastic-agent-helm-chart
+gcloud storage cp elastic-agent-*.tgz gs://"${STORAGE}" --print-created-message
+
+echo "--- load trigger pipeline"
+HELM_CHART_FILE=$(ls -1 elastic-agent-*.tgz)
+CHART_URL="https://storage.googleapis.com/${STORAGE}/${HELM_CHART_FILE}"
+export CHART_URL
+.buildkite/scripts/steps/trigger-publish-helm-charts.sh
+.buildkite/scripts/steps/trigger-publish-helm-charts.sh | buildkite-agent pipeline upload

.buildkite/scripts/steps/trigger-publish-helm-charts.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+#
+# Create a dynamic buildkite step that triggers the
+# unified-release-publish-helm-charts pipeline.
+#
+# Required environment variables:
+#  - HELM_REPO_ENV
+#  - CHART_URL
+#
+
+set -eo pipefail
+
+HELM_REPO_ENV=${HELM_REPO_ENV:-"dev"}
+
+if [ -z "$CHART_URL" ] ; then
+  echo "CHART_URL could not be found."
+  exit 1
+fi
+
+cat << EOF
+  - label: ":elastic-stack: Publish helm chart"
+    trigger: unified-release-publish-helm-charts
+    build:
+      message: "publish helm-chart for elastic-agent in ${HELM_REPO_ENV}"
+      env:
+        CHARTS_URL: "${CHART_URL}"
+        HELM_REPO_ENV: ${HELM_REPO_ENV}
+EOF

magefile.go

@@ -3628,10 +3628,76 @@ func updateYamlFile(path string, keyVal ...struct {
 	return nil
 }
 
+// BuildDependencies builds the dependencies for the Elastic-Agent Helm chart.
 func (Helm) BuildDependencies() error {
 	return helm.BuildChartDependencies(helmChartPath)
 }
 
+// Package packages the Elastic-Agent Helm chart. Note that you need to set SNAPSHOT="false" to build a production-ready package.
+func (h Helm) Package() error {
+	mg.SerialDeps(h.BuildDependencies)
+
+	agentVersion := bversion.GetParsedAgentPackageVersion()
+	agentCoreVersion := agentVersion.CoreVersion()
+	agentImageTag := agentCoreVersion + "-SNAPSHOT"
+
+	// need to explicitly set SNAPSHOT="false" to produce a production-ready package
+	productionPackage := os.Getenv("SNAPSHOT") == "false"
+
+	agentChartVersion := agentCoreVersion + "-beta"
+	switch {
+	case productionPackage && agentVersion.Major() >= 9:
+		// for 9.0.0 and later versions, elastic-agent Helm chart is GA
+		agentChartVersion = agentCoreVersion
+	case productionPackage && agentVersion.Major() >= 8 && agentVersion.Minor() >= 18:
+		// for 8.18.0 and later versions, elastic-agent Helm chart is GA
+		agentChartVersion = agentCoreVersion
+	}
+
+	for yamlFile, keyVals := range map[string][]struct {
+		key   string
+		value string
+	}{
+		// values file for elastic-agent Helm Chart
+		filepath.Join(helmChartPath, "values.yaml"): {
+			{"agent.version", agentCoreVersion},
+			// always use the SNAPSHOT version for image tag
+			// for the chart that resides in the git repo
+			{"agent.image.tag", agentImageTag},
+		},
+		// Chart.yaml for elastic-agent Helm Chart
+		filepath.Join(helmChartPath, "Chart.yaml"): {
+			{"appVersion", agentCoreVersion},
+			{"version", agentChartVersion},
+		},
+	} {
+		if err := updateYamlFile(yamlFile, keyVals...); err != nil {
+			return fmt.Errorf("failed to update agent version: %w", err)
+		}
+	}
+
+	// lint before packaging
+	if err := h.Lint(); err != nil {
+		return err
+	}
+
+	settings := cli.New() // Helm CLI settings
+	actionConfig := &action.Configuration{}
+
+	err := actionConfig.Init(settings.RESTClientGetter(), "default", "",
+		func(format string, v ...interface{}) {})
+	if err != nil {
+		return fmt.Errorf("failed to init helm action config: %w", err)
+	}
+
+	packageAction := action.NewPackage()
+	_, err = packageAction.Run(helmChartPath, nil)
+	if err != nil {
+		return fmt.Errorf("failed to package helm chart: %w", err)
+	}
+	return nil
+}
+
 func updateYamlNodes(rootNode *yaml.Node, value string, keys ...string) error {
 	if len(keys) == 0 {
 		return fmt.Errorf("no keys provided")