Skip to content
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
4 changes: 2 additions & 2 deletions docs/developer-guide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ kubectl create secret generic currents-rustfs-user \
Install RustFS

```sh
helm install rustfs rustfs --repo https://charts.rustfs.com -f samples/rustfs-helm-config.yaml
helm install rustfs rustfs --repo https://charts.rustfs.com --version 1.0.1 -f samples/rustfs-helm-config.yaml
```

Create the `currents` bucket

```sh
kubectl apply -f samples/rustfs-create-bucket-job.yaml
kubectl wait --for=condition=complete job/rustfs-create-bucket --timeout=60s
kubectl wait --for=condition=complete job/rustfs-create-bucket --timeout=120s
```

Create an ingress for RustFS
Expand Down
30 changes: 19 additions & 11 deletions docs/eks/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,11 @@ Creates a single Pod instance of RustFS with 10Gi of storage.
secret:
existingSecret: "currents-rustfs-user"

# Let the dashboard and trace.playwright.dev fetch objects from the browser
extraEnv:
- name: RUSTFS_CORS_ALLOWED_ORIGINS
value: "*"

# Service configuration
service:
type: ClusterIP
Expand Down Expand Up @@ -250,9 +255,9 @@ Creates a single Pod instance of RustFS with 10Gi of storage.
memory: "128Mi"
```

3. Install RustFS
3. Install RustFS. The chart version also sets the RustFS image version.
```sh
helm install rustfs rustfs --repo https://charts.rustfs.com -f rustfs-helm-config.yaml
helm install rustfs rustfs --repo https://charts.rustfs.com --version 1.0.1 -f rustfs-helm-config.yaml
```

4. Create an Ingress Resource to expose the RustFS S3 API
Expand Down Expand Up @@ -290,7 +295,7 @@ Creates a single Pod instance of RustFS with 10Gi of storage.
pathType: Prefix
backend:
service:
name: rustfs
name: rustfs-svc
port:
number: 9000
```
Expand All @@ -299,7 +304,7 @@ Creates a single Pod instance of RustFS with 10Gi of storage.
kubectl apply -f rustfs-eks-ingress.yaml
```

5. Create the `currents` bucket by applying a Job that uses mc (MinIO client)
5. Create the `currents` bucket by applying a Job that uses the AWS CLI

`rustfs-create-bucket-job.yaml`
```yaml
Expand All @@ -313,30 +318,33 @@ Creates a single Pod instance of RustFS with 10Gi of storage.
spec:
restartPolicy: Never
containers:
- name: mc
image: minio/mc:latest
- name: aws-cli
image: amazon/aws-cli:2.32.31
env:
- name: RUSTFS_ACCESS_KEY
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: currents-rustfs-user
key: RUSTFS_ACCESS_KEY
- name: RUSTFS_SECRET_KEY
- name: AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: currents-rustfs-user
key: RUSTFS_SECRET_KEY
- name: AWS_DEFAULT_REGION
value: us-east-1
- name: AWS_ENDPOINT_URL
value: http://rustfs-svc:9000
command:
- /bin/sh
- -c
- |
mc alias set rustfs http://rustfs-svc:9000 $RUSTFS_ACCESS_KEY $RUSTFS_SECRET_KEY
mc mb --ignore-existing rustfs/currents
aws s3api head-bucket --bucket currents 2>/dev/null || aws s3 mb s3://currents
```

```sh
kubectl apply -f rustfs-create-bucket-job.yaml
kubectl wait --for=condition=complete job/rustfs-create-bucket --timeout=60s
kubectl wait --for=condition=complete job/rustfs-create-bucket --timeout=120s
```

### SMTP Email
Expand Down
2 changes: 1 addition & 1 deletion docs/eks/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Configure and install the Currents Helm Chart once all the services are ready.
# secretAccessKey: RUSTFS_SECRET_KEY
# Set the endpoint to your RustFS route
# endpoint: https://storage.eks.example.com
# internalEndpoint: http://rustfs
# internalEndpoint: http://rustfs-svc:9000
# bucket: currents
# pathStyle: true

Expand Down
2 changes: 1 addition & 1 deletion samples/eks/eks-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ currents:
host: clickhouse-clickhouse
objectStorage:
endpoint: https://storage.eks.currents-sandbox.work
internalEndpoint: http://rustfs
internalEndpoint: http://rustfs-svc:9000
secretName: currents-rustfs-user
secretIdKey: RUSTFS_ACCESS_KEY
secretAccessKey: RUSTFS_SECRET_KEY
Expand Down
2 changes: 1 addition & 1 deletion samples/local/chart-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ currents:
host: clickhouse-clickhouse
objectStorage:
endpoint: http://rustfs.localhost
internalEndpoint: http://rustfs
internalEndpoint: http://rustfs-svc:9000
secretName: currents-rustfs-user
secretIdKey: RUSTFS_ACCESS_KEY
secretAccessKey: RUSTFS_SECRET_KEY
Expand Down
15 changes: 9 additions & 6 deletions samples/rustfs-create-bucket-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,25 @@ spec:
spec:
restartPolicy: Never
containers:
- name: mc
image: minio/mc:latest
- name: aws-cli
image: amazon/aws-cli:2.32.31
Comment thread
twk3 marked this conversation as resolved.
env:
- name: RUSTFS_ACCESS_KEY
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: currents-rustfs-user
key: RUSTFS_ACCESS_KEY
- name: RUSTFS_SECRET_KEY
- name: AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: currents-rustfs-user
key: RUSTFS_SECRET_KEY
- name: AWS_DEFAULT_REGION
value: us-east-1
- name: AWS_ENDPOINT_URL
value: http://rustfs-svc:9000
command:
- /bin/sh
- -c
- |
mc alias set rustfs http://rustfs-svc:9000 $RUSTFS_ACCESS_KEY $RUSTFS_SECRET_KEY
mc mb --ignore-existing rustfs/currents
aws s3api head-bucket --bucket currents 2>/dev/null || aws s3 mb s3://currents
7 changes: 7 additions & 0 deletions samples/rustfs-helm-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ mode:
secret:
existingSecret: "currents-rustfs-user"

# The dashboard and https://trace.playwright.dev fetch objects from the
# browser through presigned URLs. RustFS sends no CORS headers unless this
# or a bucket CORS rule is set.
extraEnv:
- name: RUSTFS_CORS_ALLOWED_ORIGINS
value: "*"

# Service configuration
service:
type: ClusterIP
Expand Down
Loading