Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support ovn eip nats dualstack #3822

Merged
merged 5 commits into from
May 7, 2024
Merged

support ovn eip nats dualstack #3822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3798cf
support ovn eip nats dualstack
zbb88888 Mar 12, 2024
e5433d4
update ovn snat
zbb88888 Mar 12, 2024
61fcfef
Merge branch 'master' into ovn-gw-support-nat
zbb88888 Apr 29, 2024
ce11feb
fix blank line
zbb88888 Apr 29, 2024
223c75f
update crd
zbb88888 May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions charts/kube-ovn/templates/kube-ovn-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,9 +1268,15 @@ spec:
- jsonPath: .status.v4Eip
name: V4Eip
type: string
- jsonPath: .status.v6Eip
name: V6Eip
type: string
- jsonPath: .status.v4Ip
name: V4Ip
type: string
- jsonPath: .status.v6Ip
name: V6Ip
type: string
- jsonPath: .status.ready
name: Ready
type: boolean
Expand Down Expand Up @@ -1325,6 +1331,8 @@ spec:
type: string
v4Ip:
type: string
v6Ip:
type: string
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -1353,9 +1361,15 @@ spec:
- jsonPath: .status.v4Eip
name: V4Eip
type: string
- jsonPath: .status.v6Eip
name: V6Eip
type: string
- jsonPath: .status.v4IpCidr
name: V4IpCidr
type: string
- jsonPath: .status.v6IpCidr
name: V6IpCidr
type: string
- jsonPath: .status.ready
name: Ready
type: boolean
Expand All @@ -1370,8 +1384,12 @@ spec:
type: boolean
v4Eip:
type: string
v6Eip:
type: string
v4IpCidr:
type: string
v6IpCidr:
type: string
vpc:
type: string
conditions:
Expand Down Expand Up @@ -1404,6 +1422,8 @@ spec:
type: string
v4IpCidr:
type: string
v6IpCidr:
type: string
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -1438,9 +1458,15 @@ spec:
- jsonPath: .status.v4Eip
name: V4Eip
type: string
- jsonPath: .status.v6Eip
name: V6Eip
type: string
- jsonPath: .status.v4Ip
name: V4Ip
type: string
- jsonPath: .status.v6Ip
name: V6Ip
type: string
- jsonPath: .status.internalPort
name: InternalPort
type: string
Expand Down Expand Up @@ -1512,6 +1538,8 @@ spec:
type: string
v4Ip:
type: string
v6Ip:
type: string
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down
28 changes: 28 additions & 0 deletions dist/images/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1496,9 +1496,15 @@ spec:
- jsonPath: .status.v4Eip
name: V4Eip
type: string
- jsonPath: .status.v6Eip
name: V6Eip
type: string
- jsonPath: .status.v4Ip
name: V4Ip
type: string
- jsonPath: .status.v6Ip
name: V6Ip
type: string
- jsonPath: .status.ready
name: Ready
type: boolean
Expand Down Expand Up @@ -1553,6 +1559,8 @@ spec:
type: string
v4Ip:
type: string
v6Ip:
type: string
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -1581,9 +1589,15 @@ spec:
- jsonPath: .status.v4Eip
name: V4Eip
type: string
- jsonPath: .status.v6Eip
name: V6Eip
type: string
- jsonPath: .status.v4IpCidr
name: V4IpCidr
type: string
- jsonPath: .status.v6IpCidr
name: V6IpCidr
type: string
- jsonPath: .status.ready
name: Ready
type: boolean
Expand All @@ -1598,8 +1612,12 @@ spec:
type: boolean
v4Eip:
type: string
v6Eip:
type: string
v4IpCidr:
type: string
v6IpCidr:
type: string
vpc:
type: string
conditions:
Expand Down Expand Up @@ -1632,6 +1650,8 @@ spec:
type: string
v4IpCidr:
type: string
v6IpCidr:
type: string
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -1666,9 +1686,15 @@ spec:
- jsonPath: .status.v4Eip
name: V4Eip
type: string
- jsonPath: .status.v6Eip
name: V6Eip
type: string
- jsonPath: .status.v4Ip
name: V4Ip
type: string
- jsonPath: .status.v6Ip
name: V6Ip
type: string
- jsonPath: .status.internalPort
name: InternalPort
type: string
Expand Down Expand Up @@ -1740,6 +1766,8 @@ spec:
type: string
v4Ip:
type: string
v6Ip:
type: string
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down
9 changes: 9 additions & 0 deletions pkg/apis/kubeovn/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,7 @@ type OvnFipSpec struct {
IPName string `json:"ipName"` // vip, ip crd name
Vpc string `json:"vpc"`
V4Ip string `json:"v4Ip"`
V6Ip string `json:"v6Ip"`
}

// OvnFipCondition describes the state of an object at a certain point.
Expand All @@ -1019,7 +1020,9 @@ type OvnFipStatus struct {
// +patchStrategy=merge
Vpc string `json:"vpc" patchStrategy:"merge"`
V4Eip string `json:"v4Eip" patchStrategy:"merge"`
V6Eip string `json:"v6Eip" patchStrategy:"merge"`
V4Ip string `json:"v4Ip" patchStrategy:"merge"`
V6Ip string `json:"v6Ip" patchStrategy:"merge"`
Ready bool `json:"ready" patchStrategy:"merge"`

// Conditions represents the latest state of the object
Expand Down Expand Up @@ -1057,6 +1060,7 @@ type OvnSnatRuleSpec struct {
IPName string `json:"ipName"`
Vpc string `json:"vpc"`
V4IpCidr string `json:"v4IpCidr"` // subnet cidr or pod ip address
V6IpCidr string `json:"v6IpCidr"` // subnet cidr or pod ip address
}

// OvnSnatRuleCondition describes the state of an object at a certain point.
Expand All @@ -1068,7 +1072,9 @@ type OvnSnatRuleStatus struct {
// +patchStrategy=merge
Vpc string `json:"vpc" patchStrategy:"merge"`
V4Eip string `json:"v4Eip" patchStrategy:"merge"`
V6Eip string `json:"v6Eip" patchStrategy:"merge"`
V4IpCidr string `json:"v4IpCidr" patchStrategy:"merge"`
V6IpCidr string `json:"v6IpCidr" patchStrategy:"merge"`
Ready bool `json:"ready" patchStrategy:"merge"`

// Conditions represents the latest state of the object
Expand Down Expand Up @@ -1109,6 +1115,7 @@ type OvnDnatRuleSpec struct {
Protocol string `json:"protocol,omitempty"`
Vpc string `json:"vpc"`
V4Ip string `json:"v4Ip"`
V6Ip string `json:"v6Ip"`
}

// OvnDnatRuleCondition describes the state of an object at a certain point.
Expand All @@ -1121,8 +1128,10 @@ type OvnDnatRuleStatus struct {
// +patchStrategy=merge
Vpc string `json:"vpc" patchStrategy:"merge"`
V4Eip string `json:"v4Eip" patchStrategy:"merge"`
V6Eip string `json:"v6Eip" patchStrategy:"merge"`
ExternalPort string `json:"externalPort"`
V4Ip string `json:"v4Ip" patchStrategy:"merge"`
V6Ip string `json:"v6Ip" patchStrategy:"merge"`
InternalPort string `json:"internalPort"`
Protocol string `json:"protocol,omitempty"`
IPName string `json:"ipName"`
Expand Down
Loading
Loading