From 7b37fc9dce5ae146fb990c0a73e35116d16d6474 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 30 Aug 2024 06:29:32 +0000 Subject: [PATCH] Updates from review comments --- .gitignore | 3 + README.md | 5 +- flake.lock | 101 +++++++++--------- k8s/base/deploy-static.yaml | 2 +- k8s/base/deploy-worker.yaml | 5 +- k8s/base/kustomization.yaml | 2 - k8s/base/pv.yaml | 14 --- k8s/base/pvc.yaml | 12 --- k8s/base/svc-static.yaml | 2 +- k8s/envs/local/ns.yaml | 2 +- .../{secrets.env => secrets.env.changeme} | 2 +- 11 files changed, 59 insertions(+), 91 deletions(-) delete mode 100644 k8s/base/pv.yaml delete mode 100644 k8s/base/pvc.yaml rename k8s/envs/local/{secrets.env => secrets.env.changeme} (84%) diff --git a/.gitignore b/.gitignore index bfd7ad4..88eb71a 100644 --- a/.gitignore +++ b/.gitignore @@ -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/ diff --git a/README.md b/README.md index 65acfff..12138ad 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/flake.lock b/flake.lock index a6c1801..60c27c4 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ "deploy-repo-template": { "flake": false, "locked": { - "lastModified": 1710788754, - "narHash": "sha256-46GUCjs0oPZp2AxzHq6OZITzmqwwhb3Pbgtno6Ec9zY=", + "lastModified": 1724949886, + "narHash": "sha256-QWbhBLY847eR8Ez+hmbBQwRH/mGgj6RjaE5mloXKUS4=", "ref": "refs/heads/main", - "rev": "79e85fc90d7d1d0c3c5e4b1db676b2de377a69e7", - "revCount": 14, + "rev": "c8a3e5cfbeb153a11d1652a33d7d70e3c5344e8f", + "revCount": 16, "type": "git", "url": "https://github.com/LCOGT/deploy-repo-template.git" }, @@ -58,11 +58,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1713195025, - "narHash": "sha256-TIUCx0Vlu9ImxTtRyQUFf5RWvTT4GxCTKRSiMFZdZuw=", + "lastModified": 1724763216, + "narHash": "sha256-oW2bwCrJpIzibCNK6zfIDaIQw765yMAuMSG2gyZfGv0=", "owner": "cachix", "repo": "devenv", - "rev": "01e01a3b4d991983dda055d10dcf93e86e1e1f8a", + "rev": "1e4ef61205b9aa20fe04bf1c468b6a316281c4f1", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "skaffold": "skaffold" }, "locked": { - "lastModified": 1713222238, - "narHash": "sha256-viSH6JTcPJxu/BQnXBjgUsmhJatCxlpmqMizrI2DuYk=", + "lastModified": 1724959650, + "narHash": "sha256-PWMf8E1ONLOF4YrcSBSsThiWJEkcE6R31dpTiDl8Zcc=", "owner": "LCOGT", "repo": "devenv-k8s", - "rev": "6c9d9b168c07ac6d7592c2543534c70f5586b453", + "rev": "0486dcd4276bb25bccf886d3a2e2d0523e46c788", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "locked": { "dir": "kpt", - "lastModified": 1712953401, - "narHash": "sha256-A/b71BZrx+FbGLtO/hAcvOeBI8r6hM0XDccoa3IgaCE=", + "lastModified": 1724262194, + "narHash": "sha256-+WcLnbPBGKOD04ogx/J9QS/OfxAVXcH1JvgahA5okRM=", "owner": "LCOGT", "repo": "devenv-k8s", - "rev": "d9556f6cd69348b6f726c217a1f53638f6594917", + "rev": "dbc88d8238fbfcb3bd08c66157bef4b8dc63b379", "type": "github" }, "original": { @@ -371,11 +371,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1708577783, - "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", "owner": "domenkozar", "repo": "nix", - "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { @@ -419,11 +419,11 @@ ] }, "locked": { - "lastModified": 1712990762, - "narHash": "sha256-hO9W3w7NcnYeX8u8cleHiSpK2YJo7ecarFTUlbybl7k=", + "lastModified": 1724921078, + "narHash": "sha256-g6Zb7OrlNEM1lep9e/Neqn8Z+0VgCXAakF03GjtSfA8=", "owner": "nlewo", "repo": "nix2container", - "rev": "20aad300c925639d5d6cbe30013c8357ce9f2a2e", + "rev": "505c19a99771ca2f7b049b3c64f190ccc158861f", "type": "github" }, "original": { @@ -479,20 +479,14 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs-regression": { @@ -545,11 +539,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710796454, - "narHash": "sha256-lQlICw60RhH8sHTDD/tJiiJrlAfNn8FDI9c+7G2F0SE=", + "lastModified": 1713361204, + "narHash": "sha256-TA6EDunWTkc5FvDCqU3W2T3SFn0gRZqh6D/hJnM02MM=", "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "06fb0f1c643aee3ae6838dda3b37ef0abc3c763b", + "rev": "285676e87ad9f0ca23d8714a6ab61e7e027020c6", "type": "github" }, "original": { @@ -561,17 +555,17 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "lastModified": 1716977621, + "narHash": "sha256-Q1UQzYcMJH4RscmpTkjlgqQDX5yi1tZL0O345Ri6vXQ=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", "type": "github" } }, @@ -587,15 +581,16 @@ ] }, "locked": { - "lastModified": 1711718101, - "narHash": "sha256-bMeByl+3OdGsFcHA2fE37IvSbcG81SYhuruZzJ/YPdA=", - "owner": "dailymotion-oss", + "lastModified": 1724261402, + "narHash": "sha256-ablZLlVPhrC5cShu2/5e80cbrR5MOMGc7Fpgf37HNbQ=", + "owner": "jashandeep-sohi", "repo": "octopilot", - "rev": "319bb180ec99b5a8ac5d23d75dedfeb61d5feeaf", + "rev": "b17d9033a57525c63fc973e3d1108fefdec62210", "type": "github" }, "original": { - "owner": "dailymotion-oss", + "owner": "jashandeep-sohi", + "ref": "fix/commit-with-api", "repo": "octopilot", "type": "github" } @@ -643,11 +638,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "lastModified": 1713775815, + "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", "type": "github" }, "original": { diff --git a/k8s/base/deploy-static.yaml b/k8s/base/deploy-static.yaml index 96ed873..50804d0 100644 --- a/k8s/base/deploy-static.yaml +++ b/k8s/base/deploy-static.yaml @@ -128,4 +128,4 @@ spec: optional: false - secretRef: name: env - optional: false \ No newline at end of file + optional: false diff --git a/k8s/base/deploy-worker.yaml b/k8s/base/deploy-worker.yaml index e85ef90..ccfada5 100644 --- a/k8s/base/deploy-worker.yaml +++ b/k8s/base/deploy-worker.yaml @@ -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 diff --git a/k8s/base/kustomization.yaml b/k8s/base/kustomization.yaml index dd953c5..65826f1 100644 --- a/k8s/base/kustomization.yaml +++ b/k8s/base/kustomization.yaml @@ -6,8 +6,6 @@ resources: - ./svc-server.yaml - ./deploy-static.yaml - ./svc-static.yaml - - ./pv.yaml - - ./pvc.yaml - ./deploy-worker.yaml labels: diff --git a/k8s/base/pv.yaml b/k8s/base/pv.yaml deleted file mode 100644 index 02b5f94..0000000 --- a/k8s/base/pv.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: worker-tmp-pv - labels: - type: local -spec: - storageClassName: standard - capacity: - storage: 1Gi - accessModes: - - ReadWriteOnce - hostPath: - path: "/tmp/" \ No newline at end of file diff --git a/k8s/base/pvc.yaml b/k8s/base/pvc.yaml deleted file mode 100644 index 9d9c042..0000000 --- a/k8s/base/pvc.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: worker-tmp-pvc -spec: - volumeName: worker-tmp-pv - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: 1Gi - storageClassName: standard diff --git a/k8s/base/svc-static.yaml b/k8s/base/svc-static.yaml index 357e1fc..ff217dd 100644 --- a/k8s/base/svc-static.yaml +++ b/k8s/base/svc-static.yaml @@ -13,4 +13,4 @@ spec: ports: - name: static port: 80 - targetPort: static \ No newline at end of file + targetPort: static diff --git a/k8s/envs/local/ns.yaml b/k8s/envs/local/ns.yaml index 392194e..9e0b515 100644 --- a/k8s/envs/local/ns.yaml +++ b/k8s/envs/local/ns.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: datalab \ No newline at end of file + name: datalab diff --git a/k8s/envs/local/secrets.env b/k8s/envs/local/secrets.env.changeme similarity index 84% rename from k8s/envs/local/secrets.env rename to k8s/envs/local/secrets.env.changeme index f8307b7..ccaa972 100644 --- a/k8s/envs/local/secrets.env +++ b/k8s/envs/local/secrets.env.changeme @@ -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 \ No newline at end of file +AWS_SECRET_ACCESS_KEY=changeme