OCPBUGS-2197: update: Set proxy for inplace container update too by cgwalters · Pull Request #3377 · openshift/machine-config-operator

cgwalters · 2022-10-17T13:49:23Z

We need the proxy environment set for the podman invocation, not the rpm-ostree invocation inside the container, which today just scrapes data out of the container image and doesn't itself fetch again.

When my initial attempt at this didn't work, I confused myself into thinking we need the proxy inside the container too, but we don't today. (In the future, we might actually do the pull from there, so let's keep it)

The previous PR fixed proxy clusters for fresh installs; this should fix them for inplace upgrades from 4.11 too.

Closes: #3378

We need the proxy environment set for the *podman* invocation, not the rpm-ostree invocation inside the container, which today just scrapes data out of the container image and doesn't itself fetch again. When my initial attempt at this didn't work, I confused myself into thinking we need the proxy inside the container too, but we don't today. (In the future, we might actually do the pull from there, so let's keep it) The previous PR fixed proxy clusters for fresh installs; this should fix them for inplace upgrades from 4.11 too.

openshift-ci-robot · 2022-10-17T13:49:31Z

@cgwalters: This pull request references Jira Issue OCPBUGS-2197, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.12.0) matches configured target version for branch (4.12.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @rioliu-rh

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

We need the proxy environment set for the podman invocation, not the rpm-ostree invocation inside the container, which today just scrapes data out of the container image and doesn't itself fetch again.

When my initial attempt at this didn't work, I confused myself into thinking we need the proxy inside the container too, but we don't today. (In the future, we might actually do the pull from there, so let's keep it)

The previous PR fixed proxy clusters for fresh installs; this should fix them for inplace upgrades from 4.11 too.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

sinnykumari · 2022-10-17T14:02:12Z

pkg/daemon/update.go

 	}

-	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")
+	err = runCmdSync("systemd-run", "--unit", "machine-config-daemon-update-rpmostree-via-container", "-p", "EnvironmentFile=-/etc/mco/proxy.env", "--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")


Looks like there is an extra "-" before /etc/mco/proxy.env

Yeah, that's intentional because that's the systemd way to say "it's OK if this file doesn't exist". Today we write an empty /etc/mco/proxy.env if there's no proxy; I think it'd be cleaner sometime in the future to stop doing that. See https://www.freedesktop.org/software/systemd/man/systemd.exec.html#EnvironmentFile=

sinnykumari · 2022-10-17T14:34:50Z

/lgtm

openshift-ci · 2022-10-17T14:35:52Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, sinnykumari

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [cgwalters,sinnykumari]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2022-10-17T15:00:52Z

/retest-required

Remaining retests: 0 against base HEAD e46a003 and 2 for PR HEAD 96d2e53 in total

cgwalters · 2022-10-17T16:32:49Z

Hmm, not sure what's going on in that e2e-aws install failure; doesn't seem related.

sinnykumari · 2022-10-18T09:13:21Z

possible cause of e2e-aws test failure openshift/installer#6490 has been merged, let's retry.
/test e2e-aws
/test e2e-agnostic-upgrade

openshift-ci-robot · 2022-10-18T11:11:03Z

@cgwalters: This pull request references Jira Issue OCPBUGS-2197, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.12.0) matches configured target version for branch (4.12.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @rioliu-rh

Details

In response to this:

We need the proxy environment set for the podman invocation, not the rpm-ostree invocation inside the container, which today just scrapes data out of the container image and doesn't itself fetch again.

When my initial attempt at this didn't work, I confused myself into thinking we need the proxy inside the container too, but we don't today. (In the future, we might actually do the pull from there, so let's keep it)

The previous PR fixed proxy clusters for fresh installs; this should fix them for inplace upgrades from 4.11 too.

Closes: #3378

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

cgwalters · 2022-10-18T12:31:16Z

/override ci/prow/e2e-agnostic-upgrade
Failure in upgrade job is not related

openshift-ci · 2022-10-18T12:31:33Z

@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/e2e-agnostic-upgrade

Details

In response to this:

/override ci/prow/e2e-agnostic-upgrade
Failure in upgrade job is not related

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci · 2022-10-18T12:31:35Z

@cgwalters: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/okd-scos-e2e-aws	`96d2e53`	link	false	`/test okd-scos-e2e-aws`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-ci-robot · 2022-10-18T12:35:12Z

@cgwalters: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-2197 has been moved to the MODIFIED state.

Details

In response to this:

We need the proxy environment set for the podman invocation, not the rpm-ostree invocation inside the container, which today just scrapes data out of the container image and doesn't itself fetch again.

When my initial attempt at this didn't work, I confused myself into thinking we need the proxy inside the container too, but we don't today. (In the future, we might actually do the pull from there, so let's keep it)

The previous PR fixed proxy clusters for fresh installs; this should fix them for inplace upgrades from 4.11 too.

Closes: #3378

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Oct 17, 2022

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Oct 17, 2022

openshift-ci bot requested review from rioliu-rh, sinnykumari and yuqi-zhang October 17, 2022 13:49

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 17, 2022

sinnykumari reviewed Oct 17, 2022

View reviewed changes

openshift-ci bot assigned sinnykumari Oct 17, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 17, 2022

cgwalters mentioned this pull request Oct 17, 2022

machineconfigpool: Clarify status.configuration description #3371

Merged

cgwalters mentioned this pull request Oct 18, 2022

rpm-otreeed.service missing configuration proxy #3378

Closed

openshift-merge-robot merged commit c623eac into openshift:master Oct 18, 2022

Conversation

cgwalters commented Oct 17, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 17, 2022

Uh oh!

sinnykumari Oct 17, 2022

Choose a reason for hiding this comment

Uh oh!

cgwalters Oct 17, 2022

Choose a reason for hiding this comment

Uh oh!

sinnykumari commented Oct 17, 2022

Uh oh!

openshift-ci bot commented Oct 17, 2022

Uh oh!

openshift-ci-robot commented Oct 17, 2022

Uh oh!

cgwalters commented Oct 17, 2022

Uh oh!

sinnykumari commented Oct 18, 2022

Uh oh!

openshift-ci-robot commented Oct 18, 2022

Uh oh!

cgwalters commented Oct 18, 2022

Uh oh!

openshift-ci bot commented Oct 18, 2022

Uh oh!

openshift-ci bot commented Oct 18, 2022

Uh oh!

openshift-ci-robot commented Oct 18, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

cgwalters commented Oct 17, 2022 •

edited

Loading