Merge pull request #1086 from syself/tg/pre-release

🌱 Pre-Release. Update docs and versions.
syself · Dec 11, 2023 · 0580f32 · 0580f32
2 parents 557f2ca + 53442d2
commit 0580f32
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/actions/e2e/action.yaml b/.github/actions/e2e/action.yaml
@@ -41,7 +41,7 @@ runs:
     - name: Install hcloud
       shell: bash
       env:
-        hcloudctl_version: 1.31.1
+        hcloudctl_version: 1.40.0
       run: curl -fsSL https://github.com/hetznercloud/cli/releases/download/v${{ env.hcloudctl_version }}/hcloud-linux-amd64.tar.gz | tar -xzv hcloud ; mv hcloud hack/tools/bin/hcloud
 
     - name: Generate metadata
@@ -77,7 +77,7 @@ runs:
         HETZNER_SSH_PUB: ${{ inputs.e2e_ssh_pub }}
         HETZNER_SSH_PRIV: ${{ inputs.e2e_ssh_priv }}
         SKIP_IMAGE_BUILD: "1"
-        CAPH_LATEST_VERSION: "v1.0.0-beta.22"
+        CAPH_LATEST_VERSION: "v1.0.0-beta.26"
       run: make ${{ inputs.e2e_make_target }}
     - name: Upload artifact
       uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3

diff --git a/README.md b/README.md
@@ -98,15 +98,15 @@ In addition to the pure creation and operation of Kubernetes clusters, this prov
 
 This provider's versions are compatible with the following versions of Cluster API:
 
-|  | Cluster API `v1beta1` (`v1.0.x`) | Cluster API `v1beta1` (`v1.1.x`)  | Cluster API `v1beta1` (`v1.2.x`) | Cluster API `v1beta1` (`v1.3.x`) | Cluster API `v1beta1` (`v1.4.x`) | Cluster API `v1beta1` (`v1.5.x`) |
-|---|---|---|---|---|---|---|
-|Hetzner Provider `v1.0.x` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
+|  | Cluster API `v1beta1` (`v1.5.x`) | Cluster API `v1beta1` (`v1.6.x`) |
+|---|---|---|
+|Hetzner Provider `v1.0.0-beta.26` | ✓ | ☓ |
+|Hetzner Provider `v1.0.0-beta.27` | ☓ | ✓ |
 
 This provider's versions can install and manage the following versions of Kubernetes:
 
 |  | Hetzner Provider `v1.0.x` |
 |---|---|
-| Kubernetes 1.22.x | + |
 | Kubernetes 1.23.x | ✓ |
 | Kubernetes 1.24.x | ✓ |
 | Kubernetes 1.25.x | ✓ |

diff --git a/test/e2e/config/hetzner-ci.yaml b/test/e2e/config/hetzner-ci.yaml
@@ -114,13 +114,13 @@ variables:
   WORKERS_MACHINE_TEMPLATE_UPGRADE_TO: "k8s-upgrade-worker"
   KUBERNETES_IMAGE_UPGRADE_FROM: ${KUBERNETES_IMAGE_UPGRADE_FROM:-}
   KUBERNETES_IMAGE_UPGRADE_TO: ${KUBERNETES_IMAGE_UPGRADE_TO:-}
-  ETCD_VERSION_UPGRADE_TO: "3.5.3-0"
-  COREDNS_VERSION_UPGRADE_TO: "v1.8.6"
+  ETCD_VERSION_UPGRADE_TO: "3.5.9-0"
+  COREDNS_VERSION_UPGRADE_TO: "v1.10.1"
   IP_FAMILY: "IPv4"
 
   # 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.6.0/clusterctl-linux-amd64"
   INIT_WITH_PROVIDERS_CONTRACT: "v1beta1"
   INIT_WITH_KUBERNETES_VERSION: "v1.28.4"
   INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-}

diff --git a/test/e2e/config/hetzner.yaml b/test/e2e/config/hetzner.yaml
@@ -112,21 +112,21 @@ providers:
 
 variables:
   # Upgrade Test
-  KUBERNETES_VERSION_MANAGEMENT: "v1.27.3"
-  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.27.3}"
-  KUBERNETES_VERSION_UPGRADE_FROM: "v1.26.0"
-  KUBERNETES_VERSION_UPGRADE_TO: "v1.27.3"
+  KUBERNETES_VERSION_MANAGEMENT: "v1.28.4"
+  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.28.4}"
+  KUBERNETES_VERSION_UPGRADE_FROM: "v1.27.8"
+  KUBERNETES_VERSION_UPGRADE_TO: "v1.28.4"
   CONTROL_PLANE_MACHINE_TEMPLATE_UPGRADE_TO: "k8s-upgrade-control-plane"
   WORKERS_MACHINE_TEMPLATE_UPGRADE_TO: "k8s-upgrade-worker"
   KUBERNETES_IMAGE_UPGRADE_FROM: ${KUBERNETES_IMAGE_UPGRADE_FROM:-}
   KUBERNETES_IMAGE_UPGRADE_TO: ${KUBERNETES_IMAGE_UPGRADE_TO:-}
-  ETCD_VERSION_UPGRADE_TO: "3.5.3-0"
-  COREDNS_VERSION_UPGRADE_TO: "v1.8.6"
+  ETCD_VERSION_UPGRADE_TO: "3.5.9-0"
+  COREDNS_VERSION_UPGRADE_TO: "v1.10.1"
   IP_FAMILY: "IPv4"
 
   # 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.6.0/clusterctl-linux-amd64"
   INIT_WITH_PROVIDERS_CONTRACT: "v1beta1"
   INIT_WITH_KUBERNETES_VERSION: "v1.28.4"
   INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-}