MGMT-16061: changing dnsmasq configuration for sno in order to meet single ip installation flow for ibu #5658

tsorya · 2023-11-05T09:56:15Z

MGMT-16061: changing dnsmasq configuration for sno in order to meet single ip installation flow for ibu
Improving: adding an option to override domain

List all the issues related to this PR

What environments does this code impact?

Automation (CI, tools, etc)
Cloud
Operator Managed Deployments
None

How was this code tested?

assisted-test-infra environment
dev-scripts environment
Reviewer's test appreciated
Waiting for CI to do a full test run
Manual (Elaborate on how it was tested)
No tests needed

Checklist

Title and description added to both, commit and PR.
Relevant issues have been associated (see CONTRIBUTING guide)
This change does not require a documentation update (docstring, docs, README, etc)
Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

Are the title and description (in both PR and commit) meaningful and clear?
Is there a bug required (and linked) for this change?
Should this PR be backported?

openshift-ci-robot · 2023-11-05T09:56:19Z

openshift-ci · 2023-11-05T09:56:58Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tsorya

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~~ [tsorya]

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

internal/network/manifests_generator.go

codecov · 2023-11-05T10:17:40Z

Codecov Report

Merging #5658 (d605fc1) into master (5f7f3f1) will increase coverage by 0.80%.
Report is 8 commits behind head on master.
The diff coverage is n/a.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #5658      +/-   ##
==========================================
+ Coverage   67.71%   68.51%   +0.80%     
==========================================
  Files         233      234       +1     
  Lines       34285    35444    +1159     
==========================================
+ Hits        23215    24284    +1069     
- Misses       9006     9063      +57     
- Partials     2064     2097      +33

Files	Coverage Δ
internal/network/manifests_generator.go	`75.74% <ø> (ø)`

... and 13 files with indirect coverage changes

tsorya · 2023-11-05T11:29:47Z

/test ?

openshift-ci · 2023-11-05T11:29:51Z

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

/test e2e-agent-compact-ipv4
/test edge-assisted-operator-catalog-publish-verify
/test edge-ci-index
/test edge-e2e-ai-operator-ztp
/test edge-e2e-ai-operator-ztp-sno-day2-workers
/test edge-e2e-ai-operator-ztp-sno-day2-workers-late-binding
/test edge-e2e-metal-assisted
/test edge-e2e-metal-assisted-4-10
/test edge-e2e-metal-assisted-4-11
/test edge-e2e-metal-assisted-4-12
/test edge-e2e-metal-assisted-4-9
/test edge-e2e-metal-assisted-cnv
/test edge-e2e-metal-assisted-lvm
/test edge-e2e-metal-assisted-odf
/test edge-images
/test edge-lint
/test edge-subsystem-aws
/test edge-subsystem-kubeapi-aws
/test edge-unit-test
/test edge-verify-generated-code
/test images
/test mce-images

The following commands are available to trigger optional jobs:

/test e2e-agent-ha-dualstack
/test e2e-agent-sno-ipv6
/test edge-e2e-ai-operator-ztp-3masters
/test edge-e2e-ai-operator-ztp-capi
/test edge-e2e-ai-operator-ztp-compact-day2-masters
/test edge-e2e-ai-operator-ztp-compact-day2-workers
/test edge-e2e-ai-operator-ztp-disconnected
/test edge-e2e-ai-operator-ztp-hypershift-zero-nodes
/test edge-e2e-ai-operator-ztp-multiarch-3masters-ocp-411
/test edge-e2e-ai-operator-ztp-multiarch-sno-ocp-411
/test edge-e2e-ai-operator-ztp-node-labels
/test edge-e2e-ai-operator-ztp-sno-day2-masters
/test edge-e2e-ai-operator-ztp-sno-day2-workers-ignitionoverride
/test edge-e2e-metal-assisted-4-13
/test edge-e2e-metal-assisted-4-14
/test edge-e2e-metal-assisted-bond
/test edge-e2e-metal-assisted-cnv-4.14
/test edge-e2e-metal-assisted-day2
/test edge-e2e-metal-assisted-day2-arm-workers
/test edge-e2e-metal-assisted-day2-single-node
/test edge-e2e-metal-assisted-ipv4v6
/test edge-e2e-metal-assisted-ipv6
/test edge-e2e-metal-assisted-kube-api-late-binding-single-node
/test edge-e2e-metal-assisted-kube-api-late-unbinding-ipv4-single-node
/test edge-e2e-metal-assisted-kube-api-net-suite
/test edge-e2e-metal-assisted-mce
/test edge-e2e-metal-assisted-mce-4-10
/test edge-e2e-metal-assisted-mce-sno
/test edge-e2e-metal-assisted-metallb
/test edge-e2e-metal-assisted-none
/test edge-e2e-metal-assisted-odf-4-14
/test edge-e2e-metal-assisted-onprem
/test edge-e2e-metal-assisted-single-node
/test edge-e2e-metal-assisted-static-ip-suite
/test edge-e2e-metal-assisted-tang
/test edge-e2e-metal-assisted-tpmv2
/test edge-e2e-metal-assisted-upgrade-agent
/test edge-e2e-nutanix-assisted
/test edge-e2e-nutanix-assisted-2workers
/test edge-e2e-oci-assisted
/test edge-e2e-vsphere-assisted
/test edge-e2e-vsphere-assisted-4-12
/test edge-e2e-vsphere-assisted-4-13
/test edge-e2e-vsphere-assisted-umn
/test edge-push-pr-image
/test push-pr-image

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

