Skip to content

Commit

Permalink
feat: ovn eip snat fip (#2029)
Browse files Browse the repository at this point in the history 
* add ovn eip fip snat crd api
* add ovn eip fip snat controller workers, and compatiable with enabel_eip_snat
  • Loading branch information
@bobz965
bobz965 committed Nov 15, 2022
1 parent 7307560 commit 75da160
Show file tree
Hide file tree
Showing 43 changed files with 4,390 additions and 37 deletions.
17 changes: 16 additions & 1 deletion dist/images/cleanup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,20 @@ for fip in $(kubectl get fip -o name); do
kubectl delete --ignore-not-found $fip
done


for osnat in $(kubectl get osnat -o name); do
kubectl delete --ignore-not-found $osnat
done

for ofip in $(kubectl get ofip -o name); do
kubectl delete --ignore-not-found $ofip
done

for oeip in $(kubectl get oeip -o name); do
kubectl delete --ignore-not-found $oeip
done


sleep 5

# Delete Kube-OVN components
Expand Down Expand Up @@ -101,7 +115,8 @@ kubectl delete --ignore-not-found sa vpc-dns -n kube-system
kubectl delete --ignore-not-found crd htbqoses.kubeovn.io security-groups.kubeovn.io ips.kubeovn.io subnets.kubeovn.io \
vpc-nat-gateways.kubeovn.io vpcs.kubeovn.io vlans.kubeovn.io provider-networks.kubeovn.io \
iptables-dnat-rules.kubeovn.io iptables-eips.kubeovn.io iptables-fip-rules.kubeovn.io \
iptables-snat-rules.kubeovn.io vips.kubeovn.io switch-lb-rules.kubeovn.io vpc-dnses.kubeovn.io
iptables-snat-rules.kubeovn.io vips.kubeovn.io switch-lb-rules.kubeovn.io vpc-dnses.kubeovn.io \
ovn-eips.kubeovn.io ovn-fips.kubeovn.io ovn-snat-rules.kubeovn.io

# Remove annotations/labels in namespaces and nodes
kubectl annotate no --all ovn.kubernetes.io/cidr-
Expand Down
239 changes: 239 additions & 0 deletions dist/images/install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -826,12 +826,235 @@ spec:
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: ovn-eips.kubeovn.io
spec:
group: kubeovn.io
names:
plural: ovn-eips
singular: ovn-eip
shortNames:
- oeip
kind: OvnEip
listKind: OvnEipList
scope: Cluster
versions:
- name: v1
served: true
storage: true
subresources:
status: {}
additionalPrinterColumns:
- jsonPath: .spec.v4ip
name: IP
type: string
- jsonPath: .spec.macAddress
name: Mac
type: string
- jsonPath: .spec.type
name: Type
type: string
schema:
openAPIV3Schema:
type: object
properties:
status:
type: object
properties:
v4Ip:
type: string
macAddress:
type: string
conditions:
type: array
items:
type: object
properties:
type:
type: string
status:
type: string
reason:
type: string
message:
type: string
lastUpdateTime:
type: string
lastTransitionTime:
type: string
spec:
type: object
properties:
externalSubnet:
type: string
type:
type: string
v4ip:
type: string
macAddress:
type: string
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: ovn-fips.kubeovn.io
spec:
group: kubeovn.io
names:
plural: ovn-fips
singular: ovn-fip
shortNames:
- ofip
kind: OvnFip
listKind: OvnFipList
scope: Cluster
versions:
- name: v1
served: true
storage: true
subresources:
status: {}
additionalPrinterColumns:
- jsonPath: .status.vpc
name: Vpc
type: string
- jsonPath: .status.v4Eip
name: V4Eip
type: string
- jsonPath: .status.v4Ip
name: V4Ip
type: string
- jsonPath: .status.ready
name: Ready
type: boolean
schema:
openAPIV3Schema:
type: object
properties:
status:
type: object
properties:
ready:
type: boolean
v4Eip:
type: string
v4Ip:
type: string
macAddress:
type: string
vpc:
type: string
conditions:
type: array
items:
type: object
properties:
type:
type: string
status:
type: string
reason:
type: string
message:
type: string
lastUpdateTime:
type: string
lastTransitionTime:
type: string
spec:
type: object
properties:
ovnEip:
type: string
ipName:
type: string
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: ovn-snat-rules.kubeovn.io
spec:
group: kubeovn.io
names:
plural: ovn-snat-rules
singular: ovn-snat-rule
shortNames:
- osnat
kind: OvnSnatRule
listKind: OvnSnatRuleList
scope: Cluster
versions:
- name: v1
served: true
storage: true
subresources:
status: {}
additionalPrinterColumns:
- jsonPath: .status.vpc
name: Vpc
type: string
- jsonPath: .status.v4Eip
name: V4Eip
type: string
- jsonPath: .status.v4ipCidr
name: V4Ip
type: string
- jsonPath: .status.ready
name: Ready
type: boolean
schema:
openAPIV3Schema:
type: object
properties:
status:
type: object
properties:
ready:
type: boolean
v4Eip:
type: string
v4ipCidr:
type: string
vpc:
type: string
conditions:
type: array
items:
type: object
properties:
type:
type: string
status:
type: string
reason:
type: string
message:
type: string
lastUpdateTime:
type: string
lastTransitionTime:
type: string
spec:
type: object
properties:
ovnEip:
type: string
vpcSubnet:
type: string
ipName:
type: string
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: vpcs.kubeovn.io
spec:
group: kubeovn.io
versions:
- additionalPrinterColumns:
- jsonPath: .status.enableExternal
name: EnableExternal
type: boolean
- jsonPath: .status.standby
name: Standby
type: boolean
Expand All @@ -847,6 +1070,8 @@ spec:
properties:
spec:
properties:
enableExternal:
type: boolean
namespaces:
items:
type: string
Expand Down Expand Up @@ -912,6 +1137,8 @@ spec:
type: string
standby:
type: boolean
enableExternal:
type: boolean
subnets:
items:
type: string
Expand Down Expand Up @@ -1647,6 +1874,12 @@ rules:
- iptables-fip-rules/status
- iptables-dnat-rules/status
- iptables-snat-rules/status
- ovn-eips
- ovn-fips
- ovn-snat-rules
- ovn-eips/status
- ovn-fips/status
- ovn-snat-rules/status
- switch-lb-rules
- switch-lb-rules/status
- vpc-dnses
Expand Down Expand Up @@ -2148,6 +2381,12 @@ rules:
- iptables-fip-rules/status
- iptables-dnat-rules/status
- iptables-snat-rules/status
- ovn-eips
- ovn-fips
- ovn-snat-rules
- ovn-eips/status
- ovn-fips/status
- ovn-snat-rules/status
- vpc-dnses
- vpc-dnses/status
- switch-lb-rules
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ require (
github.com/containernetworking/plugins v1.1.1
github.com/coreos/go-iptables v0.6.0
github.com/emicklei/go-restful/v3 v3.9.0
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/go-logr/stdr v1.2.2
github.com/greenpau/ovsdb v1.0.2
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.3.0
Expand Down Expand Up @@ -60,7 +61,6 @@ require (
github.com/eapache/channels v1.1.0 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/elazarl/goproxy v0.0.0-20190630181448-f1e96bc0f4c5 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-ini/ini v1.42.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
Expand Down
6 changes: 6 additions & 0 deletions pkg/apis/kubeovn/v1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&IptablesDnatRuleList{},
&IptablesSnatRule{},
&IptablesSnatRuleList{},
&OvnEip{},
&OvnEipList{},
&OvnFip{},
&OvnFipList{},
&OvnSnatRule{},
&OvnSnatRuleList{},
&SecurityGroup{},
&SecurityGroupList{},
&HtbQos{},
Expand Down
30 changes: 30 additions & 0 deletions pkg/apis/kubeovn/v1/status.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,33 @@ func (isnats *IptablesSnatRuleStatus) Bytes() ([]byte, error) {
klog.V(5).Info("status body", newStr)
return []byte(newStr), nil
}

func (oeips *OvnEipStatus) Bytes() ([]byte, error) {
bytes, err := json.Marshal(oeips)
if err != nil {
return nil, err
}
newStr := fmt.Sprintf(`{"status": %s}`, string(bytes))
klog.V(5).Info("status body", newStr)
return []byte(newStr), nil
}

func (ofs *OvnFipStatus) Bytes() ([]byte, error) {
bytes, err := json.Marshal(ofs)
if err != nil {
return nil, err
}
newStr := fmt.Sprintf(`{"status": %s}`, string(bytes))
klog.V(5).Info("status body", newStr)
return []byte(newStr), nil
}

func (osrs *OvnSnatRuleStatus) Bytes() ([]byte, error) {
bytes, err := json.Marshal(osrs)
if err != nil {
return nil, err
}
newStr := fmt.Sprintf(`{"status": %s}`, string(bytes))
klog.V(5).Info("status body", newStr)
return []byte(newStr), nil
}
Loading

0 comments on commit 75da160

Please sign in to comment.