Skip to content

Commit

Permalink
Updates from review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Jon committed Aug 30, 2024
1 parent c4a0cdc commit 7b37fc9
Show file tree
Hide file tree
Showing 11 changed files with 59 additions and 91 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ MANIFEST
pip-log.txt
pip-delete-this-directory.txt

# Local dev secrets
k8s/envs/local/secrets.env

# Unit test / coverage reports
htmlcov/
.tox/
Expand Down
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,11 @@ Now start your server
### Nix development
For this mode of development, you must install:
- nix with flakes support
- kind
- skaffold

Then to develop, run these commands:
- `nix develop --impure` to start your nix development environment - **called anytime you use a new terminal**
- `kind create cluster --config ./local-cluster.yaml` to create the cluster - **should only need to be called one time within the nix environment**
- `ctlptl apply -f local-registry.yaml -f local-cluster.yaml` to start up the registry and cluster - **should only need to be called one time within the nix environment**
- `skaffold dev -m deps` to start the dependencies - **run this in a different tab to keep running during development**
- `skaffold dev -m deps` to start the dependencies - **run this in a different tab to keep running during development or use 'run' instead of 'dev'**
- configure the `./k8s/envs/local/secrets.env` values for connecting to the appropriate services.
- `skaffold dev -m app --port-forward` to start the servers and worker. This will auto-redeploy as you make changes to the code.

Expand Down
101 changes: 48 additions & 53 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion k8s/base/deploy-static.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,4 @@ spec:
optional: false
- secretRef:
name: env
optional: false
optional: false
5 changes: 3 additions & 2 deletions k8s/base/deploy-worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ spec:
fsGroup: 1000
volumes:
- name: tmp
persistentVolumeClaim:
claimName: worker-tmp-pvc
emptyDir:
medium: Memory
sizeLimit: 1Gi
containers:
- name: default
image: datalab
Expand Down
2 changes: 0 additions & 2 deletions k8s/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ resources:
- ./svc-server.yaml
- ./deploy-static.yaml
- ./svc-static.yaml
- ./pv.yaml
- ./pvc.yaml
- ./deploy-worker.yaml

labels:
Expand Down
14 changes: 0 additions & 14 deletions k8s/base/pv.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions k8s/base/pvc.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion k8s/base/svc-static.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ spec:
ports:
- name: static
port: 80
targetPort: static
targetPort: static
2 changes: 1 addition & 1 deletion k8s/envs/local/ns.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: datalab
name: datalab
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ OAUTH_CLIENT_ID=changeme
OAUTH_CLIENT_SECRET=changeme
ARCHIVE_API_TOKEN=changeme
AWS_ACCESS_KEY_ID=changeme
AWS_SECRET_ACCESS_KEY=changeme
AWS_SECRET_ACCESS_KEY=changeme

0 comments on commit 7b37fc9

Please sign in to comment.