Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

chore: bump elastic-package to v0.32.1 #1959

Merged
merged 5 commits into from
Jan 10, 2022
Merged

chore: bump elastic-package to v0.32.1 #1959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
733ccd3
chore: bump elastic-package
mdelapenya Dec 29, 2021
a9ff3fb
fix: use agent complete as fleet-server
mdelapenya Dec 29, 2021
bfda8d9
chore: bump go version to 1.17
mdelapenya Dec 29, 2021
cd892bb
fix: match Go version in Ansible
mdelapenya Dec 29, 2021
010b37b
Merge branch 'main' into bump-elastic-package
mdelapenya Jan 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci/ansible/playbook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
- role: andrewrothstein.kind
- role: gantsign.golang
vars:
golang_version: 1.16.3
golang_version: 1.17
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need a way to pass .go-version file to here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adam-stokes what do you think about having a Make goal reading .go-version to install Go using Andrew Kroh's https://github.com/andrewkroh/gvm? Therefore, we won't duplicate Go versions in multiple places:

eval "$(gvm $(cat .go-version))"

vars:
ansible_user: admin
ansible_python_interpreter: /usr/bin/python3
Expand Down Expand Up @@ -91,7 +91,7 @@
when: "'kubernetes_autodiscover' in nodeLabel or 'helm' in nodeLabel"
- role: gantsign.golang
vars:
golang_version: 1.16.3
golang_version: 1.17
vars:
ansible_user: admin
ansible_python_interpreter: /usr/bin/python3
Expand Down
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.16.3
1.17
2 changes: 1 addition & 1 deletion cli/config/compose/profiles/fleet/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
volumes:
- ./${kibanaProfile:-default}/kibana.config.yml:/usr/share/kibana/config/kibana.yml
fleet-server:
image: "docker.elastic.co/beats/elastic-agent:${stackVersion:-8.1.0-dbc834fd-SNAPSHOT}"
image: "docker.elastic.co/beats/elastic-agent-complete:${stackVersion:-8.1.0-dbc834fd-SNAPSHOT}"
depends_on:
elasticsearch:
condition: service_healthy
Expand Down
9 changes: 2 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ require (
github.com/cucumber/messages-go/v10 v10.0.3 // indirect
github.com/docker/cli v20.10.7+incompatible
github.com/docker/docker v20.10.6+incompatible
github.com/elastic/elastic-package v0.27.0
github.com/elastic/elastic-package v0.32.1
github.com/elastic/go-elasticsearch/v8 v8.0.0-20210317102009-a9d74cec0186
github.com/elastic/go-windows v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/gobuffalo/packr/v2 v2.8.1
github.com/google/uuid v1.2.0
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0
Expand All @@ -22,17 +21,13 @@ require (
github.com/prometheus/procfs v0.7.3 // indirect
github.com/shirou/gopsutil/v3 v3.21.10
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.2.1
github.com/spf13/cobra v1.3.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.7.0
github.com/testcontainers/testcontainers-go v0.11.0
go.elastic.co/apm v1.13.0
go.elastic.co/apm/module/apmelasticsearch v1.10.0
go.elastic.co/apm/module/apmhttp v1.10.0
go.elastic.co/go-licence-detector v0.5.0 // indirect
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
golang.org/x/sys v0.0.0-20211109065445-02f5c0300f6e // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
gopkg.in/src-d/go-git.v4 v4.13.1
gopkg.in/yaml.v2 v2.4.0
gotest.tools/gotestsum v1.7.0
Expand Down
Loading