Skip to content

Conversation

@evertmulder
Copy link

This PR fixes okd-project/okd#19. On fcos the machine-config-daemon-firstboot cannot pull images when behind a proxy.
This PR configures the proxy settings for the machine-config-daemon-firstboot service.

- How to verify it
Start an OKD installation using proxy settings in the install-config.yaml. The master would fail with

Error: unable to pull quay.io/openshift/okd-content@sha256:6625bb97a35604080af348340f0788df36455352b1a039f073cb6894c548fb78: unable to pull image: Error initializing source docker://quay.io/openshift/okd-content@sha256:6625bb97a35604080af348340f0788df36455352b1a039f073cb6894c548fb78: pinging docker registry returned: Get https://quay.io/v2/: dial tcp 3.230.48.144:443: i/o timeout

After the PR the image should be pulled using the configured proxy.

- Description for the changelog

@openshift-ci-robot
Copy link
Contributor

Hi @evertmulder. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@openshift-ci-robot openshift-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 1, 2020
@LorbusChris
Copy link
Contributor

LorbusChris commented Jun 2, 2020

@evertmulder thank you for your contribution, this is highly appreciated!

Is there a reason not to merge the dropin file with the service unit definition at https://github.com/openshift/machine-config-operator/blob/fcos/templates/common/_base/units/machine-config-daemon-firstboot.service?

If you could also open a PR against master: https://github.com/openshift/machine-config-operator/blob/master/templates/common/_base/units/machine-config-daemon-firstboot.service that'd be ideal :) actually, this is not yet needed on the master branch since MCD isn't pulled from the MCO container image there yet.

@evertmulder
Copy link
Author

evertmulder commented Jun 2, 2020

@LorbusChris

Is there a reason not to merge the dropin file with the service unit definition at https://github.com/openshift/machine-config-operator/blob/fcos/templates/common/_base/units/machine-config-daemon-firstboot.service?

I guest not. This looks in line with the other proxy injections like _base/files/etc-systemd-system-machine-config-daemon-host.service.d-10-default-env.conf.yaml, _base/files/etc-systemd-system-kubelet.service.d-10-default-env.conf.yaml and _base/files/etc-systemd-system-crio.service.d-10-default-env.conf.yaml.

@vrutkovs
Copy link
Contributor

vrutkovs commented Jun 2, 2020

/ok-to-test

Lets keep in line with other service dropins here. I updated 4.5 fcos branch and moved dropins to the service definition so that Ignition translator would be happy

@openshift-ci-robot openshift-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 2, 2020
@LorbusChris
Copy link
Contributor

Note that this here is going to land in master soon: 4b1f622.

Instead of a plain Ignition file, this should really be an ignition systemd unit content (or dropin).

@LorbusChris
Copy link
Contributor

Some of the systemd dropins are indeed laid out as ignition files, even though they should really be ignition systemd dropins.

@evertmulder evertmulder marked this pull request as draft June 2, 2020 14:58
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2020
@evertmulder evertmulder marked this pull request as ready for review June 2, 2020 17:34
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2020
@evertmulder
Copy link
Author

evertmulder commented Jun 2, 2020

Tested the PR on our environment and the the installation behind a proxy is working now.

@LorbusChris
Copy link
Contributor

This PR looks fine. I think we can merge as is. In master, this will be superseded by #1766
/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 2, 2020
Copy link
Contributor

@vrutkovs vrutkovs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 2, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: evertmulder, LorbusChris, vrutkovs

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 [LorbusChris,vrutkovs]

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

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged this pull request into openshift:fcos Jun 2, 2020
@LorbusChris
Copy link
Contributor

@evertmulder thank you so much for taking the initiative and putting up the PR! 🎉

@evertmulder evertmulder deleted the Proxy-for-machine-config-daemon-firstboot branch June 3, 2020 06:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants