Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with Upstream #20

Merged
merged 7 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/workflows/auto-add-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,6 @@ on:
types:
- opened
jobs:
add_label:
name: Add needs-triage label to new issues
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- uses: actions/checkout@v3
- run: gh issue edit ${{ github.event.issue.number }} --add-label "triage/needs-triage"
env:
GH_TOKEN: ${{ github.token }}

add-to-project:
name: Add issue to project
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ jobs:
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Update dependency versions for release ${{ github.event.inputs.version }}
file_pattern: 'README.md */defaults.go *.yaml Makefile go.mod go.sum'
file_pattern: 'README.md *.yaml Makefile go.mod go.sum'
create_branch: true
branch: ${{ env.PR_BRANCH_NAME }}

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ VERSION ?= v0.0.0-dev
BUNDLE_VERSION ?= $(VERSION:v%=%)

# INSTASCALE_VERSION defines the default version of the InstaScale controller
INSTASCALE_VERSION ?= v0.2.1
INSTASCALE_VERSION ?= v0.3.0
INSTASCALE_REPO ?= github.com/project-codeflare/instascale

# MCAD_VERSION defines the default version of the MCAD controller
MCAD_VERSION ?= v1.37.1
MCAD_VERSION ?= v1.38.0
MCAD_REPO ?= github.com/project-codeflare/multi-cluster-app-dispatcher
# Upstream MCAD is currently only creating release tags of the form `vX.Y.Z` (i.e the version)
MCAD_CRD ?= ${MCAD_REPO}/config/crd?ref=${MCAD_VERSION}
Expand Down Expand Up @@ -142,7 +142,7 @@ vet: ## Run go vet against code.
modules: ## Update Go dependencies.
go get $(MCAD_REPO)@$(MCAD_VERSION)
go get $(INSTASCALE_REPO)@$(INSTASCALE_VERSION)
go get github.com/ray-project/kuberay/ray-operator
go get github.com/ray-project/kuberay/ray-operator@$(KUBERAY_VERSION)
go mod tidy

.PHONY: build
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ CodeFlare Stack Compatibility Matrix

