From 626c802fe802fa0edb01896c8daf4254e8f07647 Mon Sep 17 00:00:00 2001 From: batistein Date: Sat, 4 Jun 2022 20:18:01 +0200 Subject: [PATCH] :seedling: Fixing caph upgrade --- test/e2e/config/hetzner-ci.yaml | 12 ++++++------ test/e2e/config/hetzner-talos.yaml | 2 +- test/e2e/config/hetzner.yaml | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/e2e/config/hetzner-ci.yaml b/test/e2e/config/hetzner-ci.yaml index 22482f825..6acc5ec85 100644 --- a/test/e2e/config/hetzner-ci.yaml +++ b/test/e2e/config/hetzner-ci.yaml @@ -63,8 +63,8 @@ providers: - name: hetzner type: InfrastructureProvider versions: - - name: ${CAPH_LATEST_VERSION:-v1.0.0-alpha.18} # latest published release - value: https://github.com/syself/cluster-api-provider-hetzner/releases/download/${CAPH_LATEST_VERSION:-v1.0.0-alpha.18}/infrastructure-components.yaml + - name: ${CAPH_LATEST_VERSION:-} # latest published release + value: https://github.com/syself/cluster-api-provider-hetzner/releases/download/${CAPH_LATEST_VERSION:-}/infrastructure-components.yaml type: "url" contract: v1beta1 files: @@ -115,10 +115,10 @@ variables: # NOTE: INIT_WITH_BINARY and INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize # the management cluster to be upgraded. - INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/clusterctl-linux-amd64" + INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/clusterctl-linux-amd64" INIT_WITH_PROVIDERS_CONTRACT: "v1beta1" INIT_WITH_KUBERNETES_VERSION: "v1.24.1" - INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-v1.0.0-alpha.18} + INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-} # Cluster Addons CNI: "./data/cni/cilium/cilium.yaml" @@ -146,9 +146,9 @@ variables: REDACT_LOG_SCRIPT: "../../hack/log/redact.sh" intervals: - default/wait-cluster: ["15m", "10s"] + default/wait-cluster: ["20m", "10s"] default/wait-control-plane: ["30m", "10s"] - default/wait-worker-nodes: ["20m", "10s"] + default/wait-worker-nodes: ["15m", "10s"] default/wait-controllers: ["5m", "10s"] default/wait-delete-cluster: ["20m", "10s"] default/wait-machine-upgrade: ["20m", "10s"] diff --git a/test/e2e/config/hetzner-talos.yaml b/test/e2e/config/hetzner-talos.yaml index 5d0f52201..b24b61aca 100644 --- a/test/e2e/config/hetzner-talos.yaml +++ b/test/e2e/config/hetzner-talos.yaml @@ -95,7 +95,7 @@ variables: INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/clusterctl-linux-amd64" INIT_WITH_PROVIDERS_CONTRACT: "v1beta1" INIT_WITH_KUBERNETES_VERSION: "v1.23.6" - INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-v1.0.0-alpha.18} + INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-} # Cluster Addons CNI: "./data/cni/cilium/cilium.yaml" diff --git a/test/e2e/config/hetzner.yaml b/test/e2e/config/hetzner.yaml index a4ee53fcc..1c877c46d 100644 --- a/test/e2e/config/hetzner.yaml +++ b/test/e2e/config/hetzner.yaml @@ -63,8 +63,8 @@ providers: - name: hetzner type: InfrastructureProvider versions: - - name: ${CAPH_LATEST_VERSION:-v1.0.0-alpha.18} # latest published release - value: https://github.com/syself/cluster-api-provider-hetzner/releases/download/${CAPH_LATEST_VERSION:-v1.0.0-alpha.18}/infrastructure-components.yaml + - name: ${CAPH_LATEST_VERSION:-} # latest published release + value: https://github.com/syself/cluster-api-provider-hetzner/releases/download/${CAPH_LATEST_VERSION:-}/infrastructure-components.yaml type: "url" contract: v1beta1 files: @@ -124,7 +124,7 @@ variables: INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/clusterctl-linux-amd64" INIT_WITH_PROVIDERS_CONTRACT: "v1beta1" INIT_WITH_KUBERNETES_VERSION: "v1.24.1" - INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-v1.0.0-alpha.18} + INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-} # Cluster Addons CNI: "./data/cni/cilium/cilium.yaml" @@ -152,9 +152,9 @@ variables: REDACT_LOG_SCRIPT: "../../hack/log/redact.sh" intervals: - default/wait-cluster: ["15m", "10s"] + default/wait-cluster: ["20m", "10s"] default/wait-control-plane: ["30m", "10s"] - default/wait-worker-nodes: ["20m", "10s"] + default/wait-worker-nodes: ["15m", "10s"] default/wait-controllers: ["5m", "10s"] default/wait-delete-cluster: ["20m", "10s"] default/wait-machine-upgrade: ["20m", "10s"]