Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Guido van der Hart committed Oct 24, 2023
1 parent 7c60451 commit 60d7d5b
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions testenv/osccluster_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ var _ = Describe("Outscale Cluster Reconciler", func() {
}
osc_subregion, ok := os.LookupEnv("OSC_SUBREGION_NAME")
if !ok {
osc_subregion = "eu-west-2"
osc_subregion = osc_region + "a"
}
infraClusterSpec := infrastructurev1beta1.OscClusterSpec{

Expand Down Expand Up @@ -791,7 +791,7 @@ var _ = Describe("Outscale Cluster Reconciler", func() {
}
osc_subregion, ok := os.LookupEnv("OSC_SUBREGION_NAME")
if !ok {
osc_subregion = "eu-west-2"
osc_subregion = osc_region + "a"
}
infraClusterSpec := infrastructurev1beta1.OscClusterSpec{
Network: infrastructurev1beta1.OscNetwork{
Expand Down Expand Up @@ -895,6 +895,10 @@ var _ = Describe("Outscale Cluster Reconciler", func() {
if !ok {
osc_region = "eu-west-2"
}
osc_subregion, ok := os.LookupEnv("OSC_SUBREGION_NAME")
if !ok {
osc_subregion = osc_region + "a"
}
infraClusterSpec := infrastructurev1beta1.OscClusterSpec{
Network: infrastructurev1beta1.OscNetwork{
Net: infrastructurev1beta1.OscNet{
Expand All @@ -914,6 +918,10 @@ var _ = Describe("Outscale Cluster Reconciler", func() {
if !ok {
osc_region = "eu-west-2"
}
osc_subregion, ok := os.LookupEnv("OSC_SUBREGION_NAME")
if !ok {
osc_subregion = osc_region + "a"
}
imageId, ok := os.LookupEnv("IMG_UPGRADE_FROM")
if !ok {
imageId = "ami-e1a786f1"
Expand All @@ -928,14 +936,17 @@ var _ = Describe("Outscale Cluster Reconciler", func() {
{
Name: "cluster-api-subnet-kcp",
IpSubnetRange: "10.0.4.0/24",
SubregionName: osc_subregion,
},
{
Name: "cluster-api-subnet-kw",
IpSubnetRange: "10.0.3.0/24",
SubregionName: osc_subregion,
},
{
Name: "cluster-api-subnet-public",
IpSubnetRange: "10.0.2.0/24",
SubregionName: osc_subregion,
},
},
InternetService: infrastructurev1beta1.OscInternetService{
Expand Down

0 comments on commit 60d7d5b

Please sign in to comment.