Merge branch 'main' of github.com:aws-samples/eks-workshop-v2 into aiml

vishdivg · vishdivg · commit d02600e4e313 · 2025-01-28T14:31:24.000-05:00
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -56,6 +56,9 @@ jobs:
         with:
           node-version: 20
       - uses: actions/setup-python@v5
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "~1.9.0"
       - name: Setup TFLint
         uses: terraform-linters/setup-tflint@v4
       - name: Setup terraform-docs
diff --git a/.github/workflows/test-aiml.yaml b/.github/workflows/test-aiml.yaml
@@ -15,8 +15,3 @@ jobs:
     with:
       glob: aiml/inferentia
     secrets: inherit
-  test-chatbot:
-    uses: ./.github/workflows/module-test.yaml
-    with:
-      module: aiml/chatbot
-    secrets: inherit
diff --git a/.gitignore b/.gitignore
@@ -47,4 +47,9 @@ website/package-lock.json
 !.yarn/plugins
 !.yarn/releases
 !.yarn/sdks
-!.yarn/versions
+!.yarn/versions# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
diff --git a/cluster/eksctl/cluster.yaml b/cluster/eksctl/cluster.yaml
@@ -7,7 +7,7 @@ availabilityZones:
 metadata:
   name: ${EKS_CLUSTER_NAME}
   region: ${AWS_REGION}
-  version: "1.30"
+  version: "1.31"
   tags:
     karpenter.sh/discovery: ${EKS_CLUSTER_NAME}
     created-by: eks-workshop-v2
@@ -21,7 +21,7 @@ vpc:
     publicAccess: true
 addons:
   - name: vpc-cni
-    version: 1.16.0
+    version: 1.19.2
     configurationValues: '{"env":{"ENABLE_PREFIX_DELEGATION":"true", "ENABLE_POD_ENI":"true", "POD_SECURITY_GROUP_ENFORCING_MODE":"standard"},"enableNetworkPolicy": "true", "nodeAgent": {"enablePolicyEventLogs": "true"}}'
     resolveConflicts: overwrite
 managedNodeGroups:
@@ -31,7 +31,7 @@ managedNodeGroups:
     maxSize: 6
     instanceType: m5.large
     privateNetworking: true
-    releaseVersion: "1.30.0-20240625"
+    releaseVersion: "1.31.3-20250103"
     updateConfig:
       maxUnavailablePercentage: 50
     labels:
