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

Repository removal #1207

Merged
merged 3 commits into from
Feb 2, 2024
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
8 changes: 0 additions & 8 deletions .github/workflows/build-containers-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
matrix:
dockerfile:
- Dockerfile-ray-node
- repository/Dockerfile
- gateway/Dockerfile
python:
- "3.8"
Expand All @@ -28,13 +27,6 @@ jobs:
python: "3.8"
- dockerfile: gateway/Dockerfile
python: "3.10"
# repository is only built using python 3.9
- dockerfile: repository/Dockerfile
python: "3.8"
- dockerfile: repository/Dockerfile
python: "3.10"


steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/docker-verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
paths:
- "Dockerfile-ray-node"
- "gateway/Dockerfile"
- "repository/Dockerfile"
- ".github/actions/docker-vscan/action.yaml"
- ".github/scripts/dockerfile-security.rego"
- ".github/workflows/docker-verify.yaml"
Expand All @@ -22,7 +21,6 @@ jobs:
[
"Dockerfile-ray-node",
"./gateway/Dockerfile",
"./repository/Dockerfile",
]
runs-on: ubuntu-latest
steps:
Expand All @@ -36,7 +34,6 @@ jobs:
[
"Dockerfile-ray-node",
"./gateway/Dockerfile",
"./repository/Dockerfile",
]
runs-on: ubuntu-latest
steps:
Expand All @@ -59,7 +56,6 @@ jobs:
"quantum-serverless-ray-node:latest-py38",
"quantum-serverless-ray-node:latest-py39",
"quantum-serverless-ray-node:latest-py310",
"quantum-repository-server:latest",
]
include:
- image: "quantum-serverless-gateway:latest"
Expand All @@ -74,9 +70,6 @@ jobs:
- image: "quantum-serverless-ray-node:latest-py310"
dockerfile: "Dockerfile-ray-node"
pyversion: "py310"
- image: "quantum-repository-server:latest"
dockerfile: "./gateway/Dockerfile"
pyversion: "3.9"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/icr-image-build-and-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ jobs:
pythonversion: py310
dockerfile: Dockerfile-ray-node
platforms: linux/amd64
- imagename: quantum-repository-server
pythonversion: ''
dockerfile: ./repository/Dockerfile
platforms: linux/amd64,linux/arm64
- imagename: quantum-serverless-gateway
pythonversion: ''
dockerfile: ./gateway/Dockerfile
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/release-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
"quantum-serverless-ray-node:latest-py38",
"quantum-serverless-ray-node:latest-py39",
"quantum-serverless-ray-node:latest-py310",
"quantum-repository-server:latest",
]
include:
- image: "quantum-serverless-gateway:latest"
Expand All @@ -30,9 +29,6 @@ jobs:
- image: "quantum-serverless-ray-node:latest-py310"
dockerfile: "Dockerfile-ray-node"
pyversion: "py310"
- image: "quantum-repository-server:latest"
dockerfile: "./repository/Dockerfile"
pyversion: "3.9"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
48 changes: 0 additions & 48 deletions .github/workflows/repository-verify.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/update-component-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ jobs:
sed -i "s/version: ${OLDNUM}/version: ${NEWNUM}/" charts/quantum-serverless/charts/gateway/Chart.yaml
sed -i "s/appVersion: \"${OLDNUM}\"/appVersion: \"${NEWNUM}\"/" charts/quantum-serverless/charts/gateway/Chart.yaml
sed -i "s/ray-node:${OLDNUM}/ray-node:${NEWNUM}/" charts/quantum-serverless/charts/gateway/values.yaml
sed -i "s/version: ${OLDNUM}/version: ${NEWNUM}/" charts/quantum-serverless/charts/repository/Chart.yaml
sed -i "s/appVersion: \"${OLDNUM}\"/appVersion: \"${NEWNUM}\"/" charts/quantum-serverless/charts/repository/Chart.yaml
sed -i "s/tag: \"${OLDNUM}\"/tag: \"${NEWNUM}\"/" charts/quantum-serverless/values.yaml
sed -i "s/tag: \"${OLDNUM}-py39\"/tag: \"${NEWNUM}-py39\"/" charts/quantum-serverless/values.yaml
sed -i "s/ray-node:${OLDNUM}/ray-node:${NEWNUM}/" charts/quantum-serverless/values.yaml
Expand Down
11 changes: 2 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@ endif
notebookImageName=$(repository)/quantum-serverless-notebook
rayNodeImageName=$(repository)/quantum-serverless-ray-node
gatewayImageName=$(repository)/quantum-serverless-gateway
repositoryServerImageName=$(repository)/quantum-repository-server

# =============
# Docker images
# =============

build-and-push: build-all push-all

build-all: build-notebook build-ray-node build-gateway build-repository-server
push-all: push-notebook push-ray-node push-gateway push-repository-server
build-all: build-notebook build-ray-node build-gateway
push-all: push-notebook push-ray-node push-gateway

build-notebook:
docker build -t $(notebookImageName):$(version) -f Dockerfile-notebook .
Expand All @@ -36,9 +35,6 @@ build-ray-node:
build-gateway:
docker build -t $(gatewayImageName):$(version) -f ./gateway/Dockerfile .

build-repository-server:
docker build -t $(repositoryServerImageName):$(version) -f ./repository/Dockerfile .

push-notebook:
docker push $(notebookImageName):$(version)

Expand All @@ -47,6 +43,3 @@ push-ray-node:

push-gateway:
docker push $(gatewayImageName):$(version)

push-repository-server:
docker push $(repositoryServerImageName):$(version)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ You don't have to worry about configuration or scaling up computational resource
1. [Quickstart](#quickstart)
1. Modules
1. [Client](./client)
1. [Repository](./repository)
1. [Gateway](./gateway)
1. [Charts](./charts)
1. [How to Give Feedback](#how-to-give-feedback)
1. [Contribution Guidelines](#contribution-guidelines)
Expand Down
37 changes: 0 additions & 37 deletions charts/qs-observability/templates/quantumserverlessdashboard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,43 +39,6 @@ data:
"links": [],
"liveNow": false,
"panels": [
{
"datasource": {
"type": "loki",
"uid": "P982945308D3682D1"
},
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 0
},
"id": 3,
"options": {
"dedupStrategy": "none",
"enableLogDetails": true,
"prettifyLogMessage": false,
"showCommonLabels": false,
"showLabels": false,
"showTime": false,
"sortOrder": "Descending",
"wrapLogMessage": false
},
"targets": [
{
"datasource": {
"type": "loki",
"uid": "P982945308D3682D1"
},
"editorMode": "builder",
"expr": "{container=\"repository\"} |= ``",
"queryType": "range",
"refId": "A"
}
],
"title": "Repository",
"type": "logs"
},
{
"datasource": {
"type": "loki",
Expand Down
Loading
Loading