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

add prefix length from mtpnc to podipinfo & gatewayip #2828

Merged
merged 9 commits into from
Jul 10, 2024
+102 −3
Merged

add prefix length from mtpnc to podipinfo & gatewayip #2828

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70e9f8c
add prefix length from mtpnc to podipinfo & gatewayip
kmurudi Jul 3, 2024
256d1d3
separate getIpConfig based on OS for HNS prefix changes, add subnet i…
kmurudi Jul 4, 2024
d133107
import packages
paulyufan2 Jul 4, 2024
04ed5c3
Merge branch 'master' into SubnetAddressSpace_K8sSwiftv2
kmurudi Jul 8, 2024
efce232
refactor middleware into os files after rebase w/ master
kmurudi Jul 8, 2024
4e20618
split only the subnet-prefix assign part
kmurudi Jul 9, 2024
45393a9
fix lint errors
kmurudi Jul 9, 2024
f4185ac
add UTs to test the function's behavior for linux vs windows
kmurudi Jul 9, 2024
3aa7304
Merge branch 'master' into SubnetAddressSpace_K8sSwiftv2
kmurudi Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion cns/middlewares/k8sSwiftV2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@ func (k *K8sSWIFTv2Middleware) getIPConfig(ctx context.Context, podInfo cns.PodI
if prefixSize != prefixLength {
return nil, errors.Wrapf(errInvalidMTPNCPrefixLength, "mtpnc primaryIP prefix length is %d", prefixSize)
}
// Parse MTPNC SubnetAddressSpace to get the subnet prefix length
subnet, subnetPrefix, err := utils.ParseIPAndPrefix(interfaceInfo.PrimaryIP)
paulyufan2 marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return nil, errors.Wrap(err, "failed to parse mtpnc subnetAddressSpace prefix")
}

var nicType cns.NICType
switch {
Expand All @@ -204,7 +209,16 @@ func (k *K8sSWIFTv2Middleware) getIPConfig(ctx context.Context, podInfo cns.PodI
NICType: nicType,
SkipDefaultRoutes: false,
HostPrimaryIPInfo: cns.HostIPInfo{
Gateway: interfaceInfo.GatewayIP,
Gateway: interfaceInfo.GatewayIP,
PrimaryIP: ip,
Subnet: interfaceInfo.SubnetAddressSpace,
},
NetworkContainerPrimaryIPConfig: cns.IPConfiguration{
IPSubnet: cns.IPSubnet{
IPAddress: subnet,
PrefixLength: uint8(subnetPrefix),
},
GatewayIPAddress: interfaceInfo.GatewayIP,
},
}
}
Expand Down
Loading