Merge pull request #899 from SchSeba/support_aws

Support aws

Author: SchSeba

Makefile

@@ -109,7 +109,7 @@ manifests: controller-gen
 check-manifests: manifests
 	@set +e; git diff --quiet config; \
 	if [ $$? -eq 1 ]; \
-	then echo -e "\n`config` folder is out of date. Please run `make manifests` and commit your changes"; \
+	then echo -e "'config' folder is out of date. Please run 'make manifests' and commit your changes"; \
 	exit 1; fi
 
 sync-manifests-%: manifests

api/v1/helper.go

@@ -55,13 +55,7 @@ var NicIDMap = []string{}
 
 var InitialState SriovNetworkNodeState
 
-// NetFilterType Represents the NetFilter tags to be used
-type NetFilterType int
-
 const (
-	// OpenstackNetworkID network UUID
-	OpenstackNetworkID NetFilterType = iota
-
 	SupportedNicIDConfigmap = "supported-nic-ids"
 )
 
@@ -72,15 +66,6 @@ const (
 	SystemdConfigurationMode ConfigurationModeType = "systemd"
 )
 
-func (e NetFilterType) String() string {
-	switch e {
-	case OpenstackNetworkID:
-		return "openstack/NetworkID"
-	default:
-		return fmt.Sprintf("%d", int(e))
-	}
-}
-
 func InitNicIDMapFromConfigMap(client kubernetes.Interface, namespace string) error {
 	cm, err := client.CoreV1().ConfigMaps(namespace).Get(
 		context.Background(),

api/v1/sriovnetworknodepolicy_types.go

@@ -76,7 +76,10 @@ type SriovNetworkNicSelector struct {
 	RootDevices []string `json:"rootDevices,omitempty"`
 	// Name of SR-IoV PF.
 	PfNames []string `json:"pfNames,omitempty"`
-	// Infrastructure Networking selection filter. Allowed value "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+	// Infrastructure Networking selection filter.
+	// Allowed values:
+	// - "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+	// - "aws/NetworkID:xxxxxxxx"
 	NetFilter string `json:"netFilter,omitempty"`
 }
 

cmd/sriov-network-config-daemon/start.go

@@ -244,12 +244,8 @@ func runStartCmd(cmd *cobra.Command, args []string) error {
 		setupLog.Error(err, "failed to fetch node state, exiting", "node-name", startOpts.nodeName)
 		return err
 	}
-	// check for a platform
-	for key, pType := range vars.PlatformsMap {
-		if strings.Contains(strings.ToLower(nodeInfo.Spec.ProviderID), strings.ToLower(key)) {
-			vars.PlatformType = pType
-		}
-	}
+	// set the platform type
+	vars.PlatformType = vars.GetPlatformType(nodeInfo.Spec.ProviderID)
 	setupLog.Info("Running on", "platform", vars.PlatformType)
 
 	// create helpers

config/crd/bases/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml

@@ -161,8 +161,11 @@ spec:
                       "0d58", "1572", "158b", "1013", "1015", "1017", "101b".
                     type: string
                   netFilter:
-                    description: Infrastructure Networking selection filter. Allowed
-                      value "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+                    description: |-
+                      Infrastructure Networking selection filter.
+                      Allowed values:
+                      - "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+                      - "aws/NetworkID:xxxxxxxx"
                     type: string
                   pfNames:
                     description: Name of SR-IoV PF.

deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml

@@ -161,8 +161,11 @@ spec:
                       "0d58", "1572", "158b", "1013", "1015", "1017", "101b".
                     type: string
                   netFilter:
-                    description: Infrastructure Networking selection filter. Allowed
-                      value "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+                    description: |-
+                      Infrastructure Networking selection filter.
+                      Allowed values:
+                      - "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+                      - "aws/NetworkID:xxxxxxxx"
                     type: string
                   pfNames:
                     description: Name of SR-IoV PF.

pkg/consts/platforms.go

@@ -28,4 +28,6 @@ const (
 	Baremetal PlatformTypes = "Baremetal"
 	// VirtualOpenStack represents a virtual OpenStack platform
 	VirtualOpenStack PlatformTypes = "Virtual/Openstack"
+	// AWS represents an AWS platform
+	AWS PlatformTypes = "AWS"
 )