Skip to content

Commit

Permalink
Bump the version on main to 8.16.0 (#5056)
Browse files Browse the repository at this point in the history 
* [Release] update version
* Skip TestUpgradeBrokenPackageVersion until version bump is complete

---------

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
Co-authored-by: elasticmachine <infra-root+elasticmachine@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
Co-authored-by: Julien Lind <julien.lind@elastic.co>
Co-authored-by: julienlind <vincent.lind@elastic.co>
Co-authored-by: Denis Rechkunov <denis.rechkunov@elastic.co>
Co-authored-by: Paolo Chila <paolo.chila@elastic.co>
  • Loading branch information
@elastic-vault-github-plugin-prod @elasticmachine
@pierrehilbert @alexsapran @jlind23 @rdner @pchila
8 people authored Jul 9, 2024
1 parent 1789278 commit f49e1d8
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 19 deletions.
2 changes: 1 addition & 1 deletion ...c-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: elastic-agent
image: docker.elastic.co/beats/elastic-agent:8.15.0
image: docker.elastic.co/beats/elastic-agent:8.16.0
env:
# Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
- name: FLEET_ENROLL
Expand Down
6 changes: 3 additions & 3 deletions ...t-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ spec:
# Uncomment if using hints feature
#initContainers:
# - name: k8s-templates-downloader
# image: docker.elastic.co/beats/elastic-agent:8.15.0
# image: docker.elastic.co/beats/elastic-agent:8.16.0
# command: ['bash']
# args:
# - -c
# - >-
# mkdir -p /usr/share/elastic-agent/state/inputs.d &&
# curl -sL https://github.com/elastic/elastic-agent/archive/8.15.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-8.15/deploy/kubernetes/elastic-agent-standalone/templates.d"
# curl -sL https://github.com/elastic/elastic-agent/archive/8.16.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-8.16/deploy/kubernetes/elastic-agent-standalone/templates.d"
# securityContext:
# runAsUser: 0
# volumeMounts:
# - name: elastic-agent-state
# mountPath: /usr/share/elastic-agent/state
containers:
- name: elastic-agent-standalone
image: docker.elastic.co/beats/elastic-agent:8.15.0
image: docker.elastic.co/beats/elastic-agent:8.16.0
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
Expand Down
2 changes: 1 addition & 1 deletion ...ustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: elastic-agent
image: docker.elastic.co/beats/elastic-agent:8.15.0
image: docker.elastic.co/beats/elastic-agent:8.16.0
env:
# Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
- name: FLEET_ENROLL
Expand Down
2 changes: 1 addition & 1 deletion ...omize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: elastic-agent
image: docker.elastic.co/beats/elastic-agent:8.15.0
image: docker.elastic.co/beats/elastic-agent:8.16.0
env:
# Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
- name: FLEET_ENROLL
Expand Down
6 changes: 3 additions & 3 deletions ...ze/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ spec:
# Uncomment if using hints feature
#initContainers:
# - name: k8s-templates-downloader
# image: docker.elastic.co/beats/elastic-agent:8.15.0
# image: docker.elastic.co/beats/elastic-agent:8.16.0
# command: ['bash']
# args:
# - -c
# - >-
# mkdir -p /usr/share/elastic-agent/state/inputs.d &&
# curl -sL https://github.com/elastic/elastic-agent/archive/8.15.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-8.15/deploy/kubernetes/elastic-agent-standalone/templates.d"
# curl -sL https://github.com/elastic/elastic-agent/archive/8.16.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-8.16/deploy/kubernetes/elastic-agent-standalone/templates.d"
# securityContext:
# runAsUser: 0
# volumeMounts:
# # - name: elastic-agent-state
# # mountPath: /usr/share/elastic-agent/state
containers:
- name: elastic-agent-standalone
image: docker.elastic.co/beats/elastic-agent:8.15.0
image: docker.elastic.co/beats/elastic-agent:8.16.0
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
Expand Down
6 changes: 3 additions & 3 deletions ...ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ spec:
# Uncomment if using hints feature
#initContainers:
# - name: k8s-templates-downloader
# image: docker.elastic.co/beats/elastic-agent:8.15.0
# image: docker.elastic.co/beats/elastic-agent:8.16.0
# command: ['bash']
# args:
# - -c
# - >-
# mkdir -p /usr/share/elastic-agent/state/inputs.d &&
# curl -sL https://github.com/elastic/elastic-agent/archive/8.15.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-8.15/deploy/kubernetes/elastic-agent-standalone/templates.d"
# curl -sL https://github.com/elastic/elastic-agent/archive/8.16.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-8.16/deploy/kubernetes/elastic-agent-standalone/templates.d"
# securityContext:
# runAsUser: 0
# volumeMounts:
# # - name: elastic-agent-state
# # mountPath: /usr/share/elastic-agent/state
containers:
- name: elastic-agent-standalone
image: docker.elastic.co/beats/elastic-agent:8.15.0
image: docker.elastic.co/beats/elastic-agent:8.16.0
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
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: elastic-agent
image: docker.elastic.co/beats/elastic-agent:8.15.0
image: docker.elastic.co/beats/elastic-agent:8.16.0
env:
# Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
- name: FLEET_ENROLL
Expand Down
6 changes: 3 additions & 3 deletions deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -696,21 +696,21 @@ spec:
# Uncomment if using hints feature
#initContainers:
# - name: k8s-templates-downloader
# image: docker.elastic.co/beats/elastic-agent:8.15.0
# image: docker.elastic.co/beats/elastic-agent:8.16.0
# command: ['bash']
# args:
# - -c
# - >-
# mkdir -p /usr/share/elastic-agent/state/inputs.d &&
# curl -sL https://github.com/elastic/elastic-agent/archive/8.15.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-8.15/deploy/kubernetes/elastic-agent-standalone/templates.d"
# curl -sL https://github.com/elastic/elastic-agent/archive/8.16.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-8.16/deploy/kubernetes/elastic-agent-standalone/templates.d"
# securityContext:
# runAsUser: 0
# volumeMounts:
# - name: elastic-agent-state
# mountPath: /usr/share/elastic-agent/state
containers:
- name: elastic-agent-standalone
image: docker.elastic.co/beats/elastic-agent:8.15.0
image: docker.elastic.co/beats/elastic-agent:8.16.0
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
Expand Down
4 changes: 3 additions & 1 deletion testing/integration/fleetserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@ func TestInstallFleetServerBootstrap(t *testing.T) {
Local: false,
})

