Skip to content

Fixed demo-launcher settings #130

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed demo-launcher settings #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.4.0] - OPEN
## [2.4.1] - OPEN

### Fixed

- Demo Launcher now is adapted correctly to the `data_operation` setup introduced in `2.4.0`
- Old link to the installation documentation

## [2.4.0]

### Added

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ FirecREST is a high performance proxy providing a standardized interface to acce

### User Guide: [Full Documentation](https://eth-cscs.github.io/firecrest-v2/)
### API Reference: [OpenAPI Swagger](https://eth-cscs.github.io/firecrest-v2/openapi/)
### K8s Deployment: [Helm Charts](https://eth-cscs.github.io/firecrest-v2/setup/deploy/)
### K8s Deployment: [Helm Charts](https://eth-cscs.github.io/firecrest-v2/setup/install/)


# FirecREST v2 Demo
Expand Down
15 changes: 12 additions & 3 deletions build/demo-launcher/src/launcher/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

sys.path.append("../../../src")
sys.path.append("../")
from firecrest.config import Settings, HPCCluster, ServiceAccount, SSHClientPool, SSHStaticKeys, Storage
from firecrest.config import Settings, HPCCluster, ServiceAccount, SSHClientPool, SSHStaticKeys, DataOperation, BaseDataTransfer


class CamelModel(BaseModel):
Expand Down Expand Up @@ -42,13 +42,22 @@ class UnsafeHPCCluster(HPCCluster):
ssh: UnsafeSSHClientPool


class UnsafeStorage(Storage):
class UnsafeS3DataTransfer(BaseDataTransfer):
service_type: str
name: str
secret_access_key: str
access_key_id: str
private_url: str
public_url: str
region: str
ttl: int


class UnsafeDataOperation(DataOperation):
data_transfer: UnsafeS3DataTransfer


class UnsafeSettings(Settings):
ssh_credentials: UnsafeSSHUserKeys
clusters: List[UnsafeHPCCluster] = []
storage: UnsafeStorage
data_operation: UnsafeDataOperation
34 changes: 18 additions & 16 deletions build/demo-launcher/src/launcher/f7t-api-config.demo-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,22 @@ clusters:
- path: '/users'
data_type: 'users'
default_work_dir: true
storage:
name: "s3-storage"
private_url: "http://192.168.240.19:9000"
public_url: "http://localhost:9000"
access_key_id: "storage_access_key"
secret_access_key: "secret_access_key"
region: "us-east-1"
ttl: 604800
multipart:
use_split: false
max_part_size: 1073741824 # 1G
parallel_runs: 3
tmp_folder: "tmp"
data_operation:
max_ops_file_size: 1048576 # 1M
probing:
interval: 60
timeout: 10
data_transfer:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hummm.... does it make sense to include an s3 configuration in the demo launcher? The urls we provide here are useless since the demo does not include an s3 instance?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would leave it if we have the requirement later. In any case, we're prepared for the other options as well.

service_type: "s3"
name: "s3-storage"
private_url: "http://192.168.240.19:9000"
public_url: "http://localhost:9000"
access_key_id: "storage_access_key"
secret_access_key: "secret_access_key"
region: "us-east-1"
ttl: 604800
multipart:
use_split: false
max_part_size: 1073741824 # 1G
parallel_runs: 3
tmp_folder: "tmp"
probing:
interval: 60
timeout: 10