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.

Sign up for GitHub

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

Jump to bottom

[3.6][Backport] Prune images (not)securely #16138

Merged
merged 3 commits into from
Sep 14, 2017
Merged

[3.6][Backport] Prune images (not)securely #16138

merged 3 commits into from
Sep 14, 2017

Commits on Sep 13, 2017

  1. image-pruner: Determine protocol just once 

    Determine the registry protocol once. Do not change to other protocol
during the run. This will produce nicer output without unrelated
protocol fallback errors.

Do not default to insecure connection when the --registry-url is empty.

Move registry client initialization just before the start of the pruner
- so we can precisely determine whether to allow for insecure fall-back
based on collected images and image streams.

Move ping() outside of pruner. Instead, determine the registry URL
before the pruner starts and assume it won't change during the run.

Signed-off-by: Michal Minář <[email protected]>
    Michal Minář committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    7785c02 View commit details
    Browse the repository at this point in the history

  2. image-pruner: Reenable registry-url validation 

    Signed-off-by: Michal Minář <[email protected]>
    Michal Minář committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    c5b4bc8 View commit details
    Browse the repository at this point in the history

  3. Retry image stream updates when pruning images

    @soltysh
    soltysh authored and Michal Minář committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    b4bb2f7 View commit details
    Browse the repository at this point in the history