t.Skip("Skip until the first 8.16.0-SNAPSHOT is available")

ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
defer cancel()

// Get path to Elastic Agent executable
fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
fixture, err := define.NewFixtureFromLocalBuild(t, define.Version(), atesting.WithAdditionalArgs([]string{"-E", "output.elasticsearch.allow_older_versions=true"}))
require.NoError(t, err)
err = fixture.Prepare(ctx)
require.NoError(t, err)
Expand Down
4 changes: 3 additions & 1 deletion testing/integration/upgrade_broken_package_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@ func TestUpgradeBrokenPackageVersion(t *testing.T) {
Sudo: true, // requires Agent installation
})

t.Skip("Skipping test until 8.16.0 bump is complete and agent version pinning is removed")

ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
defer cancel()

// Start at the build version as we want to test the retry
// logic that is in the build.
startFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
startFixture, err := define.NewFixtureFromLocalBuild(t, define.Version(), atesting.WithAdditionalArgs([]string{"-E", "output.elasticsearch.allow_older_versions=true"}))
require.NoError(t, err)

// Upgrade to an old build.
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

package version

const defaultBeatVersion = "8.15.0"
const defaultBeatVersion = "8.16.0"
const Agent = defaultBeatVersion

0 comments on commit f49e1d8

Please sign in to comment.