Skip to content

Commit f4ede02

Browse files
authored
fix(redis): add default public endpoint when no endpoints specified (scaleway#5085)
1 parent d30cd72 commit f4ede02

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

internal/namespaces/redis/v1/custom_cluster.go

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,24 +68,33 @@ func clusterCreateBuilder(c *core.Command) *core.Command {
6868
customRequest := argsI.(*redisCreateClusterRequestCustom)
6969
createClusterRequest := customRequest.CreateClusterRequest
7070

71-
for _, customEndpoint := range customRequest.Endpoints {
72-
if customEndpoint.PrivateNetwork == nil {
73-
continue
74-
}
75-
var ipamConfig *redis.EndpointSpecPrivateNetworkSpecIpamConfig
76-
if customEndpoint.PrivateNetwork.EnableIpam {
77-
ipamConfig = &redis.EndpointSpecPrivateNetworkSpecIpamConfig{}
78-
}
71+
if len(customRequest.Endpoints) == 0 {
7972
createClusterRequest.Endpoints = append(
8073
createClusterRequest.Endpoints,
8174
&redis.EndpointSpec{
82-
PrivateNetwork: &redis.EndpointSpecPrivateNetworkSpec{
83-
ID: customEndpoint.PrivateNetwork.ID,
84-
ServiceIPs: customEndpoint.PrivateNetwork.ServiceIPs,
85-
IpamConfig: ipamConfig,
86-
},
75+
PublicNetwork: &redis.EndpointSpecPublicNetworkSpec{},
8776
},
8877
)
78+
} else {
79+
for _, customEndpoint := range customRequest.Endpoints {
80+
if customEndpoint.PrivateNetwork == nil {
81+
continue
82+
}
83+
var ipamConfig *redis.EndpointSpecPrivateNetworkSpecIpamConfig
84+
if customEndpoint.PrivateNetwork.EnableIpam {
85+
ipamConfig = &redis.EndpointSpecPrivateNetworkSpecIpamConfig{}
86+
}
87+
createClusterRequest.Endpoints = append(
88+
createClusterRequest.Endpoints,
89+
&redis.EndpointSpec{
90+
PrivateNetwork: &redis.EndpointSpecPrivateNetworkSpec{
91+
ID: customEndpoint.PrivateNetwork.ID,
92+
ServiceIPs: customEndpoint.PrivateNetwork.ServiceIPs,
93+
IpamConfig: ipamConfig,
94+
},
95+
},
96+
)
97+
}
8998
}
9099

91100
cluster, err := api.CreateCluster(createClusterRequest)

0 commit comments

Comments
 (0)