pull-ci-openshift-assisted-service-master-e2e-agent-compact-ipv4
pull-ci-openshift-assisted-service-master-edge-ci-index
pull-ci-openshift-assisted-service-master-edge-e2e-ai-operator-ztp
pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted
pull-ci-openshift-assisted-service-master-edge-images
pull-ci-openshift-assisted-service-master-edge-lint
pull-ci-openshift-assisted-service-master-edge-subsystem-aws
pull-ci-openshift-assisted-service-master-edge-subsystem-kubeapi-aws
pull-ci-openshift-assisted-service-master-edge-unit-test
pull-ci-openshift-assisted-service-master-edge-verify-generated-code
pull-ci-openshift-assisted-service-master-images
pull-ci-openshift-assisted-service-master-mce-images

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/test-infra repository.

tsorya · 2023-11-05T14:54:59Z

/test e2e-agent-sno-ipv6
/test edge-e2e-ai-operator-ztp-capi
/test edge-e2e-metal-assisted-mce-sno

tsorya · 2023-11-05T17:59:17Z

/retest

internal/network/manifests_generator.go

tsorya · 2023-11-06T13:21:46Z

/test e2e-agent-sno-ipv6
/test edge-e2e-ai-operator-ztp-capi
/test edge-e2e-metal-assisted-mce-sno

tsorya · 2023-11-06T14:25:43Z

/test e2e-agent-sno-ipv6
/test edge-e2e-ai-operator-ztp-capi
/test edge-e2e-metal-assisted-mce-sno

tsorya · 2023-11-06T14:25:51Z

/test edge-e2e-ai-operator-ztp-sno-day2-workers

tsorya · 2023-11-06T14:38:07Z

/test edge-e2e-metal-assisted-mce-4-10

internal/network/manifests_generator.go

tsorya · 2023-11-06T15:54:15Z

/test e2e-agent-sno-ipv6
/test edge-e2e-ai-operator-ztp-capi
/test edge-e2e-metal-assisted-mce-sno

…ingle ip installation flow for ibu Improving adding an option to override domain

tsorya · 2023-11-06T17:12:24Z

/test e2e-agent-sno-ipv6
/test edge-e2e-ai-operator-ztp-capi
/test edge-e2e-metal-assisted-mce-sno

tsorya · 2023-11-06T17:43:06Z

/retest

gamli75 · 2023-11-06T18:45:25Z

/test edge-e2e-metal-assisted-day2-single-node

omertuc · 2023-11-07T09:39:57Z

/lgtm

omertuc · 2023-11-07T12:12:11Z

/test e2e-agent-compact-ipv4

openshift-ci · 2023-11-07T21:31:29Z

@tsorya: all tests passed!

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

filanov · 2023-12-07T11:16:49Z

/cherry-pick release-ocm-2.9

openshift-cherrypick-robot · 2023-12-07T11:17:43Z

@filanov: #5658 failed to apply on top of branch "release-ocm-2.9":

Applying: MGMT-16061: changing dnsmasq configuration for sno in order to meet single ip installation flow for ibu Improving adding an option to override domain
Using index info to reconstruct a base tree...
M	internal/network/manifests_generator.go
Falling back to patching base and 3-way merge...
Auto-merging internal/network/manifests_generator.go
CONFLICT (content): Merge conflict in internal/network/manifests_generator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 MGMT-16061: changing dnsmasq configuration for sno in order to meet single ip installation flow for ibu Improving adding an option to override domain
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-ocm-2.9

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 the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 5, 2023

openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 5, 2023

openshift-ci bot requested review from filanov and javipolo November 5, 2023 09:56

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

romfreiman reviewed Nov 5, 2023

View reviewed changes

internal/network/manifests_generator.go Outdated Show resolved Hide resolved