Skip to content

Commit a122ebf

Browse files
authored
Merge branch 'project-codeflare:main' into olm-upgrade-e2e-184
2 parents 851164e + 9b2d77c commit a122ebf

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

.github/workflows/tag-and-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ jobs:
8585

8686
- name: Adjust Compatibility Matrix in readme
8787
run: |
88-
sed -i -E "s/(.*CodeFlare Operator.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)/\1${{ github.event.inputs.version }}\2/" README.md
89-
sed -i -E "s/(.*Multi-Cluster App Dispatcher.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)/\1${{ github.event.inputs.mcad-version }}\2/" README.md
90-
sed -i -E "s/(.*CodeFlare-SDK.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)/\1${{ github.event.inputs.codeflare-sdk-version }}\2/" README.md
91-
sed -i -E "s/(.*InstaScale.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)/\1${{ github.event.inputs.instascale-version }}\2/" README.md
88+
sed -i -E "s/(.*CodeFlare Operator.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)/\1${{ github.event.inputs.version }}\2${{ github.event.inputs.version }}\3/" README.md
89+
sed -i -E "s/(.*Multi-Cluster App Dispatcher.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)/\1${{ github.event.inputs.mcad-version }}\2${{ github.event.inputs.mcad-version }}\3/" README.md
90+
sed -i -E "s/(.*CodeFlare-SDK.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)/\1${{ github.event.inputs.codeflare-sdk-version }}\2${{ github.event.inputs.codeflare-sdk-version }}\3/" README.md
91+
sed -i -E "s/(.*InstaScale.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)v[0-9]+\.[0-9]+\.[0-9]+(.*)/\1${{ github.event.inputs.instascale-version }}\2${{ github.event.inputs.instascale-version }}\3/" README.md
9292
9393
- name: Adjust MCAD, SDK and InstaScale dependencies in the code
9494
run: |

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The MCAD and InstaScale custom resources are defined under the `api` dir:
1818
- See `mcad_types.go` and `instascale_types.go`
1919

2020
The MCAD and InstaScale resource templates can be found under `config/internal`:
21-
- Sorted under `mcad` and `insascale` subdirs
21+
- Sorted under `mcad` and `instascale` subdirs
2222

2323
The code for MCAD/InstaScale resource reconcilliation can be found in the `controllers` dir:
2424
- See `mcad_controller.go` and `instascale_controller.go`

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ MCAD_REPO ?= github.com/project-codeflare/multi-cluster-app-dispatcher
2424
MCAD_CRD ?= ${MCAD_REPO}/config/crd?ref=${MCAD_VERSION}
2525

2626
# KUBERAY_VERSION defines the default version of the KubeRay operator (used for testing)
27-
KUBERAY_VERSION ?= v0.5.0
27+
KUBERAY_VERSION ?= v0.6.0
2828

2929
# RAY_VERSION defines the default version of Ray (used for testing)
3030
RAY_VERSION ?= 2.5.0

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ Operator for installation and lifecycle management of CodeFlare distributed work
66
<!-- Compatibility Matrix start -->
77
CodeFlare Stack Compatibility Matrix
88

9-
| Component | Version |
10-
|------------------------------|---------|
11-
| CodeFlare Operator | v0.2.3 |
12-
| Multi-Cluster App Dispatcher | v1.34.1 |
13-
| CodeFlare-SDK | v0.7.1 |
14-
| InstaScale | v0.0.8 |
15-
| KubeRay | v0.5.0 |
9+
| Component | Version |
10+
|------------------------------|---------------------------------------------------------------------------------------------------|
11+
| CodeFlare Operator | [v0.2.3](https://github.com/project-codeflare/codeflare-operator/releases/tag/v0.2.3) |
12+
| Multi-Cluster App Dispatcher | [v1.34.1](https://github.com/project-codeflare/multi-cluster-app-dispatcher/releases/tag/v1.34.1) |
13+
| CodeFlare-SDK | [v0.7.1](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.7.1) |
14+
| InstaScale | [v0.0.8](https://github.com/project-codeflare/instascale/releases/tag/v0.0.8) |
15+
| KubeRay | [v0.5.0](https://github.com/ray-project/kuberay/releases/tag/v0.5.0) |
1616
<!-- Compatibility Matrix end -->
1717

1818
## Development

0 commit comments

Comments
 (0)