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

Bug 1857162: daemon: inject proxy vars into MCD container #2037

Merged
merged 2 commits into from Sep 3, 2020
Merged

Bug 1857162: daemon: inject proxy vars into MCD container #2037

merged 2 commits into from Sep 3, 2020

Commits on Aug 28, 2020

  1. daemon: inject proxy vars into MCD container 

    With the introduction of extensions and reworking of OS updates in
openshift#1941,
we now run `oc/podman` directly in the MCD to fetch the OS image.
Thus we need to inject the proxy env vars into the container via the
daemonset definition, otherwise image pulls will fail.

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>
    @yuqi-zhang
    yuqi-zhang committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    ea0f893 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2020

  1. lib/resourcemerge: sync daemonset container env vars 

    Sync env var changes in the daemonset definition, so injected proxy
env var updates will get applied upon an upgrade.

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>
    @yuqi-zhang
    yuqi-zhang committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    197db25 View commit details
    Browse the repository at this point in the history