remove unused field

kubeovn · Jun 25, 2023 · b332d9c · b332d9c
1 parent 2cb162d
commit b332d9c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 30 deletions.
diff --git a/charts/templates/kube-ovn-crd.yaml b/charts/templates/kube-ovn-crd.yaml
@@ -1781,9 +1781,6 @@ spec:
       - name: Subnet
         type: string
         jsonPath: .spec.subnet
-      - name: Protocol
-        type: string
-        jsonPath: .spec.protocol
       - name: IPs
         type: string
         jsonPath: .spec.ips
@@ -1816,12 +1813,6 @@ spec:
                   x-kubernetes-list-type: set
                   items:
                     type: string
-                protocol:
-                  type: string
-                  enum:
-                    - IPv4
-                    - IPv6
-                    - Dual
                 ips:
                   type: array
                   minItems: 1

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -2319,9 +2319,6 @@ spec:
       - name: Subnet
         type: string
         jsonPath: .spec.subnet
-      - name: Protocol
-        type: string
-        jsonPath: .spec.protocol
       - name: IPs
         type: string
         jsonPath: .spec.ips
@@ -2354,12 +2351,6 @@ spec:
                   x-kubernetes-list-type: set
                   items:
                     type: string
-                protocol:
-                  type: string
-                  enum:
-                    - IPv4
-                    - IPv6
-                    - Dual
                 ips:
                   type: array
                   minItems: 1

diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -266,7 +266,6 @@ type IPPool struct {
 
 type IPPoolSpec struct {
 	Subnet     string   `json:"subnet,omitempty"`
-	Protocol   string   `json:"protocol,omitempty"`
 	Namespaces []string `json:"namespaces,omitempty"`
 	IPs        []string `json:"ips,omitempty"`
 }

diff --git a/pkg/controller/ippool.go b/pkg/controller/ippool.go
@@ -48,8 +48,7 @@ func (c *Controller) enqueueUpdateIPPool(old, new interface{}) {
 	}
 
 	if !reflect.DeepEqual(oldIPPool.Spec.Namespaces, newIPPool.Spec.Namespaces) ||
-		!reflect.DeepEqual(oldIPPool.Spec.IPs, newIPPool.Spec.IPs) ||
-		oldIPPool.Spec.Protocol != newIPPool.Spec.Protocol {
+		!reflect.DeepEqual(oldIPPool.Spec.IPs, newIPPool.Spec.IPs) {
 		klog.V(3).Infof("enqueue update ippool %s", key)
 		c.addOrUpdateIPPoolQueue.Add(key)
 	}

diff --git a/yamls/crd.yaml b/yamls/crd.yaml
@@ -2090,9 +2090,6 @@ spec:
       - name: Subnet
         type: string
         jsonPath: .spec.subnet
-      - name: Protocol
-        type: string
-        jsonPath: .spec.protocol
       - name: IPs
         type: string
         jsonPath: .spec.ips
@@ -2125,12 +2122,6 @@ spec:
                   x-kubernetes-list-type: set
                   items:
                     type: string
-                protocol:
-                  type: string
-                  enum:
-                    - IPv4
-                    - IPv6
-                    - Dual
                 ips:
                   type: array
                   minItems: 1