From ac48161cc452f86e1875b468bfdbacee7bec4f42 Mon Sep 17 00:00:00 2001 From: Lloyd Dakin Date: Tue, 21 Jan 2025 12:36:20 -0800 Subject: [PATCH] Revert "Merge pull request #134 from LCOGT/dev/argo-cd" This reverts commit a3ce041b576370facc3e34e2210ede57a384492f, reversing changes made to 631ed36ce3bea431239d616d377ee5a2a0c8c659. Dockerfile build was breaking helm deployment. Reverting to previous state. This will be reinstated when full argo-cd integration is complete. --- .github/workflows/cd.yaml | 13 - .gitignore | 5 - Dockerfile | 21 +- flake.lock | 983 ----------------------------------- flake.nix | 67 --- k8s/base/deploy-server.yaml | 71 --- k8s/base/kustomization.yaml | 6 - k8s/base/service-server.yaml | 17 - local-cluster.yaml | 8 - local-registry.yaml | 4 - skaffold.yaml | 23 - 11 files changed, 20 insertions(+), 1198 deletions(-) delete mode 100644 .github/workflows/cd.yaml delete mode 100644 flake.lock delete mode 100644 flake.nix delete mode 100644 k8s/base/deploy-server.yaml delete mode 100644 k8s/base/kustomization.yaml delete mode 100644 k8s/base/service-server.yaml delete mode 100644 local-cluster.yaml delete mode 100644 local-registry.yaml delete mode 100644 skaffold.yaml diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml deleted file mode 100644 index 77f43d57..00000000 --- a/.github/workflows/cd.yaml +++ /dev/null @@ -1,13 +0,0 @@ -name: "Continuous Deployment" -on: - push: - branches: - - main - release: - types: - - published - -jobs: - cd: - uses: LCOGT/reusable-workflows/.github/workflows/continuous-deployment.yaml@main - secrets: inherit diff --git a/.gitignore b/.gitignore index 4367ba21..403adbc1 100644 --- a/.gitignore +++ b/.gitignore @@ -21,8 +21,3 @@ pnpm-debug.log* *.njsproj *.sln *.sw? - -# Devops -.devenv -.pre-commit-config.yaml -local-kubeconfig diff --git a/Dockerfile b/Dockerfile index ba961f52..f86a1a0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,25 @@ -FROM node:16 AS builder +FROM node:16 as builder WORKDIR /app COPY package*.json ./ RUN npm install COPY ./ . RUN npm run build + +FROM nginx:1.15-alpine +RUN mkdir -p /app && rm -rf /etc/nginx/conf.d/default.conf +COPY --from=builder /app/dist /app +RUN echo -e " server {\n" \ + " listen 8989;\n" \ + " listen [::]:8989;\n" \ + " server_name localhost;\n" \ + " location / {\n" \ + " root /app;\n" \ + " index index.html;\n" \ + " try_files \$uri \$uri/ /index.html;\n" \ + " add_header 'Cross-Origin-Embedder-Policy' 'require-corp';\n" \ + " add_header 'Cross-Origin-Opener-Policy' 'same-origin';\n" \ + " }\n" \ + " }\n" \ + > /etc/nginx/conf.d/datalab.conf + +ENTRYPOINT [ "nginx", "-g", "daemon off;" ] diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 474db0dd..00000000 --- a/flake.lock +++ /dev/null @@ -1,983 +0,0 @@ -{ - "nodes": { - "cachix": { - "inputs": { - "devenv": "devenv_2", - "flake-compat": [ - "devenv-k8s", - "devenv", - "flake-compat" - ], - "git-hooks": [ - "devenv-k8s", - "devenv", - "pre-commit-hooks" - ], - "nixpkgs": [ - "devenv-k8s", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724232775, - "narHash": "sha256-6u2DycIEgrgNYlLxyGqdFVmBNiKIitnQKJ1pbRP5oko=", - "owner": "cachix", - "repo": "cachix", - "rev": "03b6cb3f953097bff378fb8b9ea094bd091a4ec7", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, - "cachix_2": { - "inputs": { - "devenv": "devenv_3", - "flake-compat": [ - "devenv-k8s", - "devenv", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "devenv-k8s", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "pre-commit-hooks": [ - "devenv-k8s", - "devenv", - "cachix", - "devenv", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1712055811, - "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", - "owner": "cachix", - "repo": "cachix", - "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, - "deploy-repo-template": { - "flake": false, - "locked": { - "lastModified": 1725037657, - "narHash": "sha256-p1ZfPG60DqmcUGJX8rkCVFr0Wh7ZVLCn/BoM6IGTbOo=", - "ref": "refs/heads/main", - "rev": "82058b4c22070bdb386e13b0edadb45742dc3b2e", - "revCount": 17, - "type": "git", - "url": "https://github.com/LCOGT/deploy-repo-template.git" - }, - "original": { - "type": "git", - "url": "https://github.com/LCOGT/deploy-repo-template.git" - } - }, - "devenv": { - "inputs": { - "cachix": "cachix", - "flake-compat": "flake-compat_2", - "nix": "nix_3", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks_2" - }, - "locked": { - "lastModified": 1726232533, - "narHash": "sha256-rhho/HLlDkJ/d3k6oQivgCSdVz4C1LLklPtO/aBhC2I=", - "owner": "cachix", - "repo": "devenv", - "rev": "199a23e3bcfbfacaec3836d1c884918e13239b50", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv-k8s": { - "inputs": { - "deploy-repo-template": "deploy-repo-template", - "devenv": "devenv", - "flake-parts": "flake-parts_2", - "kpt": "kpt", - "mk-shell-bin": "mk-shell-bin", - "nix2container": "nix2container", - "nixpkgs": "nixpkgs_4", - "octopilot": "octopilot", - "skaffold": "skaffold" - }, - "locked": { - "lastModified": 1734392439, - "narHash": "sha256-Kvog3WdFkocgMqvH43r3/byklCRW5nUIvYUO9mxAYqk=", - "owner": "LCOGT", - "repo": "devenv-k8s", - "rev": "759bf45dbd825c5497d1177b3b668244b5673b88", - "type": "github" - }, - "original": { - "owner": "LCOGT", - "repo": "devenv-k8s", - "type": "github" - } - }, - "devenv_2": { - "inputs": { - "cachix": "cachix_2", - "flake-compat": [ - "devenv-k8s", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix_2", - "nixpkgs": [ - "devenv-k8s", - "devenv", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "devenv-k8s", - "devenv", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1723156315, - "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", - "owner": "cachix", - "repo": "devenv", - "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_3": { - "inputs": { - "flake-compat": [ - "devenv-k8s", - "devenv", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix", - "nixpkgs": "nixpkgs", - "poetry2nix": "poetry2nix", - "pre-commit-hooks": [ - "devenv-k8s", - "devenv", - "cachix", - "devenv", - "cachix", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1708704632, - "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", - "owner": "cachix", - "repo": "devenv", - "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "python-rewrite", - "repo": "devenv", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "devenv-k8s", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "devenv-k8s", - "devenv", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gomod2nix": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "devenv-k8s", - "skaffold", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1710154385, - "narHash": "sha256-4c3zQ2YY4BZOufaBJB4v9VBBeN2dH7iVdoJw8SDNCfI=", - "owner": "nix-community", - "repo": "gomod2nix", - "rev": "872b63ddd28f318489c929d25f1f0a3c6039c971", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "gomod2nix", - "type": "github" - } - }, - "kpt": { - "inputs": { - "flake-parts": [ - "devenv-k8s", - "flake-parts" - ], - "kpt": "kpt_2", - "nixpkgs": [ - "devenv-k8s", - "nixpkgs" - ] - }, - "locked": { - "dir": "kpt", - "lastModified": 1725659503, - "narHash": "sha256-GklipTzYxNtpxifQaW1GFesUzIiRowrrM7IL8Ql3bqw=", - "owner": "LCOGT", - "repo": "devenv-k8s", - "rev": "98c64c1fd378135b72963dcdf3a65fd79ebc0b81", - "type": "github" - }, - "original": { - "dir": "kpt", - "owner": "LCOGT", - "repo": "devenv-k8s", - "type": "github" - } - }, - "kpt_2": { - "flake": false, - "locked": { - "lastModified": 1700611672, - "narHash": "sha256-GHEk5nezva+26cpCrgriaGIL2PvSLWgC0UtmFkNHoDc=", - "owner": "kptdev", - "repo": "kpt", - "rev": "aff697dbfc8134b059bcfbdfb792a1048aaa57b5", - "type": "github" - }, - "original": { - "owner": "kptdev", - "ref": "v1.0.0-beta.48", - "repo": "kpt", - "type": "github" - } - }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, - "mk-shell-bin": { - "locked": { - "lastModified": 1677004959, - "narHash": "sha256-/uEkr1UkJrh11vD02aqufCxtbF5YnhRTIKlx5kyvf+I=", - "owner": "rrbutani", - "repo": "nix-mk-shell-bin", - "rev": "ff5d8bd4d68a347be5042e2f16caee391cd75887", - "type": "github" - }, - "original": { - "owner": "rrbutani", - "repo": "nix-mk-shell-bin", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "devenv-k8s", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "devenv-k8s", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix2container": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "devenv-k8s", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724996935, - "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "nix_2": { - "inputs": { - "flake-compat": [ - "devenv-k8s", - "devenv", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "devenv-k8s", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression_2" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix_3": { - "inputs": { - "flake-compat": [ - "devenv-k8s", - "devenv", - "flake-compat" - ], - "flake-parts": "flake-parts", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_2", - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression_3", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1725980365, - "narHash": "sha256-uDwWyizzlQ0HFzrhP6rVp2+2NNA+/TM5zT32dR8GUlg=", - "owner": "domenkozar", - "repo": "nix", - "rev": "1e61e9f40673f84c3b02573145492d8af581bec5", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", - "repo": "nix", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1692808169, - "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-23-11": { - "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" - } - }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_3": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1717432640, - "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1716977621, - "narHash": "sha256-Q1UQzYcMJH4RscmpTkjlgqQDX5yi1tZL0O345Ri6vXQ=", - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1734126203, - "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "octopilot": { - "inputs": { - "flake-parts": [ - "devenv-k8s", - "flake-parts" - ], - "nixpkgs": [ - "devenv-k8s", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724261402, - "narHash": "sha256-ablZLlVPhrC5cShu2/5e80cbrR5MOMGc7Fpgf37HNbQ=", - "owner": "jashandeep-sohi", - "repo": "octopilot", - "rev": "b17d9033a57525c63fc973e3d1108fefdec62210", - "type": "github" - }, - "original": { - "owner": "jashandeep-sohi", - "ref": "fix/commit-with-api", - "repo": "octopilot", - "type": "github" - } - }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "devenv-k8s", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1692876271, - "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": [ - "devenv-k8s", - "devenv", - "nix" - ], - "flake-utils": "flake-utils_2", - "gitignore": [ - "devenv-k8s", - "devenv", - "nix" - ], - "nixpkgs": [ - "devenv-k8s", - "devenv", - "nix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "devenv-k8s", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": [ - "devenv-k8s", - "devenv", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "devenv-k8s", - "devenv", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1725513492, - "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "devenv-k8s": "devenv-k8s", - "flake-parts": [ - "devenv-k8s", - "flake-parts" - ], - "nixpkgs": [ - "devenv-k8s", - "nixpkgs" - ] - } - }, - "skaffold": { - "inputs": { - "flake-parts": [ - "devenv-k8s", - "flake-parts" - ], - "gomod2nix": "gomod2nix", - "nixpkgs": [ - "devenv-k8s", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1711736775, - "narHash": "sha256-wRzy040KH+IfgK+g3Dj4Re4hb1S+G3xaxJ41TrsPEvE=", - "owner": "jashandeep-sohi", - "repo": "skaffold", - "rev": "e57813c8e738a0a347f8732221961584e025b6a5", - "type": "github" - }, - "original": { - "owner": "jashandeep-sohi", - "repo": "skaffold", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index be9fc928..00000000 --- a/flake.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - description = "Description for the project"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - devenv-k8s.url = "github:LCOGT/devenv-k8s"; - - nixpkgs.follows = "devenv-k8s/nixpkgs"; - flake-parts.follows = "devenv-k8s/flake-parts"; - }; - - nixConfig = { - extra-substituters = [ - "https://devenv.cachix.org" - "https://lco-public.cachix.org" - ]; - - extra-trusted-public-keys = [ - "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" - "lco-public.cachix.org-1:zSmLK7CkAehZ7QzTLZKt+5Y26Lr0w885GUB4GlT1SCg=" - ]; - }; - - outputs = inputs@{ flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } { - imports = [ - inputs.devenv-k8s.flakeModules.default - ]; - - systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ]; - - perSystem = { config, self', inputs', pkgs, system, ... }: { - # Per-system attributes can be defined here. The self' and inputs' - # module parameters provide easy access to attributes of the same - # system. - - # https://devenv.sh/basics/ - # Enter using `nix develop --impure` - config.devenv.shells.default = { - - # https://devenv.sh/packages/ - packages = [ - - ]; - - # https://devenv.sh/reference/options/#entershell - enterShell = '' - export KUBECONFIG="`pwd`/local-kubeconfig" - - echo "Setting KUBECONFIG=$KUBECONFIG" - echo - echo "This is done to sandbox Kubernetes tools (kubectl, skaffold, etc) to the local K8s cluster for this project." - echo "If you would like to use a local K8s cluster across multiple projects, then set 'KUBECONFIG' to a common path" - echo "in both projects before running the command to create the local cluster." - ''; - }; - }; - - flake = { - # The usual flake attributes can be defined here, including system- - # agnostic ones like nixosModule and system-enumerating ones, although - # those are more easily expressed in perSystem. - - }; - }; -} diff --git a/k8s/base/deploy-server.yaml b/k8s/base/deploy-server.yaml deleted file mode 100644 index e33c4cc7..00000000 --- a/k8s/base/deploy-server.yaml +++ /dev/null @@ -1,71 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master-standalone/deployment-apps-v1.json -apiVersion: apps/v1 -kind: Deployment -metadata: - name: frontend - labels: - app.kubernetes.io/component: frontend -spec: - selector: - matchLabels: - app.kubernetes.io/component: frontend - template: - metadata: - labels: - app.kubernetes.io/component: frontend - spec: - volumes: - - name: static-files - emptyDir: - sizeLimit: "512Mi" - initContainers: - - name: copy-static-files - image: datalab-ui - command: - - "sh" - - "-c" - - "cp -r /app/dist/* /app/volume" - securityContext: - runAsNonRoot: true - runAsUser: 1000 - runAsGroup: 1000 - readOnlyRootFilesystem: true - resources: - requests: - cpu: 1000m - memory: 256Mi - limits: - cpu: 2000m - memory: 512Mi - volumeMounts: - - name: static-files - mountPath: /app/volume - containers: - - name: default - image: ghcr.io/static-web-server/static-web-server:2 - command: - - /static-web-server - - --root=/app/dist - - --health - - --port=8080 - - --host=0.0.0.0 - - --page-fallback=/app/dist/index.html - securityContext: - runAsNonRoot: true - runAsUser: 1000 - runAsGroup: 1000 - readOnlyRootFilesystem: true - resources: - requests: - cpu: 500m - memory: 128Mi - limits: - cpu: 1000m - memory: 256Mi - volumeMounts: - - name: static-files - mountPath: /app/dist - ports: - - name: frontend - containerPort: 8080 - protocol: TCP diff --git a/k8s/base/kustomization.yaml b/k8s/base/kustomization.yaml deleted file mode 100644 index 39d94cee..00000000 --- a/k8s/base/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ./deploy-server.yaml - - ./service-server.yaml diff --git a/k8s/base/service-server.yaml b/k8s/base/service-server.yaml deleted file mode 100644 index 330ec283..00000000 --- a/k8s/base/service-server.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master-standalone/service.json -apiVersion: v1 -kind: Service -metadata: - name: frontend - labels: - app.kubernetes.io/component: server - annotations: - internal.kpt.dev/upstream-identifier: '|Service|default|Datalab' -spec: - type: ClusterIP - selector: - app.kubernetes.io/component: frontend - ports: - - name: frontend - port: 8080 - targetPort: frontend diff --git a/local-cluster.yaml b/local-cluster.yaml deleted file mode 100644 index a24a4af9..00000000 --- a/local-cluster.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: ctlptl.dev/v1alpha1 -kind: Cluster -name: kind-datalab-ui -product: kind -registry: lco-local -kindV1Alpha4Cluster: - nodes: - - image: "kindest/node:v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee174fdc43a7b75ca75c95e51" diff --git a/local-registry.yaml b/local-registry.yaml deleted file mode 100644 index f5de7916..00000000 --- a/local-registry.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: ctlptl.dev/v1alpha1 -kind: Registry -name: lco-local -port: 12315 diff --git a/skaffold.yaml b/skaffold.yaml deleted file mode 100644 index dabdeea9..00000000 --- a/skaffold.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: skaffold/v4beta10 -kind: Config -metadata: - name: app -build: - tagPolicy: - gitCommit: - variant: Tags - artifacts: - - image: datalab-ui - custom: - buildCommand: skaffold-builder-buildx - dependencies: - dockerfile: - path: Dockerfile -manifests: - kustomize: - paths: - - k8s/base -deploy: - kubectl: {} - logs: - prefix: podAndContainer