| Component | Version |
|------------------------------|---------------------------------------------------------------------------------------------------|
| CodeFlare Operator | [v1.0.0-rc.4](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.0.0-rc.4) |
| Multi-Cluster App Dispatcher | [v1.37.1](https://github.com/project-codeflare/multi-cluster-app-dispatcher/releases/tag/v1.37.1) |
| CodeFlare-SDK | [v0.10.1](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.10.1) |
| InstaScale | [v0.2.1](https://github.com/project-codeflare/instascale/releases/tag/v0.2.1) |
| CodeFlare Operator | [v1.0.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.0.0) |
| Multi-Cluster App Dispatcher | [v1.38.0](https://github.com/project-codeflare/multi-cluster-app-dispatcher/releases/tag/v1.38.0) |
| CodeFlare-SDK | [v0.11.0](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.11.0) |
| InstaScale | [v0.3.0](https://github.com/project-codeflare/instascale/releases/tag/v0.3.0) |
| KubeRay | [v0.5.0](https://github.com/ray-project/kuberay/releases/tag/v0.5.0) |
<!-- Compatibility Matrix end -->

Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ require (
github.com/onsi/gomega v1.27.10
github.com/openshift/api v0.0.0-20230213134911-7ba313770556
github.com/project-codeflare/codeflare-common v0.0.0-20231023092720-93d03492db16
github.com/project-codeflare/instascale v0.2.1
github.com/project-codeflare/multi-cluster-app-dispatcher v1.37.1
github.com/ray-project/kuberay/ray-operator v0.0.0-20231016183545-097828931d15
github.com/project-codeflare/instascale v0.3.0
github.com/project-codeflare/multi-cluster-app-dispatcher v1.38.0
github.com/ray-project/kuberay/ray-operator v1.0.0-rc.1
go.uber.org/zap v1.26.0
k8s.io/api v0.26.3
k8s.io/apimachinery v0.26.3
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/project-codeflare/codeflare-common v0.0.0-20231023092720-93d03492db16 h1:TRMLDP6IYt0CAd3+BkvY/r2lkpjI3sOsxf3tnQojZ9k=
github.com/project-codeflare/codeflare-common v0.0.0-20231023092720-93d03492db16/go.mod h1:zdi2GCYJX+QyxFWyCLMoTme3NMz/aucWDJWMqKfigxk=
github.com/project-codeflare/instascale v0.2.1 h1:t+Ax/sk4yPQznO6N+U8Cq+bk3afCcZDj9wnHfiGSDBg=
github.com/project-codeflare/instascale v0.2.1/go.mod h1:zSzBTP4cFkg+bD4JyYTDmDnGwVKY/+6ACks57NAiscc=
github.com/project-codeflare/multi-cluster-app-dispatcher v1.37.1 h1:hZhGwKTPeHYYhNbvO27NOjozVpy7m3I3apKf81u9U3A=
github.com/project-codeflare/multi-cluster-app-dispatcher v1.37.1/go.mod h1:Yge6GRNpO9YIDfeL+XOcCE9xbmfCTD5C1h5dlW87mxQ=
github.com/project-codeflare/instascale v0.3.0 h1:PSlwbqqUsFTkTQ5KUhMFRebfokySnEZwav97xZixLQs=
github.com/project-codeflare/instascale v0.3.0/go.mod h1:IU1Wl+zqTpMpZ49BOcr6U+A6gF3AjcmFdKo9ZwP3TDI=
github.com/project-codeflare/multi-cluster-app-dispatcher v1.38.0 h1:dU2Ev0SijdNm30Y9mjdKJL1Fp6l07rnRBKhSbx1kX9g=
github.com/project-codeflare/multi-cluster-app-dispatcher v1.38.0/go.mod h1:Yge6GRNpO9YIDfeL+XOcCE9xbmfCTD5C1h5dlW87mxQ=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
Expand Down Expand Up @@ -424,8 +424,8 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
github.com/ray-project/kuberay/ray-operator v0.0.0-20231016183545-097828931d15 h1:s+/WzpqoFot/fgo1uq7BLgeiOy3HZuT+UVtCb3h7R+I=
github.com/ray-project/kuberay/ray-operator v0.0.0-20231016183545-097828931d15/go.mod h1:NDvscwYbeLSh+Cfc2UTeyPWODtNKPCsPjD/2kg3ZXPw=
github.com/ray-project/kuberay/ray-operator v1.0.0-rc.1 h1:aoOajXNG2QnTPmnSzbCXLFBXrVk7bzQGrwwVzTXSOzo=
github.com/ray-project/kuberay/ray-operator v1.0.0-rc.1/go.mod h1:NDvscwYbeLSh+Cfc2UTeyPWODtNKPCsPjD/2kg3ZXPw=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func main() {
Scheme: mgr.GetScheme(),
Config: cfg.InstaScale.InstaScaleConfiguration,
}
exitOnError(instaScaleController.SetupWithManager(mgr), "Error setting up InstaScale controller")
exitOnError(instaScaleController.SetupWithManager(context.Background(), mgr), "Error setting up InstaScale controller")
}

exitOnError(mgr.AddHealthzCheck(cfg.Health.LivenessEndpointName, healthz.Ping), "unable to set up health check")
Expand Down
10 changes: 10 additions & 0 deletions test/e2e/mnist_raycluster_sdk_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,16 @@ func TestMNISTRayClusterSDK(t *testing.T) {
},
},
WorkingDir: "/workdir",
SecurityContext: &corev1.SecurityContext{
AllowPrivilegeEscalation: Ptr(false),
SeccompProfile: &corev1.SeccompProfile{
Type: "RuntimeDefault",
},
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
},
RunAsNonRoot: Ptr(true),
},
},
},
Volumes: []corev1.Volume{
Expand Down
Loading