OCPBUGS-29067: Prepend resolv.conf on the bootstrap node of GCP with custom-dns #8811

sadasu · 2024-08-07T20:24:46Z

When UserProvisionedDNS is enabled during an install on GCP, prepend the NetworkManager generated resolv.conf file on the bootstrap node with the IP of the localhost.

openshift-ci-robot · 2024-08-07T20:24:51Z

@sadasu: This pull request references Jira Issue OCPBUGS-29067, which is invalid:

expected the bug to target either version "4.17." or "openshift-4.17.", but it targets "4.16.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

When UserProvisionedDNS is enabled during an install on GCP, prepend the NetworkManager generated resolv.conf file on the bootstrap node with the IP of the localhost.

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 openshift-eng/jira-lifecycle-plugin repository.

sadasu · 2024-08-07T20:27:11Z

/jira refresh

openshift-ci-robot · 2024-08-07T20:27:16Z

@sadasu: This pull request references Jira Issue OCPBUGS-29067, which is valid.

3 validation(s) were run on this bug

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

No GitHub users were found matching the public email listed for the QA contact in Jira (yunjiang@redhat.com), skipping review request.

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

sadasu · 2024-11-06T22:18:34Z

/retest-required

openshift-ci-robot · 2024-11-07T15:07:12Z

@sadasu: This pull request references Jira Issue OCPBUGS-29067, which is invalid:

expected the bug to target either version "4.18." or "openshift-4.18.", but it targets "4.17.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

When UserProvisionedDNS is enabled during an install on GCP, prepend the NetworkManager generated resolv.conf file on the bootstrap node with the IP of the localhost.

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 openshift-eng/jira-lifecycle-plugin repository.

sadasu · 2024-11-07T15:07:19Z

/test ?

openshift-ci · 2024-11-07T15:08:05Z

@sadasu: The following commands are available to trigger required jobs:

/test altinfra-images
/test aro-unit
/test artifacts-images
/test e2e-agent-compact-ipv4
/test e2e-aws-ovn
/test e2e-aws-ovn-edge-zones-manifest-validation
/test e2e-aws-ovn-upi
/test e2e-azure-ovn
/test e2e-azure-ovn-upi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upi
/test e2e-metal-ipi-ovn-ipv6
/test e2e-openstack-ovn
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi
/test gofmt
/test golint
/test govet
/test images
/test integration-tests
/test integration-tests-nodejoiner
/test okd-images
/test okd-unit
/test okd-verify-codegen
/test openstack-manifests
/test shellcheck
/test terraform-images
/test terraform-verify-vendor
/test tf-lint
/test unit
/test verify-codegen
/test verify-vendor
/test yaml-lint

The following commands are available to trigger optional jobs:

