Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.17](backport #32574) [automation] Update go release version 1.18.5 #32693

Merged
merged 8 commits into from
Sep 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 15, 2022

This is an automatic backport of pull request #32574 done by Mergify.
Cherry-pick of 56ca6f5 has failed:

On branch mergify/bp/7.17/pr-32574
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 56ca6f5c4d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   libbeat/outputs/kafka/kafka_integration_test.go
	modified:   testing/environments/docker/kafka/Dockerfile
	modified:   testing/environments/docker/kafka/README.md
	modified:   testing/environments/docker/kafka/certs/broker-cert
	modified:   testing/environments/docker/kafka/certs/broker-cert-signed
	modified:   testing/environments/docker/kafka/certs/broker.keystore.jks
	modified:   testing/environments/docker/kafka/certs/ca-cert
	modified:   testing/environments/docker/kafka/certs/ca-cert.srl
	modified:   testing/environments/docker/kafka/certs/ca-key
	modified:   testing/environments/docker/kafka/certs/client.truststore.jks

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/golangci-lint.yml
	both modified:   .go-version
	deleted by us:   .golangci.yml
	both modified:   NOTICE.txt
	both modified:   auditbeat/Dockerfile
	both modified:   go.mod
	both modified:   go.sum
	both modified:   heartbeat/Dockerfile
	both modified:   libbeat/docs/version.asciidoc
	both modified:   metricbeat/Dockerfile
	both modified:   packetbeat/Dockerfile
	both modified:   winlogbeat/sys/wineventlog/publisher_metadata.go
	both modified:   winlogbeat/sys/wineventlog/syscall_windows.go
	both modified:   x-pack/functionbeat/Dockerfile

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* [Automation] Update go release version to 1.18.5

* Merge Go 1.18 fixes (#32653)

* Update Kafka base image to Debian buster.

Done to allow updating to OpenJDK 11 to ensure compatibility with the
output from keytool on my local machine that used a much more recent
version of OpenJDK.

* Regenerate Kafka certs to use SHA-256.

The certificates were previously signed with SHA-1 which is deprecated
in Go 1.18 due to being insecure.

* Rename test cases so they can be run  individually

* Upgrade golangci-lint in actions.

* Update notice file.

* Fix misplaced changelog entry.

* Add release note for Go 1.18 upgrade.

* Upgrade to elastic-agent-libs v0.2.11

Updates the linter targets to auto upgrade when the linter version
changes.

* Work around errorlint bug in wineventlog pkg.

errorlint does not correctly parse indexed fmt verbs when they have a
verb modifier.

Co-authored-by: apmmachine <infra-root-apmmachine@elastic.co>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
(cherry picked from commit 56ca6f5)

# Conflicts:
#	.github/workflows/golangci-lint.yml
#	.go-version
#	.golangci.yml
#	NOTICE.txt
#	auditbeat/Dockerfile
#	go.mod
#	go.sum
#	heartbeat/Dockerfile
#	libbeat/docs/version.asciidoc
#	metricbeat/Dockerfile
#	packetbeat/Dockerfile
#	winlogbeat/sys/wineventlog/publisher_metadata.go
#	winlogbeat/sys/wineventlog/syscall_windows.go
#	x-pack/functionbeat/Dockerfile
@mergify mergify bot requested review from a team as code owners August 15, 2022 14:20
@mergify mergify bot requested review from rdner and removed request for a team August 15, 2022 14:20
@mergify mergify bot added the backport label Aug 15, 2022
@mergify mergify bot requested a review from cmacknz August 15, 2022 14:20
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Aug 15, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 15, 2022
@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 15, 2022

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-09-07T21:42:12.717+0000

  • Duration: 233 min 37 sec

Test stats 🧪

Test Results
Failed 0
Passed 22497
Skipped 1578
Total 24075

Steps errors 5

Expand to view the steps failures

Docker login
  • Took 0 min 1 sec . View more details here
  • Description: set +x if command -v host 2>&1 > /dev/null; then host docker.elastic.co 2>&1 > /dev/null fi if command -v dig 2>&1 > /dev/null; then dig docker.elastic.co 2>&1 > /dev/null fi docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}" "docker.elastic.co" 2>/dev/null
Docker login
  • Took 0 min 16 sec . View more details here
  • Description: set +x if command -v host 2>&1 > /dev/null; then host docker.elastic.co 2>&1 > /dev/null fi if command -v dig 2>&1 > /dev/null; then dig docker.elastic.co 2>&1 > /dev/null fi docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}" "docker.elastic.co" 2>/dev/null
Docker login
  • Took 0 min 1 sec . View more details here
  • Description: set +x if command -v host 2>&1 > /dev/null; then host docker.elastic.co 2>&1 > /dev/null fi if command -v dig 2>&1 > /dev/null; then dig docker.elastic.co 2>&1 > /dev/null fi docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}" "docker.elastic.co" 2>/dev/null
Docker login
  • Took 0 min 16 sec . View more details here
  • Description: set +x if command -v host 2>&1 > /dev/null; then host docker.elastic.co 2>&1 > /dev/null fi if command -v dig 2>&1 > /dev/null; then dig docker.elastic.co 2>&1 > /dev/null fi docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}" "docker.elastic.co" 2>/dev/null
Building Beats » Beats Packaging » PR-32693
  • Took 122 min 43 sec . View more details here
  • Description: null

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@cmacknz cmacknz mentioned this pull request Aug 15, 2022
5 tasks
@cmacknz cmacknz self-assigned this Aug 15, 2022
@cmacknz cmacknz added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Aug 15, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 15, 2022
@cmacknz
Copy link
Member

