metrics/features: remove aws-vpc-cni

[ upstream commit 37f19f6 ]

This metric is duplicated since it was meant to be aws-cni, which
already exists. Thus, we can remove it.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Tobias Klauser <tobias@cilium.io>

Author: aanm

Documentation/observability/feature-metrics-agent.txt

@@ -281,11 +281,6 @@
     - ``"aws-cni"``
     - Chaining mode enabled on the agent
     - gauge
-  * -
-    -
-    - ``"aws-vpc-cni"``
-    -
-    -
   * -
     -
     - ``"calico"``

pkg/metrics/features/metrics.go

@@ -92,7 +92,6 @@ const (
 
 	networkChainingModeNone        = "none"
 	networkChainingModeAWSCNI      = "aws-cni"
-	networkChainingModeAWSVPCCNI   = "aws-vpc-cni"
 	networkChainingModeCalico      = "calico"
 	networkChainingModeFlannel     = "flannel"
 	networkChainingModeGenericVeth = "generic-veth"
@@ -147,7 +146,6 @@ var (
 	defaultChainingModes = []string{
 		networkChainingModeNone,
 		networkChainingModeAWSCNI,
-		networkChainingModeAWSVPCCNI,
 		networkChainingModeCalico,
 		networkChainingModeFlannel,
 		networkChainingModeGenericVeth,