diff --git a/cluster/terraform/variables.tf b/cluster/terraform/variables.tf
@@ -7,13 +7,13 @@ variable "cluster_name" {
 variable "cluster_version" {
   description = "EKS cluster version."
   type        = string
-  default     = "1.30"
+  default     = "1.31"
 }
 
 variable "ami_release_version" {
   description = "Default EKS AMI release version for node groups"
   type        = string
-  default     = "1.30.0-20240625"
+  default     = "1.31.3-20250103"
 }
 
 variable "vpc_cidr" {
diff --git a/devenv.lock b/devenv.lock
@@ -0,0 +1,100 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1737028622,
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "4e5b00134bf03f16af6b25b80abb38c598cfe239",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1733477122,
+        "owner": "cachix",
+        "repo": "devenv-nixpkgs",
+        "rev": "7bd9e84d0452f6d2e63b6e6da29fe73fac951857",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "rolling",
+        "repo": "devenv-nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735882644,
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "nixpkgs": "nixpkgs",
+        "pre-commit-hooks": "pre-commit-hooks"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/devenv.nix b/devenv.nix
@@ -0,0 +1,20 @@
+{ pkgs, lib, config, inputs, ... }:
+
+{
+  packages = [ 
+    pkgs.git
+    pkgs.jq
+    pkgs.yq
+    pkgs.pre-commit
+    pkgs.kubectl
+    pkgs.awscli
+  ];
+
+  languages.javascript = {
+    enable = true;
+    package = pkgs.nodejs_20; # Replace with your desired version
+  };
+  languages.typescript.enable = true;
+  languages.javascript.yarn.enable = true;
+  languages.terraform.enable = true;
+}
diff --git a/devenv.yaml b/devenv.yaml
@@ -0,0 +1,6 @@
+# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
+inputs:
+  nixpkgs:
+    url: github:cachix/devenv-nixpkgs/rolling
+
+allowUnfree: true
diff --git a/direnvrc b/direnvrc
@@ -0,0 +1,3 @@
+source_url "https://raw.githubusercontent.com/cachix/devenv/82c0147677e510b247d8b9165c54f73d32dfd899/direnvrc" "sha256-7u4iDd1nZpxL4tCzmPG0dQgC5V+/44Ba+tHkPob1v2k="
+
+use devenv
diff --git a/hack/lib/kubectl-version.sh b/hack/lib/kubectl-version.sh
@@ -1 +1 @@
-export KUBECTL_VERSION='v1.30.2'
+export KUBECTL_VERSION='v1.31.3'
diff --git a/lab/iam/policies/ec2.yaml b/lab/iam/policies/ec2.yaml
@@ -44,6 +44,8 @@ Statement:
       - ec2:DeleteNetworkAclEntry
       - ec2:CreateNatGateway
       - ec2:DeleteNatGateway
+      - ec2:CreateNetworkInterface
+      - ec2:DeleteNetworkInterface
     Resource: ["*"]
   - Effect: Allow
     Action:
diff --git a/lab/iam/policies/labs3.yaml b/lab/iam/policies/labs3.yaml
@@ -13,7 +13,7 @@ Statement:
       - s3:DeleteObject
       - s3:DeleteObjectVersion
     Resource:
-      - arn:aws:s3:::eks-workshop-canary-artifacts*
+      - arn:aws:s3:::${Env}-*
       - arn:aws:s3:::aws-synthetics-library*
   - Effect: Allow
     Action:
diff --git a/lab/scripts/installer.sh b/lab/scripts/installer.sh
@@ -3,7 +3,7 @@
 set -e
 
 # renovate: depName=kubernetes/kubernetes
-kubectl_version='1.30.8'
+kubectl_version='1.31.3'
 
 # renovate: depName=helm/helm
 helm_version='3.16.4'
diff --git a/lab/scripts/setup.sh b/lab/scripts/setup.sh
@@ -38,6 +38,7 @@ function prepare-environment() {
 }
 
 function use-cluster() { bash /usr/local/bin/use-cluster \$1; source ~/.bashrc.d/env.bash; }
+function create-cluster() { URL=https://raw.githubusercontent.com/${REPOSITORY_OWNER}/${REPOSITORY_NAME}/refs/heads/${REPOSITORY_REF}/cluster/eksctl/cluster.yaml; echo "Creating cluster with eksctl from $URL"; curl -fsSL $URL | envsubst | eksctl create cluster -f -; }
 EOT
 
 REPOSITORY_OWNER=${REPOSITORY_OWNER:-"aws-samples"}
diff --git a/manifests/modules/fundamentals/storage/s3/.workshop/cleanup.sh b/manifests/modules/fundamentals/storage/s3/.workshop/cleanup.sh
@@ -4,18 +4,18 @@
 
 set -e
 
+logmessage "Deleting assets-images folder..."
+
 # Delete local directory of image files
 rm -rf ~/environment/assets-images/
 
-logmessage "Deleting assets-images folder..."
-
 addon_exists=$(aws eks list-addons --cluster-name $EKS_CLUSTER_NAME --query "addons[? @ == 'aws-mountpoint-s3-csi-driver']" --output text)
 
+logmessage "Scaling down assets deployment..."
+
 # Scale down assets
 kubectl scale -n assets --replicas=0 deployment/assets
 
-logmessage "Scaling down assets deployment..."
-
 # Check if the S3 CSI driver addon exists
 if [ ! -z "$addon_exists" ]; then
   # Delete if addon exists
@@ -26,10 +26,10 @@ if [ ! -z "$addon_exists" ]; then
   aws eks wait addon-deleted --cluster-name $EKS_CLUSTER_NAME --addon-name aws-mountpoint-s3-csi-driver
 fi
 
+logmessage "Deleting PV and PVC that were created..."
+
 # Delete PVC
 kubectl delete pvc s3-claim -n assets --ignore-not-found=true
 
 # Delete PV
-kubectl delete pv s3-pv --ignore-not-found=true
-
-logmessage "Deleting PV and PVC that were created..."
+kubectl delete pv s3-pv --ignore-not-found=true
diff --git a/manifests/modules/fundamentals/storage/s3/.workshop/terraform/main.tf b/manifests/modules/fundamentals/storage/s3/.workshop/terraform/main.tf
@@ -30,22 +30,4 @@ module "mountpoint_s3_csi_driver_irsa" {
   tags = var.tags
 
   force_detach_policies = true
-}
-
-resource "aws_iam_role_policy" "eks_workshop_ide_s3_put_access" {
-  name = "eks-workshop-ide-s3-put-access"
-  role = "eks-workshop-ide-role"
-
-  policy = <<EOF
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Effect": "Allow",
-      "Action": "s3:PutObject",
-      "Resource": "${aws_s3_bucket.mountpoint_s3.arn}/*"
-    }
-  ]
-}
-EOF
 }
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "lint-staged": "^15.2.7",
     "markdown-link-check": "3.12.2",
     "markdownlint-cli2": "^0.16.0",
