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

Add --package-registry-url flag #1069

Merged
merged 3 commits into from
Feb 25, 2021
Merged

Conversation

axw
Copy link
Member

@axw axw commented Feb 24, 2021

What does this PR do?

Add a --package-registry-url flag to control the Elastic Package Registry URL passed into the managed APM Server service and Kibana service environment variables.

Also, set XPACK_FLEET_REGISTRYURL in the Kibana environment (consistently with APM Server) regardless of whether we're using a local package registry or not.

Remove the dependency from APM Server to the local package registry; there is already a transitive dependency through Kibana.

Why is it important?

When running build candidates in the future we should probably default to running with the production Elastic Package Registry (epr.elastic.co). We will need to test with snapshots and staging though, so we can test with packages before they're promoted.

Related issues

Closes #1068

@axw axw requested a review from simitt February 24, 2021 10:29
@jalvz
Copy link
Contributor

jalvz commented Feb 24, 2021

@apmmachine
Copy link
Collaborator

apmmachine commented Feb 24, 2021

💚 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

Expand to view the summary

Build stats

  • Build Cause: Pull request #1069 updated

  • Start Time: 2021-02-24T12:30:27.801+0000

  • Duration: 35 min 47 sec

  • Commit: aa9739d

Test stats 🧪

Test Results
Failed 0
Passed 490
Skipped 1
Total 491

Trends 🧪

Image of Build Times

Image of Tests

@axw
Copy link
Member Author

axw commented Feb 24, 2021

@jalvz it is very similar, but that one just controls the local package registry. It could be useful to run a proxy between Kibana and EPR, so I think we should allow a full URL to be specified. Maybe in another PR we could change the --package-registry-distribution flag to control the default value for EPR as well as the local distribution.

Copy link
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.

Shouldn't the enable_package_registry be aware of the package_registry_url ?

scripts/modules/elastic_stack.py Show resolved Hide resolved
@axw
Copy link
Member Author

axw commented Feb 24, 2021

Shouldn't the enable_package_registry be aware of the package_registry_url ?

Not sure I follow. The new package_registry_url function consults enable_package_registry

axw added 2 commits February 24, 2021 20:19
Only set when passing --snapshot, --enable-package-registry,
or --package-registry-url. Otherwise, rely on the default
registry URL for the stack version.
@axw axw marked this pull request as ready for review February 24, 2021 12:47
@axw axw requested a review from simitt February 24, 2021 12:47
Copy link
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.

All good, I got confused by multiple package registry related config options.

@axw axw merged commit 530af4f into elastic:master Feb 25, 2021
@axw axw deleted the package-registry-url branch February 25, 2021 01:11
v1v added a commit to v1v/apm-integration-testing that referenced this pull request Mar 29, 2021
…rt-from-build

* upstream/master: (24 commits)
  Add mergify (elastic#1089)
  fix: update flake8 and deps to work with Python 3.8+ (elastic#1085)
  chore: bump elastic stack (elastic#1087)
  fix: force to activate venv (elastic#1086)
  fix: --opbeans-node-agent-local-repo=/a/local/dir (elastic#1084)
  ci: jjbb remove periodic-folder-trigger (elastic#1079)
  Fix APM Server managed by Elastic Agent setup (elastic#1078)
  docker/opbeans/go: use -mod=mod (elastic#1077)
  [fleet] fix elastic-agent setup (elastic#1076)
  update supported stack versions (elastic#1075)
  [CI] Increase timeout (elastic#1070)
  Add --package-registry-url flag (elastic#1069)
  Create opbeans_user/role with write/read access for the opbeans-python (elastic#1063)
  reset postgres sequences after database migration (elastic#1062)
  chore: bump Elastic Stack (elastic#1060)
  docker/go/nethttp: go build -mod=mod (elastic#1061)
  check agent liveness via version subcommand (elastic#1059)
  test: use filebeat step to grab Docker logs (elastic#1029)
  Update dotnet sdk 5.0 docker image (elastic#1048)
  docs: using Dyno (elastic#1056)
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot run 7.x build candidates with snapshot registry
5 participants