Skip to content

Commit 7caf1a9

Browse files
authored
feat(k8s): add support for traefik2 ingress (#524)
1 parent f9f09c9 commit 7caf1a9

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

scaleway/resource_k8s_cluster_beta.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ func resourceScalewayK8SClusterBeta() *schema.Resource {
6363
ValidateFunc: validation.StringInSlice([]string{
6464
k8s.IngressNone.String(),
6565
k8s.IngressTraefik.String(),
66+
k8s.IngressTraefik2.String(),
6667
k8s.IngressNginx.String(),
6768
}, false),
6869
},

scaleway/resource_k8s_cluster_beta_test.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,26 @@ func TestAccScalewayK8SClusterIngressDashboard(t *testing.T) {
208208
resource.TestCheckResourceAttr("scaleway_k8s_cluster_beta.ingressdashboard", "tags.2", "ingressdashboard"),
209209
),
210210
},
211+
{
212+
Config: testAccCheckScalewayK8SClusterBetaConfigIngressDashboard(latestK8SVersion, "traefik2", true),
213+
Check: resource.ComposeTestCheckFunc(
214+
testAccCheckScalewayK8SClusterBetaExists("scaleway_k8s_cluster_beta.ingressdashboard"),
215+
resource.TestCheckResourceAttr("scaleway_k8s_cluster_beta.ingressdashboard", "version", latestK8SVersion),
216+
resource.TestCheckResourceAttr("scaleway_k8s_cluster_beta.ingressdashboard", "cni", "calico"),
217+
resource.TestCheckResourceAttr("scaleway_k8s_cluster_beta.ingressdashboard", "ingress", "traefik2"),
218+
resource.TestCheckResourceAttr("scaleway_k8s_cluster_beta.ingressdashboard", "enable_dashboard", "true"),
219+
resource.TestCheckResourceAttr("scaleway_k8s_cluster_beta.ingressdashboard", "status", k8s.ClusterStatusPoolRequired.String()),
220+
resource.TestCheckResourceAttrSet("scaleway_k8s_cluster_beta.ingressdashboard", "kubeconfig.0.config_file"),
221+
resource.TestCheckResourceAttrSet("scaleway_k8s_cluster_beta.ingressdashboard", "kubeconfig.0.host"),
222+
resource.TestCheckResourceAttrSet("scaleway_k8s_cluster_beta.ingressdashboard", "kubeconfig.0.cluster_ca_certificate"),
223+
resource.TestCheckResourceAttrSet("scaleway_k8s_cluster_beta.ingressdashboard", "kubeconfig.0.token"),
224+
resource.TestCheckResourceAttrSet("scaleway_k8s_cluster_beta.ingressdashboard", "apiserver_url"),
225+
resource.TestCheckResourceAttrSet("scaleway_k8s_cluster_beta.ingressdashboard", "wildcard_dns"),
226+
resource.TestCheckResourceAttr("scaleway_k8s_cluster_beta.ingressdashboard", "tags.0", "terraform-test"),
227+
resource.TestCheckResourceAttr("scaleway_k8s_cluster_beta.ingressdashboard", "tags.1", "scaleway_k8s_cluster_beta"),
228+
resource.TestCheckResourceAttr("scaleway_k8s_cluster_beta.ingressdashboard", "tags.2", "ingressdashboard"),
229+
),
230+
},
211231
},
212232
})
213233
}

0 commit comments

Comments
 (0)