diff --git a/charts/templates/kube-ovn-crd.yaml b/charts/templates/kube-ovn-crd.yaml index 1e0499707c7..7a899182fc5 100644 --- 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 index 177cfb7fce5..0c4dfd36f2b 100755 --- 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 index 0d4f0159955..c0d6b69dac8 100644 --- 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 index 8b8d5cb98e1..32213dfba32 100644 --- 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 index ab70b95ec32..baba1253a6b 100644 --- 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