Skip to content

OCPBUGS-2197: OCPBUGS-2122: update: Inject proxy data for firstboot #3370

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

Merged
openshift-merge-robot merged 2 commits into from
Oct 13, 2022
Merged

OCPBUGS-2197: OCPBUGS-2122: update: Inject proxy data for firstboot #3370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f87ef8
OCPBUGS-2197: update: Inject proxy data for firstboot
cgwalters Oct 12, 2022
53da993
templates: Also inject proxy into rpm-ostreed.service
cgwalters Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/daemon/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,7 +1936,8 @@ func (dn *Daemon) InplaceUpdateViaNewContainer(target string) error {
} else {
glog.Info("SELinux is not enforcing")
}
err = runCmdSync("systemd-run", "--unit", "machine-config-daemon-update-rpmostree-via-container", "--collect", "--wait", "--", "podman", "run", "--authfile", "/var/lib/kubelet/config.json", "--privileged", "--pid=host", "--net=host", "--rm", "-v", "/:/run/host", target, "rpm-ostree", "ex", "deploy-from-self", "/run/host")

err = runCmdSync("systemd-run", "--unit", "machine-config-daemon-update-rpmostree-via-container", "--collect", "--wait", "--", "podman", "run", "--env-file", "/etc/mco/proxy.env", "--authfile", "/var/lib/kubelet/config.json", "--privileged", "--pid=host", "--net=host", "--rm", "-v", "/:/run/host", target, "rpm-ostree", "ex", "deploy-from-self", "/run/host")
if err != nil {
return err
}
Expand Down
8 changes: 8 additions & 0 deletions templates/common/_base/units/rpm-ostreed-proxy.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: rpm-ostreed.service
dropins:
- name: 10-mco-default-env.conf
contents: |
{{if .Proxy -}}
[Service]
EnvironmentFile=/etc/mco/proxy.env
{{end -}}