update egresspolicy crd

Signed-off-by: dcwbq <biqiang.wu@daocloud.io>
spidernet-io · May 30, 2023 · 28ce42c · 28ce42c
1 parent 9590e06
commit 28ce42c
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 33 deletions.
diff --git a/pkg/controller/endpoint_slice_test.go b/pkg/controller/endpoint_slice_test.go
@@ -154,7 +154,7 @@ func caseAddPolicy() TestCaseEPS {
 				Name:      "policy1",
 				Namespace: "default",
 			},
-			Spec: egressv1.EgressGatewayPolicySpec{
+			Spec: egressv1.EgressPolicySpec{
 				EgressGatewayName: "",
 				EgressIP:          egressv1.EgressIP{},
 				AppliedTo: egressv1.AppliedTo{
@@ -235,7 +235,7 @@ func caseUpdatePod() TestCaseEPS {
 				Name:      "policy1",
 				Namespace: "default",
 			},
-			Spec: egressv1.EgressGatewayPolicySpec{
+			Spec: egressv1.EgressPolicySpec{
 				EgressGatewayName: "",
 				EgressIP:          egressv1.EgressIP{},
 				AppliedTo: egressv1.AppliedTo{
@@ -350,7 +350,7 @@ func caseDeletePod() TestCaseEPS {
 				Name:      "policy1",
 				Namespace: "default",
 			},
-			Spec: egressv1.EgressGatewayPolicySpec{
+			Spec: egressv1.EgressPolicySpec{
 				EgressGatewayName: "",
 				EgressIP:          egressv1.EgressIP{},
 				AppliedTo: egressv1.AppliedTo{

diff --git a/pkg/controller/webhook/validate_test.go b/pkg/controller/webhook/validate_test.go
@@ -129,7 +129,7 @@ func TestValidateEgressGatewayPolicy(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "policy",
 				},
-				Spec: egressv1.EgressGatewayPolicySpec{
+				Spec: egressv1.EgressPolicySpec{
 					EgressGatewayName: "test",
 					EgressIP: egressv1.EgressIP{
 						UseNodeIP: false,

diff --git a/pkg/k8s/apis/egressgateway.spidernet.io/v1beta1/egresspolicy_types.go b/pkg/k8s/apis/egressgateway.spidernet.io/v1beta1/egresspolicy_types.go
@@ -24,10 +24,10 @@ type EgressPolicy struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata"`
 
-	Spec EgressGatewayPolicySpec `json:"spec,omitempty"`
+	Spec EgressPolicySpec `json:"spec,omitempty"`
 }
 
-type EgressGatewayPolicySpec struct {
+type EgressPolicySpec struct {
 	// +kubebuilder:validation:Optional
 	EgressGatewayName string `json:"egressGatewayName,omitempty"`
 	// +kubebuilder:validation:Optional
@@ -39,9 +39,12 @@ type EgressGatewayPolicySpec struct {
 }
 
 type EgressIP struct {
-	IPv4      string `json:"ipv4,omitempty"`
-	IPv6      string `json:"ipv6,omitempty"`
-	UseNodeIP bool   `json:"useNodeIP,omitempty"`
+	// +kubebuilder:validation:Optional
+	IPv4 string `json:"ipv4,omitempty"`
+	// +kubebuilder:validation:Optional
+	IPv6 string `json:"ipv6,omitempty"`
+	// +kubebuilder:validation:Optional
+	UseNodeIP bool `json:"useNodeIP,omitempty"`
 }
 
 type AppliedTo struct {

diff --git a/pkg/k8s/apis/egressgateway.spidernet.io/v1beta1/zz_generated.deepcopy.go b/pkg/k8s/apis/egressgateway.spidernet.io/v1beta1/zz_generated.deepcopy.go
diff --git a/test/e2e/common/egresspolicy.go b/test/e2e/common/egresspolicy.go
@@ -5,20 +5,21 @@ package common
 
 import (
 	"context"
+	"time"
+
 	"github.com/spidernet-io/e2eframework/framework"
 	egressv1 "github.com/spidernet-io/egressgateway/pkg/k8s/apis/egressgateway.spidernet.io/v1beta1"
 	"github.com/spidernet-io/egressgateway/test/e2e/err"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"time"
 )
 
 func GenerateEgressPolicyYaml(name string, labels map[string]string, dest []string) *egressv1.EgressPolicy {
 	return &egressv1.EgressPolicy{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
 		},
-		Spec: egressv1.EgressGatewayPolicySpec{
+		Spec: egressv1.EgressPolicySpec{
 			AppliedTo: egressv1.AppliedTo{
 				PodSelector: &metav1.LabelSelector{
 					MatchLabels: labels,