Merge pull request #218 from dandi/tmp-ben-workshop

Author: asmacdo

addons.tf

@@ -108,8 +108,11 @@ module "eks_blueprints_addons" {
     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
+      controller:
+        image:
+          repository: public.ecr.aws/karpenter/controller
+          tag: "0.35.0"
+          digest: "sha256:48d1246f6b2066404e300cbf3e26d0bcdc57a76531dcb634d571f4f0e050cb57"
     EOT
     ]
   }

envs/shared/jupyterhub.yaml

@@ -50,7 +50,7 @@ singleuser:
               display_name: "Standard"
               default: true
               kubespawner_override:
-                image: "${singleuser_image_repo}:${singleuser_image_tag}-base"
+                image: "${singleuser_image_repo}:${singleuser_image_tag}"
       kubespawner_override:
         image_pull_policy: Always
         cpu_limit: 2
@@ -69,7 +69,7 @@ singleuser:
     #           display_name: "Standard"
     #           default: true
     #           kubespawner_override:
-    #             image: "${singleuser_image_repo}:${singleuser_image_tag}-base"
+    #             image: "${singleuser_image_repo}:${singleuser_image_tag}"
     #         matlab:
     #           display_name: "MATLAB (must provide your own license)"
     #           kubespawner_override:
@@ -93,7 +93,7 @@ singleuser:
               display_name: "Standard"
               default: true
               kubespawner_override:
-                image: "${singleuser_image_repo}:${singleuser_image_tag}-base"
+                image: "${singleuser_image_repo}:${singleuser_image_tag}"
             matlab:
               display_name: "MATLAB (must provide your own license)"
               kubespawner_override:
@@ -118,7 +118,7 @@ singleuser:
               display_name: "Standard"
               default: true
               kubespawner_override:
-                image: "${singleuser_image_repo}:${singleuser_image_tag}-base"
+                image: "${singleuser_image_repo}:${singleuser_image_tag}"
             matlab:
               display_name: "MATLAB (must provide your own license)"
               kubespawner_override:
@@ -141,7 +141,7 @@ singleuser:
               display_name: "Standard"
               default: true
               kubespawner_override:
-                image: "${singleuser_image_repo}:${singleuser_image_tag}-base"
+                image: "${singleuser_image_repo}:${singleuser_image_tag}"
             matlab:
               display_name: "MATLAB (must provide your own license)"
               kubespawner_override:

variables.tf

@@ -16,7 +16,7 @@ variable "region" {
 
 variable "eks_cluster_version" {
   description = "EKS Cluster version"
-  default     = "1.28"
+  default     = "1.29"
   type        = string
 }