Merge pull request #2958 from chrischdi/pr-drop-v1-6

🌱 Drop test coverage for release-1.6 and update README.md
kubernetes-sigs · May 6, 2024 · 1cd179f · 1cd179f
2 parents e2d3d1d + cda0feb
commit 1cd179f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/weekly-md-link-check.yaml b/.github/workflows/weekly-md-link-check.yaml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ main, release-1.10, release-1.9, release-1.8, release-1.7, release-1.6 ]
+        branch: [ main, release-1.10, release-1.9, release-1.8, release-1.7 ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4

diff --git a/.github/workflows/weekly-security-scan.yaml b/.github/workflows/weekly-security-scan.yaml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ main, release-1.10, release-1.9, release-1.8, release-1.7, release-1.6 ]
+        branch: [ main, release-1.10, release-1.9, release-1.8, release-1.7 ]
     name: Trivy
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/weekly-test-release.yaml b/.github/workflows/weekly-test-release.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ main, release-1.10, release-1.9, release-1.8, release-1.7, release-1.6 ]
+        branch: [ main, release-1.10, release-1.9, release-1.8, release-1.7 ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4

diff --git a/README.md b/README.md
@@ -33,13 +33,14 @@ Check out the [getting started guide](./docs/getting_started.md) for launching a
 
 This provider's versions are compatible with the following versions of Cluster API:
 
-|                     | Cluster API v1beta1 (v1.3) | Cluster API v1beta1 (v1.4) | Cluster API v1beta1 (v1.5) | Cluster API v1beta1 (v1.6) |
-|---------------------|:--------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|
-| CAPV v1beta1 (v1.5) |             ✓              |             ✓              |             ☓              |             ☓              |
-| CAPV v1beta1 (v1.6) |             ✓              |             ✓              |             ☓              |             ☓              |
-| CAPV v1beta1 (v1.7) |             ✓              |             ✓              |             ☓              |             ☓              |
-| CAPV v1beta1 (v1.8) |             ☓              |             ☓              |             ✓              |             ☓              |
-| CAPV v1beta1 (v1.9) |             ☓              |             ☓              |             ☓              |             ✓              |
+|                      | Cluster API v1beta1 (v1.4) | Cluster API v1beta1 (v1.5) | Cluster API v1beta1 (v1.6) | Cluster API v1beta1 (v1.7) |
+|----------------------|:--------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|
+| CAPV v1beta1 (v1.5)  |             ✓              |             ☓              |             ☓              |             ☓              |
+| CAPV v1beta1 (v1.6)  |             ✓              |             ☓              |             ☓              |             ☓              |
+| CAPV v1beta1 (v1.7)  |             ✓              |             ☓              |             ☓              |             ☓              |
+| CAPV v1beta1 (v1.8)  |             ☓              |             ✓              |             ☓              |             ☓              |
+| CAPV v1beta1 (v1.9)  |             ☓              |             ☓              |             ✓              |             x              |
+| CAPV v1beta1 (v1.10) |             ☓              |             ☓              |             x              |             ✓              |
 
 As CAPV doesn't dictate supported K8s versions, and it supports whatever CAPI supported, about the provider's compatibility with K8s versions, please refer
 to [CAPI Supported Kubernetes Versions](https://cluster-api.sigs.k8s.io/reference/versions.html).
@@ -59,7 +60,7 @@ Basically:
 versions for distribution packages and patch version for the Kubernetes version you wish to run. For
 production-like environments, it is highly recommended to build and use your own custom images.
 
-**Note:** We recently moved the OVAs from the community GCP project (https://storage.googleapis.com/capv-templates/) to [Github releases](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases). Going forward new OVAs will only be uploaded to a dedicated Github release with the name `templates/<Kubernetes Version>`.
+**Note:** We recently moved the OVAs from the community GCP project to [Github releases](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases). Going forward new OVAs will only be uploaded to a dedicated Github release with the name `templates/<Kubernetes Version>`.
 
 **Note:** Big OVAs will be split into multiple parts. To use them please download all parts and use `cat part1 part2 part3 > out.ova` to join them again.