Check if the kube-proxy VIP was already reserved #5705
Conversation
manuelbuil
force-pushed
the
checkReservedVIP
branch
from
8b30525
to
5022188
Compare
pkg/windows/flannel.go
Outdated
| if err != nil { | ||
| return "", fmt.Errorf("failed to create host-local store: %w", err) | ||
| } | ||
| ips := hostlocalStore.GetByID("kube-proxy", "source-vip") |
There was a problem hiding this comment.
| ips := hostlocalStore.GetByID("kube-proxy", "source-vip") | |
| ips := hostlocalStore.GetByID(HostlocalContainerID, HostlocalInterfaceName) |
There was a problem hiding this comment.
I'm dumb. Thanks Brad
pkg/windows/flannel.go
Outdated
| FlannelConfigName = "07-flannel.conflist" | ||
| FlannelKubeConfigName = "flannel.kubeconfig" | ||
| FlanneldConfigName = "flanneld-net-conf.json" | ||
| FlannelChart = "rke2-flannel" | ||
| HostlocalContainerID = "kube-proxy" | ||
| HostlocalInterfaceName = "source-vip" | ||
| HostLocalDataDir = "/var/lib/cni/networks" |
There was a problem hiding this comment.
Do any of these actually need to be exported? I don't see that they are used outside this package. If not, don't export them.
| FlannelConfigName = "07-flannel.conflist" | |
| FlannelKubeConfigName = "flannel.kubeconfig" | |
| FlanneldConfigName = "flanneld-net-conf.json" | |
| FlannelChart = "rke2-flannel" | |
| HostlocalContainerID = "kube-proxy" | |
| HostlocalInterfaceName = "source-vip" | |
| HostLocalDataDir = "/var/lib/cni/networks" | |
| flannelConfigName = "07-flannel.conflist" | |
| flannelKubeConfigName = "flannel.kubeconfig" | |
| flanneldConfigName = "flanneld-net-conf.json" | |
| flannelChart = "rke2-flannel" | |
| hostlocalContainerID = "kube-proxy" | |
| hostlocalInterfaceName = "source-vip" | |
| hostLocalDataDir = "/var/lib/cni/networks" |
There was a problem hiding this comment.
For some reason, I thought constants start always with a capital letter
There was a problem hiding this comment.
FlannelChart is the only one used by another package
There was a problem hiding this comment.
anything uppercase (const, var, or func) is exported. Anything lowercase is package local.
manuelbuil
force-pushed
the
checkReservedVIP
branch
from
5022188
to
a03ab12
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #5705 +/- ##
===========================================
+ Coverage 9.49% 26.04% +16.55%
===========================================
Files 30 30
Lines 2634 2634
===========================================
+ Hits 250 686 +436
+ Misses 2362 1903 -459
- Partials 22 45 +23
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Signed-off-by: Manuel Buil <mbuil@suse.com>
manuelbuil
force-pushed
the
checkReservedVIP
branch
from
a03ab12
to
74b9ada
Compare
Proposed Changes
This PR adds a check before reserving the IP for kube-proxy. It checks if that reservation was already made and it that case, uses that IP.
Types of Changes
Bugfix
Verification
Issue explains how to verify
Testing
Linked Issues
#5704
User-Facing Change
Further Comments