cmacknz commented Aug 15, 2022

The current plan is to merge this after the release of 7.17.6.

@rdner rdner removed their request for review August 18, 2022 07:11
@mergify
Copy link
Contributor Author

mergify bot commented Aug 22, 2022

This pull request has not been merged yet. Could you please review and merge it @cmacknz, @apmmachine? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Aug 22, 2022

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.17/pr-32574 upstream/mergify/bp/7.17/pr-32574
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-32574

@mergify
Copy link
Contributor Author

mergify bot commented Aug 29, 2022

This pull request has not been merged yet. Could you please review and merge it @cmacknz, @apmmachine? 🙏

@cmacknz
Copy link
Member

cmacknz commented Aug 31, 2022

Reminder: we need to bump the version to go 1.18 in go.mod as well. #32940

@cmacknz
Copy link
Member

cmacknz commented Aug 31, 2022

Bringing this PR back to life now that 7.17.6 is released.

@efd6
Copy link
Contributor

efd6 commented Sep 1, 2022

Note https://groups.google.com/g/golang-dev/c/cXXh_u-iRmg

Hello gophers,

We plan to issue Go 1.19.1 and Go 1.18.6 on Tuesday, September 6.

These minor releases include PRIVATE security fixes to the standard library.

Following our security policy, this is the pre-announcement of those releases.

Thanks,
Damien for the Go team

@cmacknz
Copy link
Member

cmacknz commented Sep 1, 2022

Running go mod tidy locally insists github.com/elastic/elastic-agent-libs is a dependency but CI insists it should be removed:

[2022-09-01T01:37:15.533Z] diff --git a/go.mod b/go.mod
[2022-09-01T01:37:15.533Z] index 5af4d29ea7..081df56d73 100644
[2022-09-01T01:37:15.533Z] --- a/go.mod
[2022-09-01T01:37:15.534Z] +++ b/go.mod
[2022-09-01T01:37:15.534Z] @@ -195,8 +195,6 @@ require (
[2022-09-01T01:37:15.534Z]  	kernel.org/pub/linux/libs/security/libcap/cap v1.2.57
[2022-09-01T01:37:15.534Z]  )
[2022-09-01T01:37:15.534Z]  
[2022-09-01T01:37:15.534Z] -require github.com/elastic/elastic-agent-libs v0.2.11
[2022-09-01T01:37:15.534Z] -
[2022-09-01T01:37:15.534Z]  require  
[2022-09-01T01:37:15.534Z]  	cloud.google.com/go v0.99.0 // indirect
[2022-09-01T01:37:15.534Z]  	code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect

7.17 doesn't actually import elastic-agent-libs which go mod why confirms and go mod graph isn't particularly helpful either. 🤷

@mergify
Copy link
Contributor Author

mergify bot commented Sep 5, 2022

This pull request has not been merged yet. Could you please review and merge it @cmacknz, @apmmachine? 🙏

@cmacknz
Copy link
Member

cmacknz commented Sep 6, 2022

Packaging is failing with this error which I think is unrelated:


[2022-09-06T17:17:17.042Z] Unable to find image 'docker.elastic.co/beats-dev/fpm:1.13.1' locally

[2022-09-06T17:17:27.074Z] docker: Error response from daemon: Get "https://docker.elastic.co/v2/": net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers).

[2022-09-06T17:17:27.074Z] See 'docker run --help'.

[2022-09-06T17:17:27.275Z] docker: Error response from daemon: Get "https://docker.elastic.co/v2/": net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers).

[2022-09-06T17:17:27.275Z] See 'docker run --help'.

[2022-09-06T17:17:27.275Z] docker: Error response from daemon: Get "https://docker.elastic.co/v2/": net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers).

[2022-09-06T17:17:27.275Z] See 'docker run --help'.

[2022-09-06T17:17:31.589Z] docker: Error response from daemon: Get "https://docker.elastic.co/v2/": net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers).

[2022-09-06T17:17:31.589Z] See 'docker run --help'.

[2022-09-06T17:17:32.092Z] docker: Error response from daemon: Get "https://docker.elastic.co/v2/": net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers).

[2022-09-06T17:17:32.092Z] See 'docker run --help'.

[2022-09-06T17:17:51.851Z] package ran for 9m43.498309246s

@cmacknz
Copy link
Member

cmacknz commented Sep 6, 2022

/package

3 similar comments
@cmacknz
Copy link
Member

cmacknz commented Sep 6, 2022

/package

@cmacknz
Copy link
Member

cmacknz commented Sep 7, 2022

/package

@cmacknz
Copy link
Member

cmacknz commented Sep 7, 2022

/package

@cmacknz
Copy link
Member

cmacknz commented Sep 7, 2022

/package x-pack/heartbeat

@cmacknz
Copy link
Member

cmacknz commented Sep 7, 2022

/package

@cmacknz
Copy link
Member

cmacknz commented Sep 8, 2022

Managed to get packaging to succeed, merging: https://beats-ci.elastic.co/job/Beats/job/packaging/view/change-requests/job/PR-32693/

@cmacknz cmacknz merged commit 5de24de into 7.17 Sep 8, 2022
@cmacknz cmacknz deleted the mergify/bp/7.17/pr-32574 branch September 8, 2022 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants