Skip to content
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

Jump to bottom

Bug 1994645: config template: accept IPv6 IPs for whitelisting #325

Merged
merged 1 commit into from Aug 19, 2021
Merged

Bug 1994645: config template: accept IPv6 IPs for whitelisting #325

merged 1 commit into from Aug 19, 2021

Conversation

Miciah
Copy link
Contributor

@Miciah Miciah commented Aug 17, 2021

Manual cherry-pick of #321.

@openshift-ci openshift-ci bot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Aug 17, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 17, 2021

@Miciah: This pull request references Bugzilla bug 1994645, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1984565 is in the state CLOSED (ERRATA), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 1984565 targets the "4.8.z" release, which is one of the valid target releases: 4.8.0, 4.8.z
  • bug has dependents

Requesting review from QA contact:
/cc @quarterpin

In response to this:

Bug 1994645: config template: accept IPv6 IPs for whitelisting

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 openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Aug 17, 2021
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 17, 2021
@Miciah Miciah force-pushed the cherry-pick-321-to-release-4.7 branch from 529ee94 to 30db2b1 Compare August 17, 2021 15:52
@Miciah
Copy link
Contributor Author

Miciah commented Aug 17, 2021 

[sig-cluster-lifecycle][Feature:Machines][Early] Managed cluster should have same number of Machines and Nodes [Suite:openshift/conformance/parallel]
fail [github.com/openshift/origin/test/extended/machines/cluster.go:56]: Expected
    <int>: 5
to equal
    <int>: 6

/test e2e-upgrade

candita
candita reviewed Aug 17, 2021
View reviewed changes
pkg/router/template/template_helper.go
for _, ip := range ipList {
if net.ParseIP(ip) == nil {
if _, _, err := net.ParseCIDR(ip); err != nil {
log.V(7).Info("parseIPList found not IP/CIDR item", "value", ip, "err", err)
Copy link
Contributor

@candita candita Aug 17, 2021 •
edited

Choose a reason for hiding this comment

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

Suggested change
log.V(7).Info("parseIPList found not IP/CIDR item", "value", ip, "err", err)
log.V(7).Info("parseIPList parse error - invalid IP/CIDR", "value", ip, "err", err)

Copy link
Contributor

Choose a reason for hiding this comment

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

Never mind, just realized this is a cherry-pick.

candita
candita reviewed Aug 17, 2021
View reviewed changes
pkg/router/template/template_helper.go
@@ -358,6 +359,35 @@ func clipHAProxyTimeoutValue(val string) string {
return val
}

// parseIPList parses white space separated list of IPs/CIDRs (IPv4/IPv6)
// aims at providing the same behavior as the previous approach with regexp in the template file
func parseIPList(list string) string {
Copy link
Contributor

Choose a reason for hiding this comment

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

Great idea to remove more regexps.

@candita
Copy link
Contributor

candita commented Aug 17, 2021

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 17, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: candita, Miciah

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:

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

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 17, 2021
@deads2k deads2k added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 19, 2021
@openshift-merge-robot openshift-merge-robot merged commit 4ab216f into openshift:release-4.7 Aug 19, 2021
@deads2k
Copy link
Contributor

deads2k commented Aug 19, 2021

(patch manager)

high bz, validation, 0.5

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 19, 2021

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

Bugzilla bug 1994645 has been moved to the MODIFIED state.

In response to this:

Bug 1994645: config template: accept IPv6 IPs for whitelisting

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@candita candita candita left review comments

@quarterpin quarterpin Awaiting requested review from quarterpin

@ironcladlou ironcladlou Awaiting requested review from ironcladlou

@knobunc knobunc Awaiting requested review from knobunc

Assignees

@candita candita

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Miciah @candita @deads2k @openshift-merge-robot @alebedev87