Changes to support ACI CNI

apis/management.cattle.io/v3/rke_types.go

@@ -362,6 +362,8 @@ type NetworkConfig struct {
 	FlannelNetworkProvider *FlannelNetworkProvider `yaml:"flannel_network_provider,omitempty" json:"flannelNetworkProvider,omitempty"`
 	// WeaveNetworkProvider
 	WeaveNetworkProvider *WeaveNetworkProvider `yaml:"weave_network_provider,omitempty" json:"weaveNetworkProvider,omitempty"`
+	// AciNetworkProvider
+	AciNetworkProvider *AciNetworkProvider `yaml:"aci_network_provider,omitempty" json:"aci_network_provider,omitempty"`
 	// NodeSelector key pair
 	NodeSelector map[string]string `yaml:"node_selector" json:"nodeSelector,omitempty"`
 }
@@ -524,6 +526,10 @@ type WeaveNetworkProvider struct {
 	Password string `yaml:"password,omitempty" json:"password,omitempty" norman:"type=password"`
 }
 
+type AciNetworkProvider struct {
+	AciCNIConfig string `yaml:"aci_cni_config,omitempty" json:"aci_cni_config,omitempty"`
+}
+
 type KubernetesServicesOptions struct {
 	// Additional options passed to KubeAPI
 	KubeAPI map[string]string `json:"kubeapi"`

apis/management.cattle.io/v3/zz_generated_deepcopy.go

@@ -61,6 +61,22 @@ func (in *AWSCloudProvider) DeepCopy() *AWSCloudProvider {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AciNetworkProvider) DeepCopyInto(out *AciNetworkProvider) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AciNetworkProvider.
+func (in *AciNetworkProvider) DeepCopy() *AciNetworkProvider {
+	if in == nil {
+		return nil
+	}
+	out := new(AciNetworkProvider)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Action) DeepCopyInto(out *Action) {
 	*out = *in
@@ -5407,6 +5423,11 @@ func (in *NetworkConfig) DeepCopyInto(out *NetworkConfig) {
 		*out = new(WeaveNetworkProvider)
 		**out = **in
 	}
+	if in.AciNetworkProvider != nil {
+		in, out := &in.AciNetworkProvider, &out.AciNetworkProvider
+		*out = new(AciNetworkProvider)
+		**out = **in
+	}
 	if in.NodeSelector != nil {
 		in, out := &in.NodeSelector, &out.NodeSelector
 		*out = make(map[string]string, len(*in))

client/management/v3/zz_generated_aci_network_provider.go

@@ -0,0 +1,10 @@
+package client
+
+const (
+	AciNetworkProviderType              = "aciNetworkProvider"
+	AciNetworkProviderFieldAciCNIConfig = "aci_cni_config"
+)
+
+type AciNetworkProvider struct {
+	AciCNIConfig string `json:"aci_cni_config,omitempty" yaml:"aci_cni_config,omitempty"`
+}

client/management/v3/zz_generated_network_config.go

@@ -2,6 +2,7 @@ package client
 
 const (
 	NetworkConfigType                        = "networkConfig"
+	NetworkConfigFieldAciNetworkProvider     = "aci_network_provider"
 	NetworkConfigFieldCalicoNetworkProvider  = "calicoNetworkProvider"
 	NetworkConfigFieldCanalNetworkProvider   = "canalNetworkProvider"
 	NetworkConfigFieldFlannelNetworkProvider = "flannelNetworkProvider"
@@ -12,6 +13,7 @@ const (
 )
 
 type NetworkConfig struct {
+	AciNetworkProvider     *AciNetworkProvider     `json:"aci_network_provider,omitempty" yaml:"aci_network_provider,omitempty"`
 	CalicoNetworkProvider  *CalicoNetworkProvider  `json:"calicoNetworkProvider,omitempty" yaml:"calicoNetworkProvider,omitempty"`
 	CanalNetworkProvider   *CanalNetworkProvider   `json:"canalNetworkProvider,omitempty" yaml:"canalNetworkProvider,omitempty"`
 	FlannelNetworkProvider *FlannelNetworkProvider `json:"flannelNetworkProvider,omitempty" yaml:"flannelNetworkProvider,omitempty"`