Added new variables

cluster/defaults.go

@@ -101,6 +101,17 @@ const (
 	DefaultAciOpflexClientSSL                   = "true"
 	DefaultAciUsePrivilegedContainer            = "false"
 	DefaultAciUseOpflexServerVolume             = "false"
+	DefaultAciDurationWaitForNetwork            = "210"
+	DefaultAciUseClusterRole                    = "true"
+	DefaultAciDisableWaitForNetwork             = "false"
+	DefaultAciApicSubscriptionDelay             = "0"
+	DefaultAciApicRefreshTickerAdjust           = "0"
+	DefaultAciDisablePeriodicSnatGlobalInfoSync = "false"
+	DefaultAciOpflexDeviceDeleteTimeout         = "0"
+	DefaultAciMTUHeadRoom                       = "0"
+	DefaultAciNodePodIfEnable                   = "false"
+	DefaultAciSriovEnable                       = "false"
+	DefaultAciMultusDisable                     = "true"
 
 	KubeAPIArgAdmissionControlConfigFile             = "admission-control-config-file"
 	DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml"
@@ -646,6 +657,17 @@ func (c *Cluster) setClusterNetworkDefaults() {
 			AciUseAciAnywhereCRD:                 DefaultAciUseAciAnywhereCRD,
 			AciRunGbpContainer:                   DefaultAciRunGbpContainer,
 			AciRunOpflexServerContainer:          DefaultAciRunOpflexServerContainer,
+			AciDurationWaitForNetwork:            DefaultAciDurationWaitForNetwork,
+			AciUseClusterRole:                    DefaultAciUseClusterRole,
+			AciDisableWaitForNetwork:             DefaultAciDisableWaitForNetwork,
+			AciApicSubscriptionDelay:             DefaultAciApicSubscriptionDelay,
+			AciApicRefreshTickerAdjust:           DefaultAciApicRefreshTickerAdjust,
+			AciDisablePeriodicSnatGlobalInfoSync: DefaultAciDisablePeriodicSnatGlobalInfoSync,
+			AciOpflexDeviceDeleteTimeout:         DefaultAciOpflexDeviceDeleteTimeout,
+			AciMTUHeadRoom:                       DefaultAciMTUHeadRoom,
+			AciNodePodIfEnable:                   DefaultAciNodePodIfEnable,
+			AciSriovEnable:                       DefaultAciSriovEnable,
+			AciMultusDisable:                     DefaultAciMultusDisable,
 		}
 	}
 	if c.Network.CalicoNetworkProvider != nil {
@@ -691,6 +713,17 @@ func (c *Cluster) setClusterNetworkDefaults() {
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.UseAciAnywhereCRD, DefaultAciUseAciAnywhereCRD)
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.RunGbpContainer, DefaultAciRunGbpContainer)
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.RunOpflexServerContainer, DefaultAciRunOpflexServerContainer)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.SriovEnable, DefaultAciSriovEnable)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.NodePodIfEnable, DefaultAciNodePodIfEnable)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.MultusDisable, DefaultAciMultusDisable)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.DisablePeriodicSnatGlobalInfoSync, DefaultAciDisablePeriodicSnatGlobalInfoSync)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicSubscriptionDelay, DefaultAciApicSubscriptionDelay)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicRefreshTickerAdjust, DefaultAciApicRefreshTickerAdjust)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexDeviceDeleteTimeout, DefaultAciOpflexDeviceDeleteTimeout)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.MTUHeadRoom, DefaultAciMTUHeadRoom)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.DurationWaitForNetwork, DefaultAciDurationWaitForNetwork)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.DisableWaitForNetwork, DefaultAciDisableWaitForNetwork)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.UseClusterRole, DefaultAciUseClusterRole)
 		networkPluginConfigDefaultsMap[AciOVSMemoryLimit] = c.Network.AciNetworkProvider.OVSMemoryLimit
 		networkPluginConfigDefaultsMap[AciImagePullPolicy] = c.Network.AciNetworkProvider.ImagePullPolicy
 		networkPluginConfigDefaultsMap[AciPBRTrackingNonSnat] = c.Network.AciNetworkProvider.PBRTrackingNonSnat