-    "npm-run-all": "^4.1.5",
+    "npm-run-all2": "^5.0.0",
     "prettier": "^3.2.5",
     "prettier-plugin-sh": "^0.14.0"
   },
diff --git a/renovate.json b/renovate.json
@@ -23,12 +23,12 @@
     },
     {
       "matchDepNames": ["kubernetes/kubernetes"],
-      "allowedVersions": "/^v1.30.[0-9]+$/"
+      "allowedVersions": "/^v1.31.[0-9]+$/"
     },
     {
       "matchDepNames": ["kubernetes/autoscaler"],
       "extractVersion": "^cluster-autoscaler-(?<version>.*)$",
-      "allowedVersions": "/^1.30.[0-9]+$/"
+      "allowedVersions": "/^1.31.[0-9]+$/"
     },
     {
       "automerge": true,
diff --git a/website/docs/aiml/genai-platform-aiml-delivery/index.md b/website/docs/aiml/genai-platform-aiml-delivery/index.md
@@ -0,0 +1,12 @@
+---
+title: "Gen AI assisted Platform Engineering for MLOps"
+sidebar_custom_props:
+  {
+    "explore": "https://catalog.us-east-1.prod.workshops.aws/modernengg/en-US",
+  }
+sidebar_position: 90
+---
+
+Gen AI assisted Platform Engineering for App Modernization and MLOps workshop improves application development, modernization, MLOps on Amazon EKS by leveraging cutting-edge Generative AI assistant Amazon Q Developer. Learn how to build and apply internal developer platforms on Amazon EKS with self-service application templates, progressive delivery via CI/CD and GitOps, and database modernization using Backstage, Crossplane and AWS Managed services. Harness features like Q Code Transformation and Q Feature Dev to streamline application development, modernize Java and .Net legacy code. AIML Delivery module fosters collaboration between data scientists, ML engineers, and operations teams using MLOps approaches which is essential for organizations to realize the full potential of their AI/ML initiatives.
+
+<LaunchButton url="https://catalog.us-east-1.prod.workshops.aws/modernengg/en-US" label="Gen AI assisted Platform Engineering for MLOps" />
diff --git a/website/docs/networking/vpc-lattice/setup.md b/website/docs/networking/vpc-lattice/setup.md
@@ -31,9 +31,10 @@ $ aws ec2 authorize-security-group-ingress --group-id $CLUSTER_SG --ip-permissio
 }
 ```
 
-This step will install the controller and the CRDs (Custom Resource Definitions) required to interact with the Kubernetes Gateway API.
+This step will install the Kubernetes Gateway API CRDs as well as the VPC Lattice controller that provide an implementation of that API:
 
 ```bash wait=30
+$ kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.0/standard-install.yaml
 $ aws ecr-public get-login-password --region us-east-1 \
   | helm registry login --username AWS --password-stdin public.ecr.aws
 $ helm install gateway-api-controller \
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
@@ -73,8 +73,8 @@ const config = {
                   MANIFESTS_REF: manifestsRef,
                   MANIFESTS_OWNER: manifestsOwner,
                   MANIFESTS_REPOSITORY: manifestsRepository,
-                  KUBERNETES_VERSION: "1.30",
-                  KUBERNETES_NODE_VERSION: "1.30-eks-036c24b",
+                  KUBERNETES_VERSION: "1.31",
+                  KUBERNETES_NODE_VERSION: "1.31-eks-036c24b",
                 },
               },
             ],
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@ variable "cluster_name" {`
`7`	`7`	`variable "cluster_version" {`
`8`	`8`	`description = "EKS cluster version."`
`9`	`9`	`type = string`
`10`		`- default = "1.30"`
	`10`	`+ default = "1.31"`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`variable "ami_release_version" {`
`14`	`14`	`description = "Default EKS AMI release version for node groups"`
`15`	`15`	`type = string`
`16`		`- default = "1.30.0-20240625"`
	`16`	`+ default = "1.31.3-20250103"`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`variable "vpc_cidr" {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+source_url "https://raw.githubusercontent.com/cachix/devenv/82c0147677e510b247d8b9165c54f73d32dfd899/direnvrc" "sha256-7u4iDd1nZpxL4tCzmPG0dQgC5V+/44Ba+tHkPob1v2k="`
	`2`	`+`
	`3`	`+use devenv`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export KUBECTL_VERSION='v1.30.2'`
	`1`	`+export KUBECTL_VERSION='v1.31.3'`