Add all acc-provision inputs to NetworkConfig

Signed-off-by: Kiran Shastri <shastrinator@gmail.com>
2025-09-16 23:08:25 +00:00 · 2020-06-21 23:38:19 -04:00
parent 67487a8527
commit 5ed5d03b8e
6 changed files with 170 additions and 1 deletions
--- a/apis/management.cattle.io/v3/rke_types.go
+++ b/apis/management.cattle.io/v3/rke_types.go
@@ -168,6 +168,16 @@ type RKESystemImages struct {
 	MetricsServer string `yaml:"metrics_server" json:"metricsServer,omitempty"`
 	// Pod infra container image for Windows
 	WindowsPodInfraContainer string `yaml:"windows_pod_infra_container" json:"windowsPodInfraContainer,omitempty"`
+	// host container image for Cisco ACI
+	AciHostContainer string `yaml:"aci_host_container" json:"aci_host_container,omitempty"`
+	// opflex agent container image for Cisco ACI
+	AciOpflexContainer string `yaml:"aci_opflex_container" json:"aci_opflex_container,omitempty"`
+	// mcast daemon container image for Cisco ACI
+	AciMcastContainer string `yaml:"aci_mcast_container" json:"aci_mcast_container,omitempty"`
+	// OpenvSwitch container image for Cisco ACI
+	AciOpenvSwitchContainer string `yaml:"aci_ovs_container" json:"aci_ovs_container,omitempty"`
+	// Controller container image for Cisco ACI
+	AciControllerContainer string `yaml:"aci_controller_container" json:"aci_controller_container,omitempty"`
 }

 type RKEConfigNode struct {
@@ -549,7 +559,42 @@ type WeaveNetworkProvider struct {
 }

 type AciNetworkProvider struct {
-	AciCNIConfig string `yaml:"aci_cni_config,omitempty" json:"aci_cni_config,omitempty"`
+	SystemIdentifier       string   `yaml:"system_id,omitempty" json:"systemId,omitempty"`
+	ApicHosts              []string `yaml:"apic_hosts" json:"apicHosts,omitempty"`
+	Token                  string   `yaml:"token,omitempty" json:"token,omitempty"`
+	ApicUserName           string   `yaml:"apic_user_name,omitempty" json:"apicUserName,omitempty"`
+	ApicUserKey            string   `yaml:"apic_user_key,omitempty" json:"apicUserKey,omitempty"`
+	ApicUserCrt            string   `yaml:"apic_user_crt,omitempty" json:"apicUserCrt,omitempty"`
+	ApicRefreshTime        string   `yaml:"apic_refresh_time,omitempty" json:"apicRefreshTime,omitempty" norman:"default=1200"`
+	VmmDomain              string   `yaml:"vmm_domain,omitempty" json:"vmmDomain,omitempty"`
+	VmmController          string   `yaml:"vmm_controller,omitempty" json:"vmmController,omitempty"`
+	EncapType              string   `yaml:"encap_type,omitempty" json:"encapType,omitempty"`
+	NodeSubnet             string   `yaml:"node_subnet,omitempty" json:"nodeSubnet,omitempty"`
+	McastRangeStart        string   `yaml:"mcast_range_start,omitempty" json:"mcastRangeStart,omitempty"`
+	McastRangeEnd          string   `yaml:"mcast_range_end,omitempty" json:"mcastRangeEnd,omitempty"`
+	AEP                    string   `yaml:"aep,omitempty" json:"aep,omitempty"`
+	VRFName                string   `yaml:"vrf_name,omitempty" json:"vrfName,omitempty"`
+	VRFTenant              string   `yaml:"vrf_tenant,omitempty" json:"vrfTenant,omitempty"`
+	L3Out                  string   `yaml:"l3out,omitempty" json:"l3Out,omitempty"`
+	L3OutExternalNetworks  []string `yaml:"l3out_external_networks" json:"l3OutExternalNetworks,omitempty"`
+	DynamicExternalSubnet  string   `yaml:"dynamic_external_subnet,omitempty" json:"dynamicExternalSubnet,omitempty"`
+	StaticExternalSubnet   string   `yaml:"static_external_subnet,omitempty" json:"staticExternalSubnet,omitempty"`
+	ServiceGraphSubnet     string   `yaml:"service_graph_subnet,omitempty" json:"serviceGraphSubnet,omitempty"`
+	KubeAPIVlan            string   `yaml:"kube_api_vlan,omitempty" json:"kubeAPIVlan,omitempty"`
+	ServiceVlan            string   `yaml:"service_vlan,omitempty" json:"serviceVlan,omitempty"`
+	InfraVlan              string   `yaml:"infra_vlan,omitempty" json:"infraVlan,omitempty"`
+	Tenant                 string   `yaml:"tenant,omitempty" json:"tenant,omitempty"`
+	OVSMemoryLimit         string   `yaml:"ovs_memory_limit,omitempty" json:"ovsMemoryLimit,omitempty" norman:"default=1Gi"`
+	ImagePullPolicy        string   `yaml:"image_pull_policy,omitempty" json:"imagePullPolicy,omitempty" norman:"default=Always"`
+	ImagePullSecret        string   `yaml:"image_pull_secret,omitempty" json:"imagePullSecret,omitempty"`
+	ServiceMonitorInterval string   `yaml:"service_monitor_interval,omitempty" json:"serviceMonitorInterval,omitempty" norman:"default=0"`
+	PBRTrackingNonSnat     string   `yaml:"pbr_tracking_non_snat,omitempty" json:"pbrTrackingNonSnat,omitempty" norman:"default=false"`
+	InstallIstio           string   `yaml:"install_istio,omitempty" json:"installIstio,omitempty" norman:"default=true"`
+	IstioProfile           string   `yaml:"istio_profile,omitempty" json:"istioProfile,omitempty" norman:"default=demo"`
+	DropLogEnable          string   `yaml:"drop_log_enable,omitempty" json:"dropLogEnable,omitempty" norman:"default=true"`
+	ControllerLogLevel     string   `yaml:"controller_log_level,omitempty" json:"controllerLogLevel,omitempty" norman:"default=debug"`
+	HostAgentLogLevel      string   `yaml:"host_agent_log_level,omitempty" json:"hostAgentLogLevel,omitempty" norman:"default=debug"`
+	OpflexAgentLogLevel    string   `yaml:"opflex_log_level,omitempty" json:"opflexLogLevel,omitempty" norman:"default=debug"`
 }

 type KubernetesServicesOptions struct {
--- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go
+++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go
@@ -61,6 +61,32 @@ 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
+	if in.ApicHosts != nil {
+		in, out := &in.ApicHosts, &out.ApicHosts
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.L3OutExternalNetworks != nil {
+		in, out := &in.L3OutExternalNetworks, &out.L3OutExternalNetworks
+		*out = make([]string, len(*in))
+		copy(*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
@@ -5828,6 +5854,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)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.NodeSelector != nil {
 		in, out := &in.NodeSelector, &out.NodeSelector
 		*out = make(map[string]string, len(*in))
--- a/client/management/v3/zz_generated_aci_network_provider.go
+++ b/client/management/v3/zz_generated_aci_network_provider.go
@@ -0,0 +1,80 @@
+package client
+
+const (
+	AciNetworkProviderType                        = "aciNetworkProvider"
+	AciNetworkProviderFieldAEP                    = "aep"
+	AciNetworkProviderFieldApicHosts              = "apicHosts"
+	AciNetworkProviderFieldApicRefreshTime        = "apicRefreshTime"
+	AciNetworkProviderFieldApicUserCrt            = "apicUserCrt"
+	AciNetworkProviderFieldApicUserKey            = "apicUserKey"
+	AciNetworkProviderFieldApicUserName           = "apicUserName"
+	AciNetworkProviderFieldControllerLogLevel     = "controllerLogLevel"
+	AciNetworkProviderFieldDropLogEnable          = "dropLogEnable"
+	AciNetworkProviderFieldDynamicExternalSubnet  = "dynamicExternalSubnet"
+	AciNetworkProviderFieldEncapType              = "encapType"
+	AciNetworkProviderFieldHostAgentLogLevel      = "hostAgentLogLevel"
+	AciNetworkProviderFieldImagePullPolicy        = "imagePullPolicy"
+	AciNetworkProviderFieldImagePullSecret        = "imagePullSecret"
+	AciNetworkProviderFieldInfraVlan              = "infraVlan"
+	AciNetworkProviderFieldInstallIstio           = "installIstio"
+	AciNetworkProviderFieldIstioProfile           = "istioProfile"
+	AciNetworkProviderFieldKubeAPIVlan            = "kubeAPIVlan"
+	AciNetworkProviderFieldL3Out                  = "l3Out"
+	AciNetworkProviderFieldL3OutExternalNetworks  = "l3OutExternalNetworks"
+	AciNetworkProviderFieldMcastRangeEnd          = "mcastRangeEnd"
+	AciNetworkProviderFieldMcastRangeStart        = "mcastRangeStart"
+	AciNetworkProviderFieldNodeSubnet             = "nodeSubnet"
+	AciNetworkProviderFieldOVSMemoryLimit         = "ovsMemoryLimit"
+	AciNetworkProviderFieldOpflexAgentLogLevel    = "opflexLogLevel"
+	AciNetworkProviderFieldPBRTrackingNonSnat     = "pbrTrackingNonSnat"
+	AciNetworkProviderFieldServiceGraphSubnet     = "serviceGraphSubnet"
+	AciNetworkProviderFieldServiceMonitorInterval = "serviceMonitorInterval"
+	AciNetworkProviderFieldServiceVlan            = "serviceVlan"
+	AciNetworkProviderFieldStaticExternalSubnet   = "staticExternalSubnet"
+	AciNetworkProviderFieldSystemIdentifier       = "systemId"
+	AciNetworkProviderFieldTenant                 = "tenant"
+	AciNetworkProviderFieldToken                  = "token"
+	AciNetworkProviderFieldVRFName                = "vrfName"
+	AciNetworkProviderFieldVRFTenant              = "vrfTenant"
+	AciNetworkProviderFieldVmmController          = "vmmController"
+	AciNetworkProviderFieldVmmDomain              = "vmmDomain"
+)
+
+type AciNetworkProvider struct {
+	AEP                    string   `json:"aep,omitempty" yaml:"aep,omitempty"`
+	ApicHosts              []string `json:"apicHosts,omitempty" yaml:"apicHosts,omitempty"`
+	ApicRefreshTime        string   `json:"apicRefreshTime,omitempty" yaml:"apicRefreshTime,omitempty"`
+	ApicUserCrt            string   `json:"apicUserCrt,omitempty" yaml:"apicUserCrt,omitempty"`
+	ApicUserKey            string   `json:"apicUserKey,omitempty" yaml:"apicUserKey,omitempty"`
+	ApicUserName           string   `json:"apicUserName,omitempty" yaml:"apicUserName,omitempty"`
+	ControllerLogLevel     string   `json:"controllerLogLevel,omitempty" yaml:"controllerLogLevel,omitempty"`
+	DropLogEnable          string   `json:"dropLogEnable,omitempty" yaml:"dropLogEnable,omitempty"`
+	DynamicExternalSubnet  string   `json:"dynamicExternalSubnet,omitempty" yaml:"dynamicExternalSubnet,omitempty"`
+	EncapType              string   `json:"encapType,omitempty" yaml:"encapType,omitempty"`
+	HostAgentLogLevel      string   `json:"hostAgentLogLevel,omitempty" yaml:"hostAgentLogLevel,omitempty"`
+	ImagePullPolicy        string   `json:"imagePullPolicy,omitempty" yaml:"imagePullPolicy,omitempty"`
+	ImagePullSecret        string   `json:"imagePullSecret,omitempty" yaml:"imagePullSecret,omitempty"`
+	InfraVlan              string   `json:"infraVlan,omitempty" yaml:"infraVlan,omitempty"`
+	InstallIstio           string   `json:"installIstio,omitempty" yaml:"installIstio,omitempty"`
+	IstioProfile           string   `json:"istioProfile,omitempty" yaml:"istioProfile,omitempty"`
+	KubeAPIVlan            string   `json:"kubeAPIVlan,omitempty" yaml:"kubeAPIVlan,omitempty"`
+	L3Out                  string   `json:"l3Out,omitempty" yaml:"l3Out,omitempty"`
+	L3OutExternalNetworks  []string `json:"l3OutExternalNetworks,omitempty" yaml:"l3OutExternalNetworks,omitempty"`
+	McastRangeEnd          string   `json:"mcastRangeEnd,omitempty" yaml:"mcastRangeEnd,omitempty"`
+	McastRangeStart        string   `json:"mcastRangeStart,omitempty" yaml:"mcastRangeStart,omitempty"`
+	NodeSubnet             string   `json:"nodeSubnet,omitempty" yaml:"nodeSubnet,omitempty"`
+	OVSMemoryLimit         string   `json:"ovsMemoryLimit,omitempty" yaml:"ovsMemoryLimit,omitempty"`
+	OpflexAgentLogLevel    string   `json:"opflexLogLevel,omitempty" yaml:"opflexLogLevel,omitempty"`
+	PBRTrackingNonSnat     string   `json:"pbrTrackingNonSnat,omitempty" yaml:"pbrTrackingNonSnat,omitempty"`
+	ServiceGraphSubnet     string   `json:"serviceGraphSubnet,omitempty" yaml:"serviceGraphSubnet,omitempty"`
+	ServiceMonitorInterval string   `json:"serviceMonitorInterval,omitempty" yaml:"serviceMonitorInterval,omitempty"`
+	ServiceVlan            string   `json:"serviceVlan,omitempty" yaml:"serviceVlan,omitempty"`
+	StaticExternalSubnet   string   `json:"staticExternalSubnet,omitempty" yaml:"staticExternalSubnet,omitempty"`
+	SystemIdentifier       string   `json:"systemId,omitempty" yaml:"systemId,omitempty"`
+	Tenant                 string   `json:"tenant,omitempty" yaml:"tenant,omitempty"`
+	Token                  string   `json:"token,omitempty" yaml:"token,omitempty"`
+	VRFName                string   `json:"vrfName,omitempty" yaml:"vrfName,omitempty"`
+	VRFTenant              string   `json:"vrfTenant,omitempty" yaml:"vrfTenant,omitempty"`
+	VmmController          string   `json:"vmmController,omitempty" yaml:"vmmController,omitempty"`
+	VmmDomain              string   `json:"vmmDomain,omitempty" yaml:"vmmDomain,omitempty"`
+}
--- a/client/management/v3/zz_generated_network_config.go
+++ b/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"
@@ -14,6 +15,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"`
--- a/client/management/v3/zz_generated_rke_system_images.go
+++ b/client/management/v3/zz_generated_rke_system_images.go
@@ -2,6 +2,11 @@ package client

 const (
 	RKESystemImagesType                           = "rkeSystemImages"
+	RKESystemImagesFieldAciControllerContainer    = "aci_controller_container"
+	RKESystemImagesFieldAciHostContainer          = "aci_host_container"
+	RKESystemImagesFieldAciMcastContainer         = "aci_mcast_container"
+	RKESystemImagesFieldAciOpenvSwitchContainer   = "aci_ovs_container"
+	RKESystemImagesFieldAciOpflexContainer        = "aci_opflex_container"
 	RKESystemImagesFieldAlpine                    = "alpine"
 	RKESystemImagesFieldCalicoCNI                 = "calicoCni"
 	RKESystemImagesFieldCalicoControllers         = "calicoControllers"
@@ -36,6 +41,11 @@ const (
 )

 type RKESystemImages struct {
+	AciControllerContainer    string `json:"aci_controller_container,omitempty" yaml:"aci_controller_container,omitempty"`
+	AciHostContainer          string `json:"aci_host_container,omitempty" yaml:"aci_host_container,omitempty"`
+	AciMcastContainer         string `json:"aci_mcast_container,omitempty" yaml:"aci_mcast_container,omitempty"`
+	AciOpenvSwitchContainer   string `json:"aci_ovs_container,omitempty" yaml:"aci_ovs_container,omitempty"`
+	AciOpflexContainer        string `json:"aci_opflex_container,omitempty" yaml:"aci_opflex_container,omitempty"`
 	Alpine                    string `json:"alpine,omitempty" yaml:"alpine,omitempty"`
 	CalicoCNI                 string `json:"calicoCni,omitempty" yaml:"calicoCni,omitempty"`
 	CalicoControllers         string `json:"calicoControllers,omitempty" yaml:"calicoControllers,omitempty"`
--- a/kdm/kdm.go
+++ b/kdm/kdm.go
@@ -14,6 +14,7 @@ const (
 	CoreDNS       = "coreDNS"
 	KubeDNS       = "kubeDNS"
 	MetricsServer = "metricsServer"
+	Aci           = "aci"
 	NginxIngress  = "nginxIngress"
 	Nodelocal     = "nodelocal"
 	TemplateKeys  = "templateKeys"