rename vSwitchID to vSwitchOptions

Author: l1b0k

pkg/controller/webhook/mutating.go

@@ -28,14 +28,14 @@ import (
 	"github.com/AliyunContainerService/terway/pkg/utils"
 	"github.com/AliyunContainerService/terway/types"
 	"github.com/AliyunContainerService/terway/types/controlplane"
-	"k8s.io/apimachinery/pkg/util/sets"
 
 	"gomodules.xyz/jsonpatch/v2"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/json"
+	"k8s.io/apimachinery/pkg/util/sets"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
@@ -119,7 +119,7 @@ func podWebhook(ctx context.Context, req *webhook.AdmissionRequest, client clien
 			pna := &controlplane.PodNetworksAnnotation{
 				PodNetworks: []controlplane.PodNetworks{
 					{
-						VSwitchIDs:       vsws,
+						VSwitchOptions:   vsws,
 						SecurityGroupIDs: sgs,
 					},
 				},
@@ -133,7 +133,7 @@ func podWebhook(ctx context.Context, req *webhook.AdmissionRequest, client clien
 			memberCount = 1
 		} else {
 			for _, n := range networks.PodNetworks {
-				if len(n.VSwitchIDs) == 0 {
+				if len(n.VSwitchOptions) == 0 {
 					return admission.Denied("vSwitchID is not set")
 				}
 				if len(n.SecurityGroupIDs) == 0 {

types/controlplane/annotations_default.go

@@ -20,6 +20,6 @@ limitations under the License.
 package controlplane
 
 type PodNetworks struct {
-	VSwitchIDs       []string `json:"vSwitchIDs"`
+	VSwitchOptions   []string `json:"vSwitchOptions"`
 	SecurityGroupIDs []string `json:"securityGroupIDs"`
 }