mirror of
https://github.com/goharbor/harbor.git
synced 2026-10-24 21:59:32 +03:00
9d255ebemade the content-trust signer bootstrap read CONTENT_TRUST_LEGACY_SIGNER_PULL_ENABLED, but nothing in make/ sets it, so an operator has no supported way to choose either value. core/env is regenerated by prepare, so editing it by hand does not survive a restart. Add content_trust.legacy_signer_pull_enabled to harbor.yml, carry an existing value through the 2.15.0 migration, render the variable into core/env, and accept only what yaml resolved to a boolean so a typo such as "flase" stops prepare instead of being read as either answer. The default is enabled, which matches #24085. Adapted for release-2.15.0: all four files conflicted only because the release branch already carries the network.allow_private_network_access block and the templated HARBOR_ALLOW_PRIVATE_NETWORK_ACCESS line at the same insertion points. The new content_trust key, jinja block, parse and env line are placed after those; nothing of the release branch's own plumbing was displaced. (cherry picked from commit9cd85ec39d) Signed-off-by: Prasanth Baskar <prasanth@8gears.com>