Skip to content

Commit 3a8a5b7

Browse files
Publish to stable
2 parents 2d7c3ae + 67bca10 commit 3a8a5b7

165 files changed

Lines changed: 1571 additions & 3754 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/test-autoscaling.yaml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/workflows/test-fundamentals.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
module:
18-
- fundamentals/managed-node-groups**
19-
- fundamentals/fargate**
20-
- fundamentals/exposing**
18+
- fundamentals/compute/managed-node-groups**
19+
- fundamentals/compute/{fargate,karpenter}**
20+
- fundamentals/{exposing,workloads}**
2121
- fundamentals/storage/{efs,ebs,mountpoint}**
2222
uses: ./.github/workflows/module-test.yaml
2323
with:

.spelling

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,5 @@ nodeconfig
141141
cni-tshoot
142142
resolv
143143
untolerated
144-
Workernodes
144+
Workernodes
145+
Gitea
Lines changed: 358 additions & 358 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodeLinker: node-modules
22

3-
yarnPath: .yarn/releases/yarn-4.9.2.cjs
3+
yarnPath: .yarn/releases/yarn-4.9.4.cjs

devenv.lock

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"flake-compat": {
2020
"flake": false,
2121
"locked": {
22-
"lastModified": 1733328505,
22+
"lastModified": 1747046372,
2323
"owner": "edolstra",
2424
"repo": "flake-compat",
25-
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
25+
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
2626
"type": "github"
2727
},
2828
"original": {
@@ -31,10 +31,31 @@
3131
"type": "github"
3232
}
3333
},
34+
"git-hooks": {
35+
"inputs": {
36+
"flake-compat": "flake-compat",
37+
"gitignore": "gitignore",
38+
"nixpkgs": [
39+
"nixpkgs"
40+
]
41+
},
42+
"locked": {
43+
"lastModified": 1758108966,
44+
"owner": "cachix",
45+
"repo": "git-hooks.nix",
46+
"rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
47+
"type": "github"
48+
},
49+
"original": {
50+
"owner": "cachix",
51+
"repo": "git-hooks.nix",
52+
"type": "github"
53+
}
54+
},
3455
"gitignore": {
3556
"inputs": {
3657
"nixpkgs": [
37-
"pre-commit-hooks",
58+
"git-hooks",
3859
"nixpkgs"
3960
]
4061
},
@@ -66,32 +87,14 @@
6687
"type": "github"
6788
}
6889
},
69-
"pre-commit-hooks": {
70-
"inputs": {
71-
"flake-compat": "flake-compat",
72-
"gitignore": "gitignore",
73-
"nixpkgs": [
74-
"nixpkgs"
75-
]
76-
},
77-
"locked": {
78-
"lastModified": 1735882644,
79-
"owner": "cachix",
80-
"repo": "pre-commit-hooks.nix",
81-
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
82-
"type": "github"
83-
},
84-
"original": {
85-
"owner": "cachix",
86-
"repo": "pre-commit-hooks.nix",
87-
"type": "github"
88-
}
89-
},
9090
"root": {
9191
"inputs": {
9292
"devenv": "devenv",
93+
"git-hooks": "git-hooks",
9394
"nixpkgs": "nixpkgs",
94-
"pre-commit-hooks": "pre-commit-hooks"
95+
"pre-commit-hooks": [
96+
"git-hooks"
97+
]
9598
}
9699
}
97100
},

lab/scripts/installer.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@
33
set -e
44

55
# renovate: depName=kubernetes/kubernetes
6-
kubectl_version='1.33.3'
6+
kubectl_version='1.33.5'
77

88
# renovate: depName=helm/helm
9-
helm_version='3.18.4'
9+
helm_version='3.19.0'
1010

1111
# renovate: depName=eksctl-io/eksctl
12-
eksctl_version='0.212.0'
12+
eksctl_version='0.215.0'
1313

1414
kubeseal_version='0.18.4'
1515

1616
# renovate: depName=mikefarah/yq
17-
yq_version='4.47.1'
17+
yq_version='4.47.2'
1818

1919
# renovate: depName=fluxcd/flux2
20-
flux_version='2.6.4'
20+
flux_version='2.7.1'
2121

2222
# renovate: depName=argoproj/argo-cd
23-
argocd_version='2.14.15'
23+
argocd_version='2.14.20'
2424

2525
# renovate: depName=hashicorp/terraform
26-
terraform_version='1.12.2'
26+
terraform_version='1.13.3'
2727

