Skip to content

Commit b5587af

Browse files
authored
routes processed with non sr (#3977)
1 parent a356465 commit b5587af

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

docs/RELEASE-NOTES.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Bug Fixes
2323
* Issue 3719 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/3719>`_: Fix shared static routes override each other with multiple CIS instances writing to Common Partition
2424
* Issue 3852 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/3852>`_: Improve logging when BIG-IP is not reachable during pod initialization
2525
* Issue 3887 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/3887>`_: RFE: change log level of certain messages
26+
* SR - Fix for CIS deleting unmanaged routes in common partition with static routing mode disabled
2627

2728
Upgrade notes
2829
``````````````

pkg/controller/node_poll_handler.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,8 @@ func (ctlr *Controller) setCISIdentifierForRoutes(routes *routeSection) {
207207
routes.CISIdentifier = strings.TrimPrefix(ctlr.RequestHandler.PrimaryBigIPWorker.getPostManager().BIGIPURL, "https://")
208208
routes.CISIdentifier += "_" + nodeLabelSelector
209209
} else {
210-
// Don't set CIS identifier when no cluster name or no nodelabelselctor is configured
211-
routes.CISIdentifier = ""
212-
log.Debugf("Local cluster name not set. Multiple CIS instances across clusters may still cause route conflicts with shared-static-routes writing to same BIGIP instance!")
210+
// set CIS identifier when no cluster name or no nodelabelselctor is configured
211+
routes.CISIdentifier = strings.TrimPrefix(ctlr.RequestHandler.PrimaryBigIPWorker.getPostManager().BIGIPURL, "https://")
213212
}
214213
}
215214
}

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
-e git+https://github.com/f5devcentral/f5-cccl.git@6bb7042826d5e3f7afdd3eb42094ea1e08eb470c#egg=f5-cccl
1+
-e git+https://github.com/f5devcentral/f5-cccl.git@cea31215b187cd4d88365dc5edb1aa181d9f1221#egg=f5-cccl
22
-e git+https://github.com/f5devcentral/f5-ctlr-agent.git@3d23eac1c69148704f03e1e51cf3322c9416dcf2#egg=f5-ctlr-agent
33
-e git+https://github.com/F5Networks/f5-icontrol-rest-python.git@3fee4a4599e903cce1abfe232e6ffb74d7085b64#egg=f5-icontrol-rest

0 commit comments

Comments
 (0)