diff --git a/.buildkite/bk.integration-fips.pipeline.yml b/.buildkite/bk.integration-fips.pipeline.yml index d244b654971..46860be4341 100644 --- a/.buildkite/bk.integration-fips.pipeline.yml +++ b/.buildkite/bk.integration-fips.pipeline.yml @@ -7,6 +7,8 @@ env: IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1753491662" IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1753491662" IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1753491662" + # Remove AGENT_VERSION pinning once 9.1.1 DRA and stack are released + AGENT_VERSION: "9.1.0-SNAPSHOT" # This section is used to define the plugins that will be used in the pipeline. # See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins @@ -56,7 +58,7 @@ steps: image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5" useCustomGlobalHooks: true plugins: - - *vault_ec_key_prod + - *vault_ec_key_prod - group: "fips:Stateful:Ubuntu" key: integration-tests-ubuntu-fips @@ -84,7 +86,7 @@ steps: image: "${IMAGE_UBUNTU_X86_64_FIPS}" instanceType: "m5.2xlarge" plugins: - - *vault_ec_key_prod + - *vault_ec_key_prod matrix: setup: sudo: @@ -114,7 +116,7 @@ steps: image: "${IMAGE_UBUNTU_ARM64_FIPS}" instanceType: "m6g.2xlarge" plugins: - - *vault_ec_key_prod + - *vault_ec_key_prod matrix: setup: sudo: @@ -155,7 +157,7 @@ steps: image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5" useCustomGlobalHooks: true plugins: - - *vault_ec_key_prod + - *vault_ec_key_prod - label: Aggregate test reports depends_on: diff --git a/.buildkite/bk.integration.pipeline.yml b/.buildkite/bk.integration.pipeline.yml index 4703862f638..e9d23268a64 100644 --- a/.buildkite/bk.integration.pipeline.yml +++ b/.buildkite/bk.integration.pipeline.yml @@ -12,6 +12,8 @@ env: IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1753491662" IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1753491662" IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1753491662" + # Remove AGENT_VERSION pinning once 9.1.1 DRA and stack are released + AGENT_VERSION: "9.1.0-SNAPSHOT" # This section is used to define the plugins that will be used in the pipeline. # See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins @@ -41,7 +43,7 @@ common: elastic/vault-secrets#v0.1.0: path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod" field: "apiKey" - env_var: "EC_API_KEY" + env_var: "EC_API_KEY" steps: - label: Start ESS stack for integration tests @@ -113,7 +115,7 @@ steps: image: "${IMAGE_WIN_2025}" plugins: - *vault_ec_key_prod - + - label: "Ubuntu:2404:amd64:sudo" depends_on: packaging-ubuntu-x86-64 env: @@ -298,7 +300,7 @@ steps: machineType: "n2-standard-8" image: "${IMAGE_UBUNTU_2404_X86_64}" plugins: - - *vault_ec_key_prod + - *vault_ec_key_prod matrix: - default - upgrade diff --git a/.buildkite/integration.pipeline.yml b/.buildkite/integration.pipeline.yml index 694542dd25f..f855de0eff4 100644 --- a/.buildkite/integration.pipeline.yml +++ b/.buildkite/integration.pipeline.yml @@ -8,6 +8,9 @@ env: # Please do not change them manually. IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1752886846" IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1752886846" + # Remove AGENT_PACKAGE_VERSION and BEAT_VERSION pinning once 9.1.1 DRA and stack are released + AGENT_PACKAGE_VERSION: "9.1.0" + BEAT_VERSION: "9.1.0" steps: - group: "Integration tests: packaging" diff --git a/.buildkite/scripts/buildkite-integration-tests.ps1 b/.buildkite/scripts/buildkite-integration-tests.ps1 index d96c1439ad6..86b7d39c41a 100644 --- a/.buildkite/scripts/buildkite-integration-tests.ps1 +++ b/.buildkite/scripts/buildkite-integration-tests.ps1 @@ -25,9 +25,11 @@ go install gotest.tools/gotestsum gotestsum --version $env:TEST_BINARY_NAME = "elastic-agent" -# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925 -$AGENT_VERSION = (Get-Content version/version.go | Select-String -Pattern 'const defaultBeatVersion =' | ForEach-Object { $_ -replace '.*?"(.*?)".*', '$1' }) -$env:AGENT_VERSION = $AGENT_VERSION + "-SNAPSHOT" +if (-not $env:AGENT_VERSION) { + # Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925 + $AGENT_VERSION = (Get-Content version/version.go | Select-String -Pattern 'const defaultBeatVersion =' | ForEach-Object { $_ -replace '.*?"(.*?)".*', '$1' }) + $env:AGENT_VERSION = $AGENT_VERSION + "-SNAPSHOT" +} Write-Output "~~~ Agent version: $env:AGENT_VERSION" $env:SNAPSHOT = $true diff --git a/.buildkite/scripts/buildkite-integration-tests.sh b/.buildkite/scripts/buildkite-integration-tests.sh index f5ae71e3ead..d8032eab6f7 100755 --- a/.buildkite/scripts/buildkite-integration-tests.sh +++ b/.buildkite/scripts/buildkite-integration-tests.sh @@ -37,9 +37,11 @@ echo "~~~ Running integration tests as $USER" make install-gotestsum -# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925 -AGENT_VERSION=$(grep "const defaultBeatVersion =" version/version.go | cut -d\" -f2) -AGENT_VERSION="${AGENT_VERSION}-SNAPSHOT" +if [[ -z "${AGENT_VERSION:-}" ]]; then + # Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925 + AGENT_VERSION=$(grep "const defaultBeatVersion =" version/version.go | cut -d\" -f2) + AGENT_VERSION="${AGENT_VERSION}-SNAPSHOT" +fi export AGENT_VERSION echo "~~~ Agent version: ${AGENT_VERSION}" diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh index 97b3a3a4904..3074a839009 100755 --- a/.buildkite/scripts/common.sh +++ b/.buildkite/scripts/common.sh @@ -9,8 +9,11 @@ fi if [[ -z "${SETUP_GVM_VERSION-""}" ]]; then SETUP_GVM_VERSION="v0.5.2" # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151 fi -BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go") -export BEAT_VERSION + +if [[ -z "${BEAT_VERSION-""}" ]]; then + BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go") + export BEAT_VERSION +fi getOSOptions() { case $(uname | tr '[:upper:]' '[:lower:]') in diff --git a/deploy/helm/edot-collector/kube-stack/managed_otlp/logs-values.yaml b/deploy/helm/edot-collector/kube-stack/managed_otlp/logs-values.yaml index c6099299d68..f28a88fe6b8 100644 --- a/deploy/helm/edot-collector/kube-stack/managed_otlp/logs-values.yaml +++ b/deploy/helm/edot-collector/kube-stack/managed_otlp/logs-values.yaml @@ -17,7 +17,7 @@ crds: defaultCRConfig: image: repository: "docker.elastic.co/elastic-agent/elastic-agent" - tag: "9.1.0" + tag: "9.1.1" targetAllocator: enabled: false # Enable/disable the Operator's Target allocator. # Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator diff --git a/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml b/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml index e5b5aed2c20..04d6ce05d9e 100644 --- a/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml +++ b/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml @@ -17,7 +17,7 @@ crds: defaultCRConfig: image: repository: "docker.elastic.co/elastic-agent/elastic-agent" - tag: "9.1.0" + tag: "9.1.1" targetAllocator: enabled: false # Enable/disable the Operator's Target allocator. # Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator diff --git a/deploy/helm/edot-collector/kube-stack/values.yaml b/deploy/helm/edot-collector/kube-stack/values.yaml index 7adc6c325ff..b5a4b0b01c4 100644 --- a/deploy/helm/edot-collector/kube-stack/values.yaml +++ b/deploy/helm/edot-collector/kube-stack/values.yaml @@ -17,7 +17,7 @@ crds: defaultCRConfig: image: repository: "docker.elastic.co/elastic-agent/elastic-agent" - tag: "9.1.0" + tag: "9.1.1" targetAllocator: enabled: false # Enable/disable the Operator's Target allocator. # Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator diff --git a/deploy/helm/elastic-agent/Chart.yaml b/deploy/helm/elastic-agent/Chart.yaml index eb6d1f9af40..93fcc004517 100644 --- a/deploy/helm/elastic-agent/Chart.yaml +++ b/deploy/helm/elastic-agent/Chart.yaml @@ -3,8 +3,8 @@ name: elastic-agent description: Elastic-Agent Helm Chart kubeVersion: ">= 1.27.0-0" type: application -appVersion: 9.1.0 -version: 9.1.0-beta +appVersion: 9.1.1 +version: 9.1.1-beta dependencies: - name: kube-state-metrics version: "5.30.1" diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml index da798ac4707..c83cee11fee 100644 --- a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml @@ -22,10 +22,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: eck.k8s.elastic.co/license: basic --- @@ -36,10 +36,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: eck.k8s.elastic.co/license: basic --- @@ -50,10 +50,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: eck.k8s.elastic.co/license: basic stringData: @@ -288,10 +288,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: eck.k8s.elastic.co/license: basic stringData: @@ -620,10 +620,10 @@ kind: ClusterRole metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: eck.k8s.elastic.co/license: basic rules: @@ -702,10 +702,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: eck.k8s.elastic.co/license: basic rules: @@ -806,10 +806,10 @@ kind: ClusterRoleBinding metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: eck.k8s.elastic.co/license: basic subjects: @@ -827,10 +827,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: eck.k8s.elastic.co/license: basic subjects: @@ -962,14 +962,14 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: eck.k8s.elastic.co/license: basic spec: - version: 9.1.0 + version: 9.1.1 configRef: secretName: agent-pernode-example elasticsearchRefs: @@ -993,7 +993,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1045,14 +1045,14 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: eck.k8s.elastic.co/license: basic spec: - version: 9.1.0 + version: 9.1.1 configRef: secretName: agent-clusterwide-example elasticsearchRefs: @@ -1076,7 +1076,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml index 123ec6ccce3..9d113571ac5 100644 --- a/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml @@ -22,10 +22,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/k8s/secret.yaml apiVersion: v1 @@ -34,10 +34,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -234,10 +234,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -336,10 +336,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-pernode-example @@ -384,10 +384,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -432,7 +432,7 @@ spec: value: fleetToken - name: FLEET_ENROLL value: "true" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml index 4df6fc8aacb..0d9935a9c52 100644 --- a/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml @@ -414,7 +414,7 @@ spec: value: fleetToken - name: FLEET_ENROLL value: "true" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml index 3dd6e939b77..510f95aa566 100644 --- a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml @@ -22,10 +22,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/k8s/secret.yaml apiVersion: v1 @@ -34,10 +34,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -212,10 +212,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -314,10 +314,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-pernode-example @@ -362,10 +362,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -402,7 +402,7 @@ spec: value: fleetToken - name: FLEET_ENROLL value: "true" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml index 624e78291e3..40b37e4685f 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml @@ -22,10 +22,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/service-account.yaml apiVersion: v1 @@ -34,10 +34,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/k8s/secret.yaml apiVersion: v1 @@ -46,10 +46,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -337,10 +337,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -758,10 +758,10 @@ kind: ClusterRole metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -838,10 +838,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -940,10 +940,10 @@ kind: ClusterRoleBinding metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-clusterwide-example @@ -959,10 +959,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-pernode-example @@ -1007,10 +1007,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -1051,7 +1051,7 @@ spec: secretKeyRef: key: api_key name: es-api-secret - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1223,10 +1223,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -1267,7 +1267,7 @@ spec: secretKeyRef: key: api_key name: es-api-secret - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml index 0407e15ae1d..746eac7b809 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml @@ -22,10 +22,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/service-account.yaml apiVersion: v1 @@ -34,10 +34,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/k8s/secret.yaml apiVersion: v1 @@ -46,10 +46,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -289,10 +289,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -626,10 +626,10 @@ kind: ClusterRole metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -706,10 +706,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -808,10 +808,10 @@ kind: ClusterRoleBinding metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-clusterwide-example @@ -827,10 +827,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-pernode-example @@ -875,10 +875,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -909,7 +909,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1056,10 +1056,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -1090,7 +1090,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml index 0c9c07fb9e4..ed7201f678c 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml @@ -22,10 +22,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/service-account.yaml apiVersion: v1 @@ -34,10 +34,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/k8s/secret.yaml apiVersion: v1 @@ -46,10 +46,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -289,10 +289,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -629,10 +629,10 @@ kind: ClusterRole metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -709,10 +709,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -811,10 +811,10 @@ kind: ClusterRoleBinding metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-clusterwide-example @@ -830,10 +830,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-pernode-example @@ -878,10 +878,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -912,7 +912,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1059,10 +1059,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -1093,7 +1093,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml index 7dbb7227de4..d28c6eef87a 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml @@ -22,10 +22,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/service-account.yaml apiVersion: v1 @@ -34,10 +34,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/k8s/secret.yaml apiVersion: v1 @@ -46,10 +46,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -102,10 +102,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -634,10 +634,10 @@ kind: ClusterRole metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -714,10 +714,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -816,10 +816,10 @@ kind: ClusterRoleBinding metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-clusterwide-example @@ -835,10 +835,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-pernode-example @@ -939,10 +939,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -983,7 +983,7 @@ spec: secretKeyRef: key: api_key name: es-api-secret - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1045,10 +1045,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -1089,7 +1089,7 @@ spec: secretKeyRef: key: api_key name: es-api-secret - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1253,7 +1253,7 @@ spec: secretKeyRef: key: api_key name: es-api-secret - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/kubernetes-onboarding/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-onboarding/rendered/manifest.yaml index 0c14af47e42..116199d7652 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-onboarding/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-onboarding/rendered/manifest.yaml @@ -22,10 +22,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/service-account.yaml apiVersion: v1 @@ -34,10 +34,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/k8s/secret.yaml apiVersion: v1 @@ -46,10 +46,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -297,10 +297,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -657,10 +657,10 @@ kind: ClusterRole metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -737,10 +737,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -839,10 +839,10 @@ kind: ClusterRoleBinding metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-clusterwide-example @@ -858,10 +858,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-pernode-example @@ -906,10 +906,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -940,7 +940,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1087,10 +1087,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -1121,7 +1121,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml index a75eee486cc..de0ca1ed8e7 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml @@ -6,10 +6,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/k8s/secret.yaml apiVersion: v1 @@ -18,10 +18,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -110,10 +110,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -190,10 +190,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-pernode-example @@ -210,10 +210,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -244,7 +244,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml index e86c607563d..e5d9248e07e 100644 --- a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml @@ -22,10 +22,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/service-account.yaml apiVersion: v1 @@ -34,10 +34,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/k8s/secret.yaml apiVersion: v1 @@ -46,10 +46,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -315,10 +315,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -655,10 +655,10 @@ kind: ClusterRole metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -735,10 +735,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -837,10 +837,10 @@ kind: ClusterRoleBinding metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-clusterwide-example @@ -856,10 +856,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-pernode-example @@ -904,10 +904,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -938,7 +938,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1075,10 +1075,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -1109,7 +1109,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml index 8ed9f874e48..27bacf25113 100644 --- a/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml @@ -6,10 +6,10 @@ metadata: name: agent-netflow-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -69,10 +69,10 @@ metadata: name: agent-netflow-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: type: ClusterIP selector: @@ -89,10 +89,10 @@ metadata: name: agent-netflow-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -131,7 +131,7 @@ spec: secretKeyRef: key: api_key name: es-api-secret - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent ports: diff --git a/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml index 88a00759d5e..0c20783443a 100644 --- a/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml @@ -6,10 +6,10 @@ metadata: name: agent-nginx-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -61,10 +61,10 @@ metadata: name: agent-nginx-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -93,7 +93,7 @@ spec: fieldPath: metadata.name - name: STATE_PATH value: /usr/share/elastic-agent/state - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent securityContext: diff --git a/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml index 41632f71d2f..c4209ee2628 100644 --- a/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml @@ -32,10 +32,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/service-account.yaml apiVersion: v1 @@ -44,10 +44,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/k8s/secret.yaml apiVersion: v1 @@ -56,10 +56,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -299,10 +299,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -636,10 +636,10 @@ kind: ClusterRole metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -716,10 +716,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -818,10 +818,10 @@ kind: ClusterRoleBinding metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-clusterwide-example @@ -837,10 +837,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-pernode-example @@ -885,10 +885,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -919,7 +919,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1067,10 +1067,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -1101,7 +1101,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/statefulset-preset/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/statefulset-preset/rendered/manifest.yaml index 980bb254bca..bcb9acba1d0 100644 --- a/deploy/helm/elastic-agent/examples/statefulset-preset/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/statefulset-preset/rendered/manifest.yaml @@ -6,10 +6,10 @@ metadata: name: agent-netflow-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -79,10 +79,10 @@ metadata: name: agent-netflow-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: type: ClusterIP selector: @@ -99,10 +99,10 @@ metadata: name: agent-netflow-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: serviceName: agent-netflow-example-headless selector: @@ -142,7 +142,7 @@ spec: secretKeyRef: key: api_key name: es-api-secret - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent ports: diff --git a/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml index 721adc50339..f790cb19b2a 100644 --- a/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml @@ -6,10 +6,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 --- # Source: elastic-agent/templates/agent/k8s/secret.yaml apiVersion: v1 @@ -18,10 +18,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -190,10 +190,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -270,10 +270,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: agent-pernode-example @@ -290,10 +290,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -324,7 +324,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml index e559b52b54a..85b70eeacf4 100644 --- a/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml @@ -6,10 +6,10 @@ metadata: name: agent-nginx-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: elastic-agent.k8s.elastic.co/preset: nginx elastic-agent.k8s.elastic.co/sa: nginx @@ -21,10 +21,10 @@ metadata: name: agent-nginx-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: elastic-agent.k8s.elastic.co/preset: nginx stringData: @@ -77,10 +77,10 @@ kind: ClusterRoleBinding metadata: name: agent-nginx-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: elastic-agent.k8s.elastic.co/preset: nginx subjects: @@ -99,10 +99,10 @@ metadata: name: agent-nginx-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -132,7 +132,7 @@ spec: fieldPath: metadata.name - name: STATE_PATH value: /usr/share/elastic-agent/state - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent securityContext: diff --git a/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml index 31f54315f91..917809f5b4f 100644 --- a/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml @@ -22,10 +22,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -265,10 +265,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 stringData: agent.yml: |- @@ -602,10 +602,10 @@ kind: ClusterRole metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: elastic-agent.k8s.elastic.co/cr: nginx rules: @@ -684,10 +684,10 @@ kind: ClusterRole metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 annotations: elastic-agent.k8s.elastic.co/cr: nginx rules: @@ -788,10 +788,10 @@ kind: ClusterRoleBinding metadata: name: agent-clusterWide-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: user-sa-clusterWide @@ -807,10 +807,10 @@ kind: ClusterRoleBinding metadata: name: agent-perNode-example-default labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 subjects: - kind: ServiceAccount name: user-sa-perNode @@ -855,10 +855,10 @@ metadata: name: agent-pernode-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -889,7 +889,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1036,10 +1036,10 @@ metadata: name: agent-clusterwide-example namespace: "default" labels: - helm.sh/chart: elastic-agent-9.1.0-beta + helm.sh/chart: elastic-agent-9.1.1-beta app.kubernetes.io/name: elastic-agent app.kubernetes.io/instance: example - app.kubernetes.io/version: 9.1.0 + app.kubernetes.io/version: 9.1.1 spec: selector: matchLabels: @@ -1070,7 +1070,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/helm/elastic-agent/values.yaml b/deploy/helm/elastic-agent/values.yaml index 97b647eceac..286445b7859 100644 --- a/deploy/helm/elastic-agent/values.yaml +++ b/deploy/helm/elastic-agent/values.yaml @@ -338,13 +338,13 @@ extraIntegrations: {} agent: # -- elastic-agent version # @section -- 6 - Elastic-Agent Configuration - version: 9.1.0 + version: 9.1.1 # -- image configuration # @section -- 6 - Elastic-Agent Configuration image: repository: docker.elastic.co/elastic-agent/elastic-agent pullPolicy: IfNotPresent - tag: "9.1.0-SNAPSHOT" + tag: "9.1.1-SNAPSHOT" # -- image pull secrets # @section -- 6 - Elastic-Agent Configuration imagePullSecrets: [] diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml index 6025bbd233a..d6966c8da88 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml @@ -27,7 +27,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 env: # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode - name: FLEET_ENROLL diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml index f9fcd5ace6a..c301e2eed8f 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml @@ -28,7 +28,7 @@ spec: # Uncomment if using hints feature #initContainers: # - name: k8s-templates-downloader - # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 # command: ['bash'] # args: # - -c @@ -40,7 +40,7 @@ spec: # mountPath: /etc/elastic-agent/inputs.d containers: - name: elastic-agent-standalone - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 args: ["-c", "/etc/elastic-agent/agent.yml", "-e"] env: # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml index be2b2e611e7..13661dd2bec 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml @@ -27,7 +27,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 env: # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode - name: FLEET_ENROLL diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml index 88a0b4825e5..3a1949c3fca 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml @@ -27,7 +27,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 env: # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode - name: FLEET_ENROLL diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml index 84cdbc5190d..94dad2e5b09 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml @@ -28,7 +28,7 @@ spec: # Uncomment if using hints feature #initContainers: # - name: k8s-templates-downloader - # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 # command: ['bash'] # args: # - -c @@ -40,7 +40,7 @@ spec: # mountPath: /etc/elastic-agent/inputs.d containers: - name: elastic-agent-standalone - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 args: ["-c", "/etc/elastic-agent/agent.yml", "-e"] env: # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml index 049c1044514..d8cf5022631 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml @@ -28,7 +28,7 @@ spec: # Uncomment if using hints feature #initContainers: # - name: k8s-templates-downloader - # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 # command: ['bash'] # args: # - -c @@ -40,7 +40,7 @@ spec: # mountPath: /etc/elastic-agent/inputs.d containers: - name: elastic-agent-standalone - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 args: ["-c", "/etc/elastic-agent/agent.yml", "-e"] env: # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml index d03fe85702a..72c19695dac 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml @@ -19,7 +19,7 @@ patches: spec: initContainers: - name: k8s-templates-downloader - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 command: ['bash'] args: - -c diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index 31dea796b9d..d690c75b699 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -27,7 +27,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 env: # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode - name: FLEET_ENROLL diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml index 64d1b976cad..868f1bd1486 100644 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml @@ -704,7 +704,7 @@ spec: # Uncomment if using hints feature #initContainers: # - name: k8s-templates-downloader - # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 # command: ['bash'] # args: # - -c @@ -716,7 +716,7 @@ spec: # mountPath: /etc/elastic-agent/inputs.d containers: - name: elastic-agent-standalone - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 args: ["-c", "/etc/elastic-agent/agent.yml", "-e"] env: # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent diff --git a/magefile.go b/magefile.go index fd40025808b..d289d19c92f 100644 --- a/magefile.go +++ b/magefile.go @@ -982,25 +982,23 @@ func (Cloud) Image(ctx context.Context) { // Looks in build/distributions for an elastic-agent-cloud*.docker.tar.gz artifact and imports it as docker.elastic.co/beats-ci/elastic-agent-cloud:$VERSION // DOCKER_IMPORT_SOURCE - override source for import func (Cloud) Load() error { - snapshot := os.Getenv(snapshotEnv) - defer os.Setenv(snapshotEnv, snapshot) - os.Setenv(snapshotEnv, "true") - - version := getVersion() + agentVersion, err := mage.AgentPackageVersion() + if err != nil { + return fmt.Errorf("failed to get agent package version: %w", err) + } // Need to get the FIPS env var flag to see if we are using the normal source cloud image name, or the FIPS variant fips := os.Getenv(fipsEnv) - defer os.Setenv(fipsEnv, fips) fipsVal, err := strconv.ParseBool(fips) if err != nil { fipsVal = false } - os.Setenv(fipsEnv, strconv.FormatBool(fipsVal)) + devtools.FIPSBuild = fipsVal - source := "build/distributions/elastic-agent-cloud-" + version + "-linux-" + runtime.GOARCH + ".docker.tar.gz" + source := "build/distributions/elastic-agent-cloud-" + agentVersion + "-SNAPSHOT-linux-" + runtime.GOARCH + ".docker.tar.gz" if fipsVal { - source = "build/distributions/elastic-agent-cloud-fips-" + version + "-linux-" + runtime.GOARCH + ".docker.tar.gz" + source = "build/distributions/elastic-agent-cloud-fips-" + agentVersion + "-SNAPSHOT-linux-" + runtime.GOARCH + ".docker.tar.gz" } if envSource, ok := os.LookupEnv("DOCKER_IMPORT_SOURCE"); ok && envSource != "" { source = envSource @@ -1012,20 +1010,9 @@ func (Cloud) Load() error { // Push builds a cloud image tags it correctly and pushes to remote image repo. // Previous login to elastic registry is required! func (Cloud) Push() error { - snapshot := os.Getenv(snapshotEnv) - defer os.Setenv(snapshotEnv, snapshot) - - os.Setenv(snapshotEnv, "true") - - version := getVersion() - var tag string - if envTag, isPresent := os.LookupEnv("CUSTOM_IMAGE_TAG"); isPresent && len(envTag) > 0 { - tag = envTag - } else { - commit := dockerCommitHash() - time := time.Now().Unix() - - tag = fmt.Sprintf("%s-%s-%d", version, commit, time) + agentVersion, err := mage.AgentPackageVersion() + if err != nil { + return fmt.Errorf("failed to get agent package version: %w", err) } // Need to get the FIPS env var flag to see if we are using the normal source cloud image name, or the FIPS variant @@ -1035,38 +1022,46 @@ func (Cloud) Push() error { if err != nil { fipsVal = false } - os.Setenv(fipsEnv, strconv.FormatBool(fipsVal)) + if err := os.Setenv(fipsEnv, strconv.FormatBool(fipsVal)); err != nil { + return fmt.Errorf("failed to set fips env var: %w", err) + } devtools.FIPSBuild = fipsVal - sourceCloudImageName := fmt.Sprintf("docker.elastic.co/beats-ci/elastic-agent-cloud:%s", version) + sourceCloudImageName := fmt.Sprintf("docker.elastic.co/beats-ci/elastic-agent-cloud:%s-SNAPSHOT", agentVersion) if fipsVal { - sourceCloudImageName = fmt.Sprintf("docker.elastic.co/beats-ci/elastic-agent-cloud-fips:%s", version) + sourceCloudImageName = fmt.Sprintf("docker.elastic.co/beats-ci/elastic-agent-cloud-fips:%s-SNAPSHOT", agentVersion) + } + var targetTag string + if envTag, isPresent := os.LookupEnv("CUSTOM_IMAGE_TAG"); isPresent && len(envTag) > 0 { + targetTag = envTag + } else { + targetTag = fmt.Sprintf("%s-%s-%d", agentVersion, dockerCommitHash(), time.Now().Unix()) } var targetCloudImageName string if customImage, isPresent := os.LookupEnv("CI_ELASTIC_AGENT_DOCKER_IMAGE"); isPresent && len(customImage) > 0 { - targetCloudImageName = fmt.Sprintf("%s:%s", customImage, tag) + targetCloudImageName = fmt.Sprintf("%s:%s", customImage, targetTag) } else { - targetCloudImageName = fmt.Sprintf(cloudImageTmpl, tag) + targetCloudImageName = fmt.Sprintf(cloudImageTmpl, targetTag) } fmt.Printf(">> Setting a docker image tag to %s\n", targetCloudImageName) err = sh.RunV("docker", "tag", sourceCloudImageName, targetCloudImageName) if err != nil { - return fmt.Errorf("Failed setting a docker image tag: %w", err) + return fmt.Errorf("failed setting a docker image tag: %w", err) } fmt.Println(">> Docker image tag updated successfully") fmt.Println(">> Pushing a docker image to remote registry") err = sh.RunV("docker", "image", "push", targetCloudImageName) if err != nil { - return fmt.Errorf("Failed pushing docker image: %w", err) + return fmt.Errorf("failed pushing docker image: %w", err) } fmt.Printf(">> Docker image pushed to remote registry successfully: %s\n", targetCloudImageName) return nil } -// Creates a new devmachine that will be auto-deleted in 6 hours. +// Create a new devmachine that will be auto-deleted in 6 hours. // Example: MACHINE_IMAGE="family/platform-ingest-elastic-agent-ubuntu-2204" ZONE="us-central1-a" mage devmachine:create "pavel-dev-machine" // ZONE defaults to 'us-central1-a', MACHINE_IMAGE defaults to 'family/platform-ingest-elastic-agent-ubuntu-2204' func (Devmachine) Create(instanceName string) error { diff --git a/testing/integration/ess/upgrade_broken_package_test.go b/testing/integration/ess/upgrade_broken_package_test.go index c2b348ea87a..776646f8037 100644 --- a/testing/integration/ess/upgrade_broken_package_test.go +++ b/testing/integration/ess/upgrade_broken_package_test.go @@ -32,6 +32,7 @@ func TestUpgradeBrokenPackageVersion(t *testing.T) { Local: false, // requires Agent installation Sudo: true, // requires Agent installation }) + t.Skip("Skip this test until elastic agent version pinning is removed from Integration test runs on CI") ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute)) defer cancel() diff --git a/testing/integration/k8s/testdata/elastic-agent-kustomize.yaml b/testing/integration/k8s/testdata/elastic-agent-kustomize.yaml index f33a75ea622..7ce31a168a1 100644 --- a/testing/integration/k8s/testdata/elastic-agent-kustomize.yaml +++ b/testing/integration/k8s/testdata/elastic-agent-kustomize.yaml @@ -730,7 +730,7 @@ spec: configMapKeyRef: key: ca_trusted name: elastic-agent-configs-k799f79hhb - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 + image: docker.elastic.co/elastic-agent/elastic-agent:9.1.1 name: elastic-agent-standalone resources: limits: diff --git a/version/version.go b/version/version.go index 0174d9b7c1c..67b07dcfb80 100644 --- a/version/version.go +++ b/version/version.go @@ -4,5 +4,5 @@ package version -const defaultBeatVersion = "9.1.0" +const defaultBeatVersion = "9.1.1" const Agent = defaultBeatVersion