Skip to content

Remove release tag from APM package#7792

Merged
simitt merged 7 commits intoelastic:mainfrom
jsoriano:remove-package-release-label
Apr 27, 2022
Merged

Remove release tag from APM package#7792
simitt merged 7 commits intoelastic:mainfrom
jsoriano:remove-package-release-label

Conversation

@jsoriano
Copy link
Copy Markdown
Member

@jsoriano jsoriano commented Apr 5, 2022 •
edited
Loading

Motivation/summary

release tag has been deprecated elastic/package-spec#225 in favour of semantic versioning.

It can still be used, but incoherent uses between it and prerelease tags in the version are discouraged. The package registry provides a compatibility layer so packages without release continue working with old versions of Fleet. In the API, this tag is filled automatically when not provided in the package.

The APM package is making incoherent use of the release tag and its version, release is always ga, also in prerelease versions.

Checklist

How to test these changes

  • APM package should continue working.
  • Prerelease versions of the APM package should have a prerelease badge in Fleet UI.

Related issues

@jsoriano jsoriano self-assigned this Apr 5, 2022
@jsoriano jsoriano mentioned this pull request Apr 5, 2022
Closed
14 tasks
@ghost
Copy link
Copy Markdown

ghost commented Apr 5, 2022 •
edited by ghost
Loading

💚 Build Succeeded

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-04-27T13:00:29.412+0000

  • Duration: 27 min 31 sec

Test stats 🧪

Test Results
Failed 0
Passed 3978
Skipped 13
Total 3991

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /hey-apm : Run the hey-apm benchmark.

  • /package : Generate and publish the docker images.

  • /test windows : Build & tests on Windows.

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

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Apr 5, 2022

This pull request does not have a backport label. Could you fix it @jsoriano? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.x is the label to automatically backport to the 7.x branch.
  • backport-7./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Apr 5, 2022
@jsoriano
Copy link
Copy Markdown
Member Author

jsoriano commented Apr 5, 2022

@simitt @axw I am finding problems updating elastic-package here. Do you have an idea of what could be happening?
I think this may be related to the specific go.mod in the tools directory. If I move the entries there to the root-level go.mod, elastic-package works.

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Apr 7, 2022

This pull request is now in conflicts. Could you fix it @jsoriano? 🙏
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 remove-package-release-label upstream/remove-package-release-label
git merge upstream/main
git push upstream remove-package-release-label

@axw
Copy link
Copy Markdown
Member

axw commented Apr 11, 2022

@jsoriano seems to be a module dependency conflict in tools. That needs to be fixed - we shouldn't have tools in the top level go.mod.

@jsoriano
Copy link
Copy Markdown
Member Author

jsoriano commented Apr 11, 2022 •
edited
Loading

@jsoriano seems to be a module dependency conflict in tools. That needs to be fixed - we shouldn't have tools in the top level go.mod.

The problem seems to be in shared kubernetes libraries:

$ go run -modfile=tools/go.mod github.com/elastic/elastic-package version
# k8s.io/client-go/applyconfigurations/meta/v1
../../../../pkg/mod/k8s.io/client-go@v0.23.5/applyconfigurations/meta/v1/unstructured.go:64:38: cannot use doc (variable of type *"github.com/googleapis/gnostic/openapiv2".Document) as type *"github.com/google/gnostic/openapiv2".Document in argument to proto.NewOpenAPIData
# k8s.io/kubectl/pkg/util/openapi
../../../../pkg/mod/k8s.io/kubectl@v0.23.5/pkg/util/openapi/openapi.go:49:38: cannot use doc (variable of type *"github.com/googleapis/gnostic/openapiv2".Document) as type *"github.com/google/gnostic/openapiv2".Document in argument to proto.NewOpenAPIData

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Apr 19, 2022

This pull request is now in conflicts. Could you fix it @jsoriano? 🙏
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 remove-package-release-label upstream/remove-package-release-label
git merge upstream/main
git push upstream remove-package-release-label

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Apr 27, 2022

This pull request is now in conflicts. Could you fix it @jsoriano? 🙏
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 remove-package-release-label upstream/remove-package-release-label
git merge upstream/main
git push upstream remove-package-release-label

@ghost
Copy link
Copy Markdown

ghost commented Apr 27, 2022

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 100.0% (43/43) 💚
Files 91.878% (181/197) 👍
Classes 93.407% (425/455) 👍
Methods 89.283% (1083/1213) 👍
Lines 77.382% (13151/16995) 👍 0.024
Conditionals 100.0% (0/0) 💚

simitt
simitt approved these changes Apr 27, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution Jaime!

@simitt simitt added backport-8.2 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Apr 27, 2022
@simitt simitt merged commit a83d6c8 into elastic:main Apr 27, 2022
mergify bot pushed a commit that referenced this pull request Apr 27, 2022
@jsoriano @mergify
Remove release tag from APM package (#7792)
53f812e 
* Remove release tag from APM package

* Add changelog

* Update elastic-package

* remove dead code

Co-authored-by: simitt <silvia.mitter@elastic.co>
(cherry picked from commit a83d6c8)

# Conflicts:
#	apmpackage/apm/changelog.yml
#	tools/go.mod
#	tools/go.sum
@mergify mergify bot mentioned this pull request Apr 27, 2022
Closed
@jsoriano jsoriano deleted the remove-package-release-label branch April 28, 2022 09:35
This was referenced Jun 6, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@simitt simitt simitt approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jsoriano jsoriano

Labels

backport-8.2 Automated backport with mergify

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jsoriano @axw @simitt