/test altinfra-e2e-aws-custom-security-groups
/test altinfra-e2e-aws-ovn
/test altinfra-e2e-aws-ovn-fips
/test altinfra-e2e-aws-ovn-imdsv2
/test altinfra-e2e-aws-ovn-localzones
/test altinfra-e2e-aws-ovn-proxy
/test altinfra-e2e-aws-ovn-shared-vpc
/test altinfra-e2e-aws-ovn-shared-vpc-local-zones
/test altinfra-e2e-aws-ovn-shared-vpc-wavelength-zones
/test altinfra-e2e-aws-ovn-single-node
/test altinfra-e2e-aws-ovn-wavelengthzones
/test altinfra-e2e-azure-capi-ovn
/test altinfra-e2e-azure-ovn-shared-vpc
/test altinfra-e2e-gcp-capi-ovn
/test altinfra-e2e-gcp-ovn-byo-network-capi
/test altinfra-e2e-gcp-ovn-secureboot-capi
/test altinfra-e2e-gcp-ovn-xpn-capi
/test altinfra-e2e-ibmcloud-capi-ovn
/test altinfra-e2e-nutanix-capi-ovn
/test altinfra-e2e-openstack-capi-ccpmso
/test altinfra-e2e-openstack-capi-ccpmso-zone
/test altinfra-e2e-openstack-capi-dualstack
/test altinfra-e2e-openstack-capi-dualstack-upi
/test altinfra-e2e-openstack-capi-dualstack-v6primary
/test altinfra-e2e-openstack-capi-externallb
/test altinfra-e2e-openstack-capi-nfv-intel
/test altinfra-e2e-openstack-capi-ovn
/test altinfra-e2e-openstack-capi-proxy
/test altinfra-e2e-vsphere-capi-multi-vcenter-ovn
/test altinfra-e2e-vsphere-capi-ovn
/test altinfra-e2e-vsphere-capi-static-ovn
/test altinfra-e2e-vsphere-capi-zones
/test azure-ovn-marketplace-images
/test e2e-agent-compact-ipv4-add-nodes
/test e2e-agent-compact-ipv4-appliance-diskimage
/test e2e-agent-compact-ipv4-none-platform
/test e2e-agent-ha-dualstack
/test e2e-agent-sno-ipv4-pxe
/test e2e-agent-sno-ipv6
/test e2e-aws-overlay-mtu-ovn-1200
/test e2e-aws-ovn-custom-iam-profile
/test e2e-aws-ovn-edge-zones
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-heterogeneous
/test e2e-aws-ovn-imdsv2
/test e2e-aws-ovn-min-perms
/test e2e-aws-ovn-proxy
/test e2e-aws-ovn-public-ipv4-pool
/test e2e-aws-ovn-public-ipv4-pool-disabled
/test e2e-aws-ovn-public-subnets
/test e2e-aws-ovn-shared-vpc-custom-security-groups
/test e2e-aws-ovn-shared-vpc-edge-zones
/test e2e-aws-ovn-single-node
/test e2e-aws-ovn-techpreview
/test e2e-aws-ovn-upgrade
/test e2e-aws-ovn-workers-rhel8
/test e2e-aws-upi-proxy
/test e2e-azure-ovn-resourcegroup
/test e2e-azure-ovn-shared-vpc
/test e2e-azure-ovn-techpreview
/test e2e-azurestack
/test e2e-azurestack-upi
/test e2e-crc
/test e2e-external-aws
/test e2e-external-aws-ccm
/test e2e-gcp-ovn-byo-vpc
/test e2e-gcp-ovn-heterogeneous
/test e2e-gcp-ovn-techpreview
/test e2e-gcp-ovn-xpn
/test e2e-gcp-secureboot
/test e2e-gcp-upgrade
/test e2e-gcp-upi-xpn
/test e2e-ibmcloud-ovn
/test e2e-metal-assisted
/test e2e-metal-ipi-ovn
/test e2e-metal-ipi-ovn-dualstack
/test e2e-metal-ipi-ovn-swapped-hosts
/test e2e-metal-ipi-ovn-virtualmedia
/test e2e-metal-single-node-live-iso
/test e2e-nutanix-ovn
/test e2e-openstack-ccpmso
/test e2e-openstack-ccpmso-zone
/test e2e-openstack-dualstack
/test e2e-openstack-dualstack-upi
/test e2e-openstack-externallb
/test e2e-openstack-nfv-intel
/test e2e-openstack-proxy
/test e2e-openstack-singlestackv6
/test e2e-powervs-capi-ovn
/test e2e-vsphere-multi-vcenter-ovn
/test e2e-vsphere-ovn-multi-network
/test e2e-vsphere-ovn-techpreview
/test e2e-vsphere-ovn-upi-zones
/test e2e-vsphere-ovn-zones
/test e2e-vsphere-ovn-zones-techpreview
/test e2e-vsphere-static-ovn
/test okd-e2e-aws-ovn
/test okd-e2e-aws-ovn-upgrade
/test okd-e2e-gcp
/test okd-e2e-gcp-ovn-upgrade
/test okd-e2e-vsphere
/test okd-scos-images
/test tf-fmt

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-installer-master-altinfra-images
pull-ci-openshift-installer-master-aro-unit
pull-ci-openshift-installer-master-artifacts-images
pull-ci-openshift-installer-master-e2e-aws-ovn
pull-ci-openshift-installer-master-e2e-gcp-ovn
pull-ci-openshift-installer-master-e2e-gcp-ovn-byo-vpc
pull-ci-openshift-installer-master-e2e-gcp-ovn-xpn
pull-ci-openshift-installer-master-e2e-gcp-secureboot
pull-ci-openshift-installer-master-gofmt
pull-ci-openshift-installer-master-golint
pull-ci-openshift-installer-master-govet
pull-ci-openshift-installer-master-images
pull-ci-openshift-installer-master-okd-unit
pull-ci-openshift-installer-master-okd-verify-codegen
pull-ci-openshift-installer-master-shellcheck
pull-ci-openshift-installer-master-tf-fmt
pull-ci-openshift-installer-master-tf-lint
pull-ci-openshift-installer-master-unit
pull-ci-openshift-installer-master-verify-codegen
pull-ci-openshift-installer-master-verify-vendor
pull-ci-openshift-installer-master-yaml-lint

