Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Auto fullier #28

Merged
merged 3 commits into from
Oct 3, 2024
Merged

feat: Auto fullier #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
087ad22
maybe this needs to be named soemthing firendlier
cdkharris Oct 3, 2024
62cab42
tweak k8s ingress and wait for cluster stuff
cdkharris Oct 3, 2024
5c3ab51
format
cdkharris Oct 3, 2024
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: 0 additions & 4 deletions terraform/modules/jupyter/install_jupyterhub.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,3 @@ helm upgrade --cleanup-on-fail \
--values jupyterhub_config.yaml

kubectl config set-context $(kubectl config current-context) --namespace jupyterhub

# enable ingress
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/${calico_version}/manifests/tigera-operator.yaml
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/${calico_version}/manifests/custom-resources.yaml
6 changes: 6 additions & 0 deletions terraform/modules/jupyter/install_k3s.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ printf "
# kubectl shell completion
source '/root/.kube/completion.bash.inc'
" >> /root/.bash_profile

kubectl wait --namespace=kube-system --for=condition=Ready pod -l k8s-app=metrics-server

# enable ingress
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/${calico_version}/manifests/tigera-operator.yaml
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/${calico_version}/manifests/custom-resources.yaml
6 changes: 3 additions & 3 deletions terraform/modules/jupyter/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ resource "harvester_cloudinit_secret" "cloud-config-jupyter" {
install_k3s_script = indent(6, templatefile(
"${path.module}/install_k3s.sh",
{
k3s_version = var.k3s_version
k3s_version = var.k3s_version
calico_version = var.calico_version
}
))
jupyterhub_config = indent(6, templatefile(
Expand All @@ -34,7 +35,6 @@ resource "harvester_cloudinit_secret" "cloud-config-jupyter" {
"${path.module}/install_jupyterhub.sh",
{
z2jupyterhub_version = var.z2jupyterhub_version
calico_version = var.calico_version
}
))
})
Expand Down Expand Up @@ -68,7 +68,7 @@ resource "harvester_virtualmachine" "vm" {
machine_type = "q35"

network_interface {
name = "nic-1"
name = "default"
wait_for_lease = true
type = "bridge"
network_name = var.network_name
Expand Down