Skip to content

Commit

Permalink
Merge pull request #25 from mallardduck/wip/update-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
mallardduck authored Jan 7, 2025
2 parents 119fe3c + 7bba335 commit ce19798
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ This repo produces a Rancher specific version of the `flavio/kuberlr` image.
- Each release pre-bundles all necessary [kubectl](https://github.com/rancher/kubectl) versions supported by the Rancher version the release supports.

## Branches, Releases, and Rancher
| Branch | Release Tag | Rancher Tag (Branch) |
|---------------------|---------------|----------------------|
| main (release/v3.x) | head (v3.Y.Z) | 2.10.Z (main) |
| release/v2.x | v2.Y.Z | 2.9.Z (release/v2.9) |
| release/v1.x | v1.Y.Z | 2.8.Z (release/v2.8) |
| Branch | Release Tag | Rancher Tag (Branch) |
|---------------------|---------------|------------------------|
| main (release/v4.x) | head (v4.Y.Z) | 2.11.Z (main) |
| release/v3.x | v3.Y.Z | 2.10.Z (release/v2.10) |
| release/v2.x | v2.Y.Z | 2.9.Z (release/v2.9) |
| release/v1.x | v1.Y.Z | 2.8.Z (release/v2.8) |

### Notes:
- Each minor Rancher release will get a `rancher/kuberlr-kubectl` branch:
Expand Down
2 changes: 1 addition & 1 deletion hack/make/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ MACHINE := rancher
# Define the target platforms that can be used across the ecosystem.
# Note that what would actually be used for a given project will be
# defined in TARGET_PLATFORMS, and must be a subset of the below:
DEFAULT_PLATFORMS := linux/amd64,linux/arm64,linux/x390s,linux/riscv64
DEFAULT_PLATFORMS := linux/amd64,linux/arm64

.PHONY: help
help: ## display Makefile's help.
Expand Down

0 comments on commit ce19798

Please sign in to comment.