In response to this:

/test ?

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-sigs/prow repository.

sadasu · 2024-11-07T15:13:40Z

/jira refresh

openshift-ci-robot · 2024-11-07T15:13:45Z

@sadasu: This pull request references Jira Issue OCPBUGS-29067, which is valid.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @jianli-wei

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

sadasu · 2024-11-07T15:14:13Z

/test e2e-metal-ipi-ovn

sadasu · 2024-11-09T16:38:21Z

From pre-merge testing performed by @jianli-wei, here are the contents of resolv.conf on the bootstrap node:

cat test1/log-bundle-20241107115909/log-bundle-20241107115909/bootstrap/network/resolv.conf
# Generated by NetworkManager
nameserver 127.0.0.1
search us-central1-a.c.openshift-qe.internal c.openshift-qe.internal google.internal
nameserver 169.254.169.254

sadasu · 2024-11-09T17:50:41Z

/retest-required

sadasu · 2024-11-14T18:47:37Z

@patrickdillon and @barbacbd Could PTAL?

barbacbd · 2024-11-14T19:21:40Z

data/data/bootstrap/gcp/files/etc/NetworkManager/dispatcher.d/30-local-dns-prepender.template

+            >&2 echo  "NM resolv-prepender: Checking for nameservers in /var/run/NetworkManager/resolv.conf"
+            while ! grep nameserver /var/run/NetworkManager/resolv.conf; do
+                >&2 echo  "NM resolv-prepender: NM resolv.conf still empty of nameserver"
+                sleep 0.5


Is there a reason to check twice a second or did you just intend to check often?

The latter.

barbacbd · 2024-11-14T19:27:50Z

data/data/bootstrap/gcp/files/etc/NetworkManager/dispatcher.d/30-local-dns-prepender.template

+#!/bin/bash
+IFACE=$1
+STATUS=$2
+case "$STATUS" in


I am a bit confused by the switch here. Can we just move the major block out? The default case isn't doing anything here. Is there another intention ?

I think the code to update resolv.conf does not need to be within the case statement. But, I am using what the on-prem platforms use and wanted to be consistent across all platforms that use in-cluster DNS. But, there is an ongoing effort to change the way resolv.conf is updated for all platforms that do this. This will get updated again at that time.

patrickdillon · 2024-11-14T20:36:01Z

pkg/asset/ignition/bootstrap/common.go

+	// Copy platform specific files/units when present with the exception of GCP
+	// On GCP, copy over platform specific files/units only when UserProvisionedDNS is enabled.


Rather than only copying files when userProvisionedDNS is enabled, it would be better to only conditionally generate the files (and always copy all files). I created an example of how to do this here: sadasu#1

The way this is currently written skips including GCP's custom report-progress.sh script and I don't think that was the intent.

Yup. I had considered templating it but didn't take that route because I hadn't seen report-progress.sh script

Updated. Slightly different from the suggestion to avoid check for empty templates.

avoid check for empty templates.

Sounds good!

When UserProvisionedDNS is enabled during an install on GCP, prepend the NetworkManager generated resolv.conf file on the bootstrap node with the IP of the localhost.

