Skip to content

Move cluster-cidr proxy argument to the node config#9863

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
mgleung:calico-pass-cluster-cidr-to-proxy
Sep 21, 2018
Merged

Move cluster-cidr proxy argument to the node config#9863
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
mgleung:calico-pass-cluster-cidr-to-proxy

Conversation

@mgleung
Copy link
Contributor

@mgleung mgleung commented Aug 31, 2018

As per #8099, "connections to nodeports only succeed if the pod backing the nodeport service is running on the host being hit. So requests are not forwarded to other nodes if the pod is running there.

This PR resolves the issue by passing Cluster CIDR to kube-proxy, which implements the nececssary iptables rules."

This PR replicates those changes in the new location of the node config template.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 31, 2018
@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 Aug 31, 2018
@papr-bot
Copy link

Can one of the admins verify this patch?
I understand the following commands:

  • bot, add author to whitelist
  • bot, test pull request
  • bot, test pull request once

bindAddress: 0.0.0.0:10250
bindNetwork: tcp4
clientCA: client-ca.crt
{% if openshift_use_calico | default(False) | bool %}
Copy link
Contributor

Choose a reason for hiding this comment

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

While OpenShift SDN might not need it for this particular case, there are a handful of edge cases that kube-proxy uses the cluster-cidr argument for, so it's probably best to set it regardless of network plugin.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's fair. I originally kept it specific to Calico since I wasn't sure what the effect would be with other network plugins. I can make those changes.

@mgleung mgleung force-pushed the calico-pass-cluster-cidr-to-proxy branch 2 times, most recently from 8360914 to eddf564 Compare September 14, 2018 01:10
@mgleung
Copy link
Contributor Author

mgleung commented Sep 14, 2018

@danwinship Can I get you to take another look and see if these changes make sense?

@mgleung mgleung mentioned this pull request Sep 14, 2018
@vrutkovs
Copy link
Contributor

/ok-to-test

@openshift-ci-robot openshift-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 14, 2018
bindAddress: 0.0.0.0:10250
bindNetwork: tcp4
clientCA: client-ca.crt
{% if osm_cluster_network_cidr is defined and not openshift_use_openshift_sdn | default(False) | bool %}
Copy link
Contributor

Choose a reason for hiding this comment

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

er, no, I meant to say before, we should always set the variable. Just drop the conditional check entirely

Copy link
Contributor

Choose a reason for hiding this comment

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

The variable we should use is openshift_cluster_network_cidr

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry, misunderstood.

bindAddress: 0.0.0.0:10250
bindNetwork: tcp4
clientCA: client-ca.crt
{% if osm_cluster_network_cidr is defined and not openshift_use_openshift_sdn | default(False) | bool %}
Copy link
Contributor

Choose a reason for hiding this comment

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

The variable we should use is openshift_cluster_network_cidr

@mgleung mgleung force-pushed the calico-pass-cluster-cidr-to-proxy branch from eddf564 to aa85376 Compare September 18, 2018 00:38
@mgleung
Copy link
Contributor Author

mgleung commented Sep 20, 2018

@danwinship @michaelgugino Can I get you to take another look at these changes?

Copy link
Contributor

@michaelgugino michaelgugino left a comment

Choose a reason for hiding this comment

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

This looks fine to me.

@michaelgugino
Copy link
Contributor

@danwinship ptal

@danwinship
Copy link
Contributor

lgtm

@michaelgugino
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 20, 2018
@michaelgugino
Copy link
Contributor

/cherrypick release-3.11

@openshift-cherrypick-robot

@michaelgugino: once the present PR merges, I will cherry-pick it on top of release-3.11 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-3.11

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
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mgleung, michaelgugino

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:

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 openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 20, 2018
@michaelgugino
Copy link
Contributor

/cherrypick release-3.10

@openshift-cherrypick-robot

@michaelgugino: once the present PR merges, I will cherry-pick it on top of release-3.10 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-3.10

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-bot
Copy link

/retest

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

8 similar comments
@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-cherrypick-robot

@michaelgugino: new pull request created: #10197

Details

In response to this:

/cherrypick release-3.11

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-cherrypick-robot

@michaelgugino: new pull request created: #10198

Details

In response to this:

/cherrypick release-3.10

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.

@mgleung mgleung deleted the calico-pass-cluster-cidr-to-proxy branch September 21, 2018 18:34
@mgleung mgleung restored the calico-pass-cluster-cidr-to-proxy branch September 21, 2018 18:34
@mgleung mgleung deleted the calico-pass-cluster-cidr-to-proxy branch September 26, 2018 00:41
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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants