Skip to content

Commit

Permalink
Merge pull request #205 from aaronkanzer/ak-remove-lincbrain-cli
Browse files Browse the repository at this point in the history
Remove lincbrain CLI installation due to dandi CLI handling different APIs
  • Loading branch information
kabilar authored Nov 26, 2024
2 parents ddde7ba + def99e3 commit aa9421d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
5 changes: 5 additions & 0 deletions addons.tf
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ module "eks_blueprints_addons" {
timeout = "300"
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
repository_password = data.aws_ecrpublic_authorization_token.token.password
values = [<<EOT
controller:
image: public.ecr.aws/karpenter/controller:0.35.0@sha256:48d1246f6b2066404e300cbf3e26d0bcdc57a76531dcb634d571f4f0e050cb57
EOT
]
}

#---------------------------------------
Expand Down
1 change: 0 additions & 1 deletion envs/linc/jupyterhub-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,5 @@ singleuser:
- >
/opt/conda/envs/allen/bin/python -m ipykernel install --user --name allen --display-name "Python (Allen SDK)";
/opt/conda/bin/pip install --upgrade dandi;
/opt/conda/bin/pip install --upgrade lincbrain-cli;
git config --global user.email "$${GITHUB_EMAIL}";
git config --global user.name "$${GITHUB_USER}"
5 changes: 2 additions & 3 deletions envs/linc/managed-jupyterhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,8 @@ singleuser:
- -c
- '/opt/conda/envs/allen/bin/python -m ipykernel install --user --name allen
--display-name "Python (Allen SDK)"; /opt/conda/bin/pip install --upgrade
dandi; /opt/conda/bin/pip install --upgrade lincbrain-cli; git config
--global user.email "$${GITHUB_EMAIL}"; git config --global user.name
"$${GITHUB_USER}"
dandi; git config --global user.email "$${GITHUB_EMAIL}"; git config --global
user.name "$${GITHUB_USER}"
'
memory:
Expand Down
15 changes: 5 additions & 10 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,31 +1,26 @@
# Derived from Data On EKS under Apache License 2.0.
# Source: https://github.com/awslabs/data-on-eks/tree/main/ai-ml/jupyterhub
# See LICENSE file in the root directory of this source code or at http://www.apache.org/licenses/LICENSE-2.0.html.

terraform {
required_version = ">= 1.0.0"

required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 3.72"
version = ">= 5.76.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
version = ">= 2.10"
version = ">= 2.33.0"
}
helm = {
source = "hashicorp/helm"
version = ">= 2.12.1"
version = ">= 2.16.1"
}
random = {
source = "hashicorp/random"
version = "3.1.0" # Replace with the appropriate version of the random provider
version = ">= 3.6.3"
}

archive = {
source = "hashicorp/archive"
version = "2.4.0"
}
}
}
}

0 comments on commit aa9421d

Please sign in to comment.