sadasu · 2024-11-15T14:50:55Z

/test e2e-metal-ipi-ovn

patrickdillon · 2024-11-15T15:07:30Z

/approve

patrickdillon · 2024-11-15T15:07:57Z

LGTM. Let's watch the tests

openshift-ci · 2024-11-15T15:07:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [patrickdillon]

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

sadasu · 2024-11-15T18:26:33Z

/retest-required

sadasu · 2024-11-15T18:27:35Z

/test e2e-gcp-ovn-byo-vpc

openshift-ci · 2024-11-15T21:26:23Z

@sadasu: The following tests 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-vsphere-ovn	ba889ebdeb2107959585d11c7d2e3676b3e9e606	link	false	`/test okd-scos-e2e-vsphere-ovn`
ci/prow/integration-tests-nodejoiner	ba889ebdeb2107959585d11c7d2e3676b3e9e606	link	true	`/test integration-tests-nodejoiner`
ci/prow/okd-scos-e2e-aws-ovn	`f84c973`	link	false	`/test okd-scos-e2e-aws-ovn`

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

barbacbd

/lgtm

openshift-ci-robot · 2024-11-19T02:26:58Z

@sadasu: Jira Issue OCPBUGS-29067: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

openshift/machine-config-operator#4367 is open

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

In response to this:

When UserProvisionedDNS is enabled during an install on GCP, prepend the NetworkManager generated resolv.conf file on the bootstrap node with the IP of the localhost.

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-bot · 2024-11-19T09:00:54Z

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-terraform-providers
This PR has been included in build ose-installer-terraform-providers-container-v4.18.0-202411190136.p0.g11aa461.assembly.stream.el9.
All builds following this will include this PR.

openshift-bot · 2024-11-19T09:48:48Z

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-altinfra
This PR has been included in build ose-installer-altinfra-container-v4.18.0-202411190136.p0.g11aa461.assembly.stream.el9.
All builds following this will include this PR.

openshift-bot · 2024-11-19T10:07:14Z

[ART PR BUILD NOTIFIER]

Distgit: ose-baremetal-installer
This PR has been included in build ose-baremetal-installer-container-v4.18.0-202411190136.p0.g11aa461.assembly.stream.el9.
All builds following this will include this PR.

openshift-bot · 2024-11-19T10:55:08Z

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-artifacts
This PR has been included in build ose-installer-artifacts-container-v4.18.0-202411190136.p0.g11aa461.assembly.stream.el9.
All builds following this will include this PR.

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 7, 2024

openshift-ci bot requested review from patrickdillon and rwsu August 7, 2024 20:26

openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Aug 7, 2024

openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 7, 2024

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 25, 2024

sadasu force-pushed the gcp-bootstrap-custom-dns branch from ba889eb to dffe477 Compare November 6, 2024 18:25

sadasu changed the title ~~WIP: OCPBUGS-29067: Prepend resolv.conf on the bootstrap node of GCP with custom-dns~~ OCPBUGS-29067: Prepend resolv.conf on the bootstrap node of GCP with custom-dns Nov 6, 2024

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 6, 2024

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 6, 2024

sadasu force-pushed the gcp-bootstrap-custom-dns branch from dffe477 to c2e6e96 Compare November 7, 2024 15:06

openshift-ci-robot removed the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Nov 7, 2024

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 7, 2024

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Nov 7, 2024

openshift-ci bot requested a review from jianli-wei November 7, 2024 15:13

barbacbd reviewed Nov 14, 2024

View reviewed changes

patrickdillon mentioned this pull request Nov 14, 2024

Gcp dns template sadasu/installer#1

Closed

patrickdillon reviewed Nov 14, 2024

View reviewed changes

sadasu force-pushed the gcp-bootstrap-custom-dns branch from c2e6e96 to 40f6a23 Compare November 15, 2024 14:45

GCP: Prepend resolv.conf on the bootstrap node with custom-dns

f84c973

When UserProvisionedDNS is enabled during an install on GCP, prepend the NetworkManager generated resolv.conf file on the bootstrap node with the IP of the localhost.

