Merge branch 'master' into update-email-datacommons

uc-cdis · Aug 20, 2024 · 65b8154 · 65b8154
2 parents a889f64 + 6a73667
commit 65b8154
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 26 deletions.
diff --git a/kube/services/karpenter/nodeTemplateDefault.yaml b/kube/services/karpenter/nodeTemplateDefault.yaml
@@ -3,6 +3,9 @@ kind: AWSNodeTemplate
 metadata:
   name: default
 spec:
+  amiSelector:
+    aws::name: EKS-FIPS*
+    aws::owners: "143731057154"
   subnetSelector:
     karpenter.sh/discovery: VPC_NAME
   securityGroupSelector:
@@ -32,30 +35,12 @@ spec:
 
     sysctl -w fs.inotify.max_user_watches=12000
 
-    sudo yum update -y
-    sudo yum install -y dracut-fips openssl >> /opt/fips-install.log
-    sudo  dracut -f
-    # configure grub
-    sudo /sbin/grubby --update-kernel=ALL --args="fips=1"
-
     # --BOUNDARY
     # Content-Type: text/cloud-config; charset="us-ascii"
 
     # mounts:
     #   - ['fstype': 'bpf', 'mountpoint': '/sys/fs/bpf', 'opts': 'rw,relatime']
 
-    --BOUNDARY
-
-    Content-Type: text/cloud-config; charset="us-ascii"
-
-    power_state:
-      delay: now
-      mode: reboot
-      message: Powering off
-      timeout: 2
-      condition: true
-
-
     --BOUNDARY--
   blockDeviceMappings:
     - deviceName: /dev/xvda

diff --git a/kube/services/karpenter/provisionerDefault.yaml b/kube/services/karpenter/provisionerDefault.yaml
@@ -11,14 +11,14 @@ spec:
     - key: kubernetes.io/arch
       operator: In
       values:
-      - amd64
+        - amd64
     - key: karpenter.k8s.aws/instance-category
       operator: In
       values:
-      - c
-      - m
-      - r
-      - t       
+        - c
+        - m
+        - r
+        - t
   # Set a limit of 1000 vcpus
   limits:
     resources:
@@ -30,6 +30,4 @@ spec:
   consolidation:
     enabled: true
   # Kill nodes after 30 days to ensure they stay up to date
-  ttlSecondsUntilExpired: 2592000
-
-
+  ttlSecondsUntilExpired: 604800