openkruise
/
kruise-game
mirror of https://github.com/openkruise/kruise-game.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor NetworkPortRange into a pointer (#87) 

Signed-off-by: ChrisLiu <chrisliu1995@163.com>
This commit is contained in:
ChrisLiu 2023-07-18 16:28:16 +08:00 committed by GitHub
parent dcc3d8260c
commit defcb15f02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apis/v1alpha1/gameserver_types.go
View File

@ -123,9 +123,9 @@ const (
type NetworkAddress struct {
IP string `json:"ip"`
// TODO add IPv6
Ports []NetworkPort `json:"ports,omitempty"`
PortRange NetworkPortRange `json:"portRange,omitempty"`
EndPoint string `json:"endPoint,omitempty"`
Ports []NetworkPort `json:"ports,omitempty"`
PortRange *NetworkPortRange `json:"portRange,omitempty"`
EndPoint string `json:"endPoint,omitempty"`
}
type NetworkPort struct {

6
apis/v1alpha1/zz_generated.deepcopy.go
View File

@ -339,7 +339,11 @@ func (in *NetworkAddress) DeepCopyInto(out *NetworkAddress) {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
out.PortRange = in.PortRange
if in.PortRange != nil {
in, out := &in.PortRange, &out.PortRange
*out = new(NetworkPortRange)
**out = **in
}
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NetworkAddress.

59
pkg/controllers/gameserver/gameserver_manager_test.go
View File

@ -430,7 +430,7 @@ func TestSyncNetworkStatus(t *testing.T) {
gameKruiseV1alpha1.GameServerNetworkType: "xxx-type",
gameKruiseV1alpha1.GameServerNetworkConf: "[{\"name\":\"SlbIds\",\"value\":\"lb-2zev1w12n684h7ymjtpuo\"},{\"name\":\"PortProtocols\",\"value\":\"80\"},{\"name\":\"Fixed\",\"value\":\"true\"}]",
gameKruiseV1alpha1.GameServerNetworkDisabled: "false",
gameKruiseV1alpha1.GameServerNetworkStatus: "{\"internalAddresses\":[{\"ip\":\"172.16.1.132\",\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80}],\"portRange\":{}}],\"externalAddresses\":[{\"ip\":\"47.99.47.99\",\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":601}],\"portRange\":{}}],\"currentNetworkState\":\"Ready\",\"createTime\":null,\"lastTransitionTime\":null}",
gameKruiseV1alpha1.GameServerNetworkStatus: "{\"internalAddresses\":[{\"ip\":\"172.16.1.132\",\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80}]}],\"externalAddresses\":[{\"ip\":\"47.99.47.99\",\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":601}]}],\"currentNetworkState\":\"Ready\",\"createTime\":null,\"lastTransitionTime\":null}",
},
},
},
@ -459,7 +459,7 @@ func TestSyncNetworkStatus(t *testing.T) {
gameKruiseV1alpha1.GameServerNetworkType: "xxx-type",
gameKruiseV1alpha1.GameServerNetworkConf: "[{\"name\":\"SlbIds\",\"value\":\"lb-2zev1w12n684h7ymjtpuo\"},{\"name\":\"PortProtocols\",\"value\":\"80\"},{\"name\":\"Fixed\",\"value\":\"true\"}]",
gameKruiseV1alpha1.GameServerNetworkDisabled: "false",
gameKruiseV1alpha1.GameServerNetworkStatus: "{\"internalAddresses\":[{\"ip\":\"172.16.1.132\",\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80}],\"portRange\":{}}],\"externalAddresses\":[{\"ip\":\"47.99.47.99\",\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":601}],\"portRange\":{}}],\"currentNetworkState\":\"Ready\",\"createTime\":null,\"lastTransitionTime\":null}",
gameKruiseV1alpha1.GameServerNetworkStatus: "{\"internalAddresses\":[{\"ip\":\"172.16.1.132\",\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80}]}],\"externalAddresses\":[{\"ip\":\"47.99.47.99\",\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":601}]}],\"currentNetworkState\":\"Ready\",\"createTime\":null,\"lastTransitionTime\":null}",
},
},
},
@ -495,6 +495,61 @@ func TestSyncNetworkStatus(t *testing.T) {
LastTransitionTime: fakeTime,
},
},
{
gs: &gameKruiseV1alpha1.GameServer{
Status: gameKruiseV1alpha1.GameServerStatus{
NetworkStatus: gameKruiseV1alpha1.NetworkStatus{
NetworkType: "xxx-type",
DesiredNetworkState: gameKruiseV1alpha1.NetworkReady,
CreateTime: fakeTime,
LastTransitionTime: fakeTime,
},
},
},
pod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
gameKruiseV1alpha1.GameServerNetworkType: "xxx-type",
gameKruiseV1alpha1.GameServerNetworkConf: "[{\"name\":\"SlbIds\",\"value\":\"lb-2zev1w12n684h7ymjtpuo\"},{\"name\":\"PortProtocols\",\"value\":\"80\"},{\"name\":\"Fixed\",\"value\":\"true\"}]",
gameKruiseV1alpha1.GameServerNetworkDisabled: "false",
gameKruiseV1alpha1.GameServerNetworkStatus: "{\"internalAddresses\":[{\"ip\":\"172.16.1.132\",\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80}],\"portRange\":{}}],\"externalAddresses\":[{\"ip\":\"47.99.47.99\",\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":601}],\"portRange\":{}}],\"currentNetworkState\":\"Ready\",\"createTime\":null,\"lastTransitionTime\":null}"},
},
},
gsNetworkStatus: gameKruiseV1alpha1.NetworkStatus{
NetworkType: "xxx-type",
CurrentNetworkState: gameKruiseV1alpha1.NetworkReady,
DesiredNetworkState: gameKruiseV1alpha1.NetworkReady,
InternalAddresses: []gameKruiseV1alpha1.NetworkAddress{
{
IP: "172.16.1.132",
Ports: []gameKruiseV1alpha1.NetworkPort{
{
Name: "80",
Protocol: "TCP",
Port: &portInternal,
},
},
PortRange: &gameKruiseV1alpha1.NetworkPortRange{},
},
},
ExternalAddresses: []gameKruiseV1alpha1.NetworkAddress{
{
IP: "47.99.47.99",
Ports: []gameKruiseV1alpha1.NetworkPort{
{
Name: "80",
Protocol: "TCP",
Port: &portExternal,
},
},
PortRange: &gameKruiseV1alpha1.NetworkPortRange{},
},
},
CreateTime: fakeTime,
LastTransitionTime: fakeTime,
},
},
}
for _, test := range tests {