2828
# renovate: depName=aws/amazon-ec2-instance-selector
2929
ec2_instance_selector_version='3.1.1'
3030

3131
# renovate: depName=hatoo/oha
32-
oha_version='1.9.0'
32+
oha_version='1.10.0'
3333

3434
download () {
3535
url=$1

manifests/.workshop/terraform/base.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = "6.8.0"
7+
version = "6.12.0"
88
}
99
kubernetes = {
1010
source = "hashicorp/kubernetes"

manifests/modules/aiml/chatbot/.workshop/cleanup.sh

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,15 @@
22

33
set -e
44

5-
logmessage "Deleting Gradio-UI components..."
5+
logmessage "Deleting vLLM namespace..."
66

7-
kubectl delete -k /eks-workshop/manifests/modules/aiml/chatbot/gradio-mistral --ignore-not-found
8-
9-
logmessage "Deleting mistral pods..."
10-
11-
kubectl delete -k /eks-workshop/manifests/modules/aiml/chatbot/ray-service-neuron-mistral-chatbot --ignore-not-found
12-
13-
logmessage "Deleting mistral and gradio-mistral-trn1 namespaces..."
14-
15-
kubectl delete namespace mistral --ignore-not-found
16-
17-
kubectl delete namespace gradio-mistral-trn1 --ignore-not-found
7+
kubectl delete namespace vllm --ignore-not-found
188

199
logmessage "Deleting Neuron device plugin..."
2010

21-
kubectl delete -f https://raw.githubusercontent.com/aws-neuron/aws-neuron-sdk/v2.21.0/src/k8/k8s-neuron-device-plugin-rbac.yml --ignore-not-found
22-
kubectl delete -f https://raw.githubusercontent.com/aws-neuron/aws-neuron-sdk/v2.21.0/src/k8/k8s-neuron-device-plugin.yml --ignore-not-found
23-
24-
logmessage "Uninstalling kuberay operator..."
25-
26-
uninstall-helm-chart kuberay-operator default
11+
uninstall-helm-chart neuron-helm-chart kube-system
2712

2813
logmessage "Deleting Karpenter resources..."
2914

30-
kubectl kustomize ~/environment/eks-workshop/modules/aiml/chatbot/nodepool \
31-
| envsubst | kubectl delete --ignore-not-found -f-
15+
delete-all-if-crd-exists nodepools.karpenter.sh
16+
delete-all-if-crd-exists ec2nodeclasses.karpenter.k8s.aws

manifests/modules/aiml/chatbot/.workshop/terraform/main.tf

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ resource "aws_eks_addon" "pod_identity" {
7171

7272
module "karpenter" {
7373
source = "terraform-aws-modules/eks/aws//modules/karpenter"
74-
version = "21.0"
74+
version = "21.1"
7575

7676
cluster_name = var.addon_context.eks_cluster_id
7777
namespace = local.namespace
@@ -103,7 +103,7 @@ resource "helm_release" "karpenter" {
103103
repository_password = data.aws_ecrpublic_authorization_token.token.password
104104
chart = "karpenter"
105105
# renovate: datasource=github-releases depName=aws/karpenter-provider-aws
106-
version = "1.6.1"
106+
version = "1.6.3"
107107
wait = true
108108

109109
values = [
@@ -124,3 +124,34 @@ resource "helm_release" "karpenter" {
124124
]
125125
}
126126
}
127+
128+
resource "kubernetes_manifest" "ui_nlb" {
129+
depends_on = [module.eks_blueprints_addons]
130+
131+
manifest = {
132+
"apiVersion" = "v1"
133+
"kind" = "Service"
134+
"metadata" = {
135+
"name" = "ui-nlb"
136+
"namespace" = "ui"
137+
"annotations" = {
138+
"service.beta.kubernetes.io/aws-load-balancer-type" = "external"
139+
"service.beta.kubernetes.io/aws-load-balancer-scheme" = "internet-facing"
140+
"service.beta.kubernetes.io/aws-load-balancer-nlb-target-type" = "instance"
141+
}
142+
}
143+
"spec" = {
144+
"type" = "LoadBalancer"
145+
"ports" = [{
146+
"port" = 80
147+
"targetPort" = 8080
148+
"name" = "http"
149+
}]
150+
"selector" = {
151+
"app.kubernetes.io/name" = "ui"
152+
"app.kubernetes.io/instance" = "ui"
153+
"app.kubernetes.io/component" = "service"
154+
}
155+
}
156+
}
157+
}

0 commit comments

Comments
 (0)