@@ -719,6 +752,17 @@ func (c *Cluster) setClusterNetworkDefaults() {
 		networkPluginConfigDefaultsMap[AciUseAciAnywhereCRD] = c.Network.AciNetworkProvider.UseAciAnywhereCRD
 		networkPluginConfigDefaultsMap[AciRunGbpContainer] = c.Network.AciNetworkProvider.RunGbpContainer
 		networkPluginConfigDefaultsMap[AciRunOpflexServerContainer] = c.Network.AciNetworkProvider.RunOpflexServerContainer
+		networkPluginConfigDefaultsMap[AciDurationWaitForNetwork] = c.Network.AciNetworkProvider.DurationWaitForNetwork
+		networkPluginConfigDefaultsMap[AciDisableWaitForNetwork] = c.Network.AciNetworkProvider.DisableWaitForNetwork
+		networkPluginConfigDefaultsMap[AciUseClusterRole] = c.Network.AciNetworkProvider.UseClusterRole
+		networkPluginConfigDefaultsMap[AciApicSubscriptionDelay] = c.Network.AciNetworkProvider.ApicSubscriptionDelay
+		networkPluginConfigDefaultsMap[AciApicRefreshTickerAdjust] = c.Network.AciNetworkProvider.ApicRefreshTickerAdjust
+		networkPluginConfigDefaultsMap[AciDisablePeriodicSnatGlobalInfoSync] = c.Network.AciNetworkProvider.DisablePeriodicSnatGlobalInfoSync
+		networkPluginConfigDefaultsMap[AciOpflexDeviceDeleteTimeout] = c.Network.AciNetworkProvider.OpflexDeviceDeleteTimeout
+		networkPluginConfigDefaultsMap[AciMTUHeadRoom] = c.Network.AciNetworkProvider.MTUHeadRoom
+		networkPluginConfigDefaultsMap[AciNodePodIfEnable] = c.Network.AciNetworkProvider.NodePodIfEnable
+		networkPluginConfigDefaultsMap[AciSriovEnable] = c.Network.AciNetworkProvider.SriovEnable
+		networkPluginConfigDefaultsMap[AciMultusDisable] = c.Network.AciNetworkProvider.MultusDisable
 		networkPluginConfigDefaultsMap[AciSystemIdentifier] = c.Network.AciNetworkProvider.SystemIdentifier
 		networkPluginConfigDefaultsMap[AciToken] = c.Network.AciNetworkProvider.Token
 		networkPluginConfigDefaultsMap[AciApicUserName] = c.Network.AciNetworkProvider.ApicUserName

cluster/network.go

@@ -136,6 +136,17 @@ const (
 	AciRunGbpContainer                   = "aci_run_gbp_container"
 	AciRunOpflexServerContainer          = "aci_run_opflex_server_container"
 	AciOpflexServerPort                  = "aci_opflex_server_port"
+	AciDurationWaitForNetwork            = "aci_duration_wait_for_network"
+	AciDisableWaitForNetwork             = "aci_disable_wait_for_network"
+	AciUseClusterRole                    = "aci_use_cluster_role"
+	AciApicSubscriptionDelay             = "aci_apic_subscription_delay"
+	AciApicRefreshTickerAdjust           = "aci_apic_refresh_ticker_adjust"
+	AciDisablePeriodicSnatGlobalInfoSync = "aci_disable_periodic_snat_global_info_sync"
+	AciOpflexDeviceDeleteTimeout         = "aci_opflex_device_delete_timeout"
+	AciMTUHeadRoom                       = "aci_mtu_head_room"
+	AciNodePodIfEnable                   = "aci_node_pod_if_enable"
+	AciSriovEnable                       = "aci_sriov_enable"
+	AciMultusDisable                     = "aci_multus_disable"
 	// List of map keys to be used with network templates
 
 	// EtcdEndpoints is the server address for Etcd, used by calico
@@ -261,6 +272,17 @@ const (
 	RunGbpContainer                        = "RunGbpContainer"
 	RunOpflexServerContainer               = "RunOpflexServerContainer"
 	OpflexServerPort                       = "OpflexServerPort"
+	DurationWaitForNetwork                 = "DurationWaitForNetwork"
+	DisableWaitForNetwork                  = "DisableWaitForNetwork"
+	UseClusterRole                         = "UseClusterRole"
+	ApicSubscriptionDelay                  = "ApicSubscriptionDelay"
+	ApicRefreshTickerAdjust                = "ApicRefreshTickerAdjust"
+	DisablePeriodicSnatGlobalInfoSync      = "DisablePeriodicSnatGlobalInfoSync"
+	OpflexDeviceDeleteTimeout              = "OpflexDeviceDeleteTimeout"
+	MTUHeadRoom                            = "MTUHeadRoom"
+	NodePodIfEnable                        = "NodePodIfEnable"
+	SriovEnable                            = "SriovEnable"
+	MultusDisable                          = "MultusDisable"
 	OVSMemoryLimit                         = "OVSMemoryLimit"
 	NodeSubnet                             = "NodeSubnet"
 	NodeSelector                           = "NodeSelector"
@@ -546,6 +568,17 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
 		RunGbpContainer:                   c.Network.Options[AciRunGbpContainer],
 		RunOpflexServerContainer:          c.Network.Options[AciRunOpflexServerContainer],
 		OpflexServerPort:                  c.Network.Options[AciOpflexServerPort],
+		DurationWaitForNetwork:            c.Network.Options[AciDurationWaitForNetwork],
+		DisableWaitForNetwork:             c.Network.Options[AciDisableWaitForNetwork],
+		UseClusterRole:                    c.Network.Options[AciUseClusterRole],
+		ApicSubscriptionDelay:             c.Network.Options[AciApicSubscriptionDelay],
+		ApicRefreshTickerAdjust:           c.Network.Options[AciApicRefreshTickerAdjust],
+		DisablePeriodicSnatGlobalInfoSync: c.Network.Options[AciDisablePeriodicSnatGlobalInfoSync],
+		OpflexDeviceDeleteTimeout:         c.Network.Options[AciOpflexDeviceDeleteTimeout],
+		MTUHeadRoom:                       c.Network.Options[AciMTUHeadRoom],
+		NodePodIfEnable:                   c.Network.Options[AciNodePodIfEnable],
+		SriovEnable:                       c.Network.Options[AciSriovEnable],
+		MultusDisable:                     c.Network.Options[AciMultusDisable],
 		AciCniDeployContainer:             c.SystemImages.AciCniDeployContainer,
 		AciHostContainer:                  c.SystemImages.AciHostContainer,
 		AciOpflexContainer:                c.SystemImages.AciOpflexContainer,

types/rke_types.go

@@ -650,6 +650,17 @@ type AciNetworkProvider struct {
 	RunGbpContainer                   string   `yaml:"run_gbp_container,omitempty" json:"runGbpContainer,omitempty"`
 	RunOpflexServerContainer          string   `yaml:"run_opflex_server_container,omitempty" json:"runOpflexServerContainer,omitempty"`
 	OpflexServerPort                  string   `yaml:"opflex_server_port,omitempty" json:"opflexServerPort,omitempty"`
+	DurationWaitForNetwork            string   `yaml:"duration_wait_for_network,omitempty" json:"durationWaitForNetwork,omitempty"`
+	DisableWaitForNetwork             string   `yaml:"disable_wait_for_network,omitempty" json:"disableWaitForNetwork,omitempty"`
+	ApicSubscriptionDelay             string   `yaml:"apic_subscription_delay,omitempty" json:"apicSubscriptionDelay,omitempty"`
+	ApicRefreshTickerAdjust           string   `yaml:"apic_refresh_ticker_adjust,omitempty" json:"apicRefreshTickerAdjust,omitempty"`
+	DisablePeriodicSnatGlobalInfoSync string   `yaml:"disable_periodic_snat_global_info_sync,omitempty" json:"disablePeriodicSnatGlobalInfoSync,omitempty"`
+	OpflexDeviceDeleteTimeout         string   `yaml:"opflex_device_delete_timeout,omitempty" json:"opflexDeviceDeleteTimeout,omitempty"`
+	MTUHeadRoom                       string   `yaml:"mtu_head_room,omitempty" json:"mtuHeadRoom,omitempty"`
+	NodePodIfEnable                   string   `yaml:"node_pod_if_enable,omitempty" json:"nodePodIfEnable,omitempty"`
+	SriovEnable                       string   `yaml:"sriov_enable,omitempty" json:"sriovEnable,omitempty"`
+	MultusDisable                     string   `yaml:"multus_disable,omitempty" json:"multusDisable,omitempty"`
+	UseClusterRole                    string   `yaml:"use_cluster_role,omitempty" json:"useClusterRole,omitempty"`
 }
 
 type KubernetesServicesOptions struct {