Sdn 4.16 kubernetes 1.29.0 #1877
Conversation
openshift-ci-robot
added
the
backports/unvalidated-commits
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
openshift-merge-robot
added
the
needs-rebase
|
@bpickard22: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
|
/test unit |
pkg/proxy/iptables/proxier.go
Outdated
| // implemented and the DNS operator is updated to use it. | ||
| if svcPortNameString == "openshift-dns/dns-default:dns" || svcPortNameString == "openshift-dns/dns-default:dns-tcp" { | ||
| for _, ep := range clusterEndpoints { | ||
| if ep.GetIsLocal() { |
pkg/proxy/iptables/proxier_test.go
Outdated
| @@ -3183,6 +3184,680 @@ func TestExternalTrafficPolicyCluster(t *testing.T) { | |||
| ipt := iptablestest.NewFake() | |||
| fp := NewFakeProxier(ipt) | |||
|
|
|||
| expected := dedent.Dedent(` | |||
There was a problem hiding this comment.
You're pulling in random old code due to merge conflicts; the only thing added by e70c952 was TestOnlyLocalWithFallback.
The upstream test that TestOnlyLocalWithFallback was forked from no longer exists, but (given that we're about to abandon this code) it probably makes more sense to just keep the separate test rather than try to rewrite it to fit into the new TestExternalTrafficPolicyLocal. You will probably need to update the expected rules a bit though, to reflect minor changes in 1.29.
Note that you can run the unit tests from a checkout with go test -count=1 ./pkg/proxy/iptables
There was a problem hiding this comment.
when i ran the test locally i didnt have to change the expected rules and it passed
bpickard22
force-pushed
the
sdn-4.16-kubernetes-1.29.0
branch
from
9486899
to
6325072
Compare
|
@bpickard22: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
openshift-merge-robot
removed
the
needs-rebase
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: bpickard22 The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This commit fixes bug 1919737. https://bugzilla.redhat.com/show_bug.cgi?id=1919737 * pkg/proxy/iptables/proxier.go (syncProxyRules): Prefer a local endpoint for the cluster DNS service. (cherry picked from commit 9afeab0) UPSTREAM: <carry>: Prefer local TCP endpoint for cluster DNS service Signed-off-by: Martin Kennelly <mkennell@redhat.com> (cherry picked from commit ada553a) (cherry picked from commit b2144db)
…olicy If a service has a "traffic-policy.network.alpha.openshift.io/local-with-fallback" annotation, then only treat it as "externalTrafficPolicy: Local" when there are actually running local pods. That is, if we receive traffic for such a service after the last local pod terminates, then forward it to a remote pod rather than dropping it. Note: change utilpointer to pointer to conform to upstream modified to suit changes to asserIPTablesRulesEqual (cherry picked from commit 9500d08) (cherry picked from commit e70c952) (cherry picked from commit 9486899)
bpickard22
force-pushed
the
sdn-4.16-kubernetes-1.29.0
branch
from
6325072
to
9d8de2b
Compare
|
@bpickard22: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
danwinship
merged commit 9cdc488
into
openshift:sdn-4.16-kubernetes-1.29.0
What type of PR is this?
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: