rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-06 09:20:06 +00:00
Code Issues Releases Wiki Activity

Added ACI 5.2.7.1 variables

Browse Source
This commit is contained in:
siva-muni
2023-05-18 12:41:53 +05:30
parent ea8159bb8f
commit 4471ba5799
4 changed files with 128 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cluster/validation.go
View File

@@ -231,6 +231,23 @@ func validateNetworkOptions(c *Cluster) error {
if !IPv6CompatibleNetworkPluginFound {
return fmt.Errorf("Network plugin [%s] does not support IPv6 (dualstack)", c.Network.Plugin)
}
if c.Network.Plugin == AciNetworkPlugin {
k8sVersion := c.RancherKubernetesEngineConfig.Version
toMatch, err := semver.Make(k8sVersion[1:])
if err != nil {
return fmt.Errorf("Cluster version [%s] is not valid semver", k8sVersion)
}
logrus.Debugf("Checking if cluster version [%s] has dualstack supported aci cni version", k8sVersion)
//k8s version needs to have aci version >= 5.2.7.1
clusterDualstackAciRange, err := semver.ParseRange(">=1.23.16-rancher2-3 <=1.23.99 || >=1.24.13-rancher2-2")
if err != nil {
return errors.New("Failed to parse semver range for checking dualstack supported aci cni versions")
}
if !clusterDualstackAciRange(toMatch) {
return fmt.Errorf("Cluster version [%s] does not have dualstack supported aci cni version", k8sVersion)
}
logrus.Debugf("Cluster version [%s] has dualstack supported aci cni version", k8sVersion)
}
}
if c.Network.Plugin == AciNetworkPlugin {
@@ -249,8 +266,7 @@ func validateNetworkOptions(c *Cluster) error {
networkOptionsList := []string{AciSystemIdentifier, AciToken, AciApicUserName, AciApicUserKey,
AciApicUserCrt, AciEncapType, AciMcastRangeStart, AciMcastRangeEnd,
AciNodeSubnet, AciAEP, AciVRFName, AciVRFTenant, AciL3Out, AciDynamicExternalSubnet,
AciStaticExternalSubnet, AciServiceGraphSubnet, AciKubeAPIVlan, AciServiceVlan, AciInfraVlan,
AciNodeSubnet}
AciStaticExternalSubnet, AciServiceGraphSubnet, AciKubeAPIVlan, AciServiceVlan, AciInfraVlan}
for _, v := range networkOptionsList {
val, ok := c.Network.Options[v]
if !ok || val == "" {