sadasu force-pushed the gcp-bootstrap-custom-dns branch from 40f6a23 to f84c973 Compare November 15, 2024 14:47

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 15, 2024

barbacbd reviewed Nov 18, 2024

View reviewed changes

openshift-ci bot assigned barbacbd Nov 18, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 18, 2024

openshift-merge-bot bot merged commit 11aa461 into openshift:master Nov 19, 2024
23 of 24 checks passed

openshift-ci-robot mentioned this pull request Jan 23, 2025

OCPBUGS-29067: GCP Custom-DNS: Update services that run on control plane nodes openshift/machine-config-operator#4367

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPBUGS-29067: Prepend resolv.conf on the bootstrap node of GCP with custom-dns #8811

OCPBUGS-29067: Prepend resolv.conf on the bootstrap node of GCP with custom-dns #8811

sadasu commented Aug 7, 2024 •

edited

Loading

openshift-ci-robot commented Aug 7, 2024

sadasu commented Aug 7, 2024

openshift-ci-robot commented Aug 7, 2024

sadasu commented Nov 6, 2024

openshift-ci-robot commented Nov 7, 2024

sadasu commented Nov 7, 2024

openshift-ci bot commented Nov 7, 2024

sadasu commented Nov 7, 2024

openshift-ci-robot commented Nov 7, 2024

sadasu commented Nov 7, 2024

sadasu commented Nov 9, 2024 •

edited

Loading

sadasu commented Nov 9, 2024

sadasu commented Nov 14, 2024

barbacbd Nov 14, 2024

sadasu Nov 14, 2024

barbacbd Nov 14, 2024

sadasu Nov 14, 2024

patrickdillon Nov 14, 2024

sadasu Nov 15, 2024

sadasu Nov 15, 2024

patrickdillon Nov 15, 2024

sadasu commented Nov 15, 2024

patrickdillon commented Nov 15, 2024

patrickdillon commented Nov 15, 2024

openshift-ci bot commented Nov 15, 2024

sadasu commented Nov 15, 2024

sadasu commented Nov 15, 2024

openshift-ci bot commented Nov 15, 2024

barbacbd left a comment

openshift-ci-robot commented Nov 19, 2024

openshift-bot commented Nov 19, 2024

openshift-bot commented Nov 19, 2024

openshift-bot commented Nov 19, 2024

openshift-bot commented Nov 19, 2024

		// Copy platform specific files/units when present with the exception of GCP
		// On GCP, copy over platform specific files/units only when UserProvisionedDNS is enabled.

OCPBUGS-29067: Prepend resolv.conf on the bootstrap node of GCP with custom-dns #8811

OCPBUGS-29067: Prepend resolv.conf on the bootstrap node of GCP with custom-dns #8811

Conversation

sadasu commented Aug 7, 2024 • edited Loading

openshift-ci-robot commented Aug 7, 2024

sadasu commented Aug 7, 2024

openshift-ci-robot commented Aug 7, 2024

sadasu commented Nov 6, 2024

openshift-ci-robot commented Nov 7, 2024

sadasu commented Nov 7, 2024

openshift-ci bot commented Nov 7, 2024

sadasu commented Nov 7, 2024

openshift-ci-robot commented Nov 7, 2024

sadasu commented Nov 7, 2024

sadasu commented Nov 9, 2024 • edited Loading

sadasu commented Nov 9, 2024

sadasu commented Nov 14, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sadasu commented Nov 15, 2024

patrickdillon commented Nov 15, 2024

patrickdillon commented Nov 15, 2024

openshift-ci bot commented Nov 15, 2024

sadasu commented Nov 15, 2024

sadasu commented Nov 15, 2024

openshift-ci bot commented Nov 15, 2024

barbacbd left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Nov 19, 2024

openshift-bot commented Nov 19, 2024

openshift-bot commented Nov 19, 2024

openshift-bot commented Nov 19, 2024

openshift-bot commented Nov 19, 2024

sadasu commented Aug 7, 2024 •

edited

Loading

sadasu commented Nov 9, 2024 •

edited

Loading