Merge pull request #709 from bunkerity/staging

Merge branch "staging" into branch "dev"

examples/magento/kubernetes.yml

@@ -15,7 +15,7 @@ spec:
               service:
                 name: magento
                 port:
-                  number: 8080
+                  number: 80
 ---
 apiVersion: v1
 kind: ConfigMap

tests/terraform/k8s.tf

@@ -4,15 +4,19 @@ variable "k8s_ip" {
   nullable = false
   sensitive = true
 }
-
+# Create cicd_bw_k8s private network
+resource "scaleway_vpc_private_network" "pn" {
+    name = "cicd_bw_k8s"
+}
 # Create k8s cluster
 resource "scaleway_k8s_cluster" "cluster" {
   type = "kapsule"
   name = "bw_k8s"
   version = "1.24.7"
   cni = "cilium"
+  private_network_id = scaleway_vpc_private_network.pn.id
+  delete_additional_resources = false
 }
-
 # Create k8s pool
 resource "scaleway_k8s_pool" "pool" {
   cluster_id = scaleway_k8s_cluster.cluster.id
@@ -21,7 +25,6 @@ resource "scaleway_k8s_pool" "pool" {
   size = 3
   wait_for_pool_ready = true
 }
-
 # Get kubeconfig file
 resource "local_sensitive_file" "kubeconfig" {
   depends_on = [scaleway_k8s_pool.pool]
@@ -31,7 +34,6 @@ resource "local_sensitive_file" "kubeconfig" {
 provider "kubectl" {
   config_path = "${local_sensitive_file.kubeconfig.filename}"
 }
-
 # Setup LB
 resource "local_sensitive_file" "lb_yml" {
   depends_on = [local_sensitive_file.kubeconfig]

tests/terraform/providers.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     scaleway = {
       source = "scaleway/scaleway"
-      version = "2.5.0"
+      version = "2.30.0"
     }
     kubectl = {
       source = "gavinbunney/kubectl"

tests/ui/main.py

@@ -130,7 +130,8 @@ def access_page(
     *,
     retries: int = 0,
 ):
-    assert_button_click(driver, button)
+    if retries == 0:
+        assert_button_click(driver, button)
 
     try:
         title = driver_wait.until(EC.presence_of_element_located((By.XPATH, "/html/body/div/header/div/nav/h6")))
@@ -139,7 +140,7 @@ def access_page(
             print(f"Didn't get redirected to {name} page, exiting ...", flush=True)
             exit(1)
     except TimeoutException:
-        if retries < 3 and driver.current_url.split("/")[-1].startswith("/loading"):
+        if retries < 3 and "/loading" in driver.current_url:
             sleep(2)
             access_page(driver, driver_wait, button, name, message, retries=retries + 1)