From 45f89f66ea7e4b0d9ca6a626e0c3bb7d1306a020 Mon Sep 17 00:00:00 2001
From: sochat1 <sochat1@llnl.gov>
Date: Sun, 25 Jun 2023 21:30:28 -0700
Subject: [PATCH 1/3] add support for hpc7g arm images

Signed-off-by: sochat1 <sochat1@llnl.gov>
---
 pkg/utils/instance/instance.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/utils/instance/instance.go b/pkg/utils/instance/instance.go
index 024012bb3a..3d6c540274 100644
--- a/pkg/utils/instance/instance.go
+++ b/pkg/utils/instance/instance.go
@@ -20,6 +20,7 @@ func IsARMInstanceType(instanceType string) bool {
 		strings.HasPrefix(instanceType, "im4g") ||
 		strings.HasPrefix(instanceType, "is4g") ||
 		strings.HasPrefix(instanceType, "g5g") ||
+		strings.HasPrefix(instanceType, "hpc7g") ||
 		strings.HasPrefix(instanceType, "x2g")
 }
 

From 9141821a36d3e29bb89d9bdc15511da2aeb8123e Mon Sep 17 00:00:00 2001
From: sochat1 <sochat1@llnl.gov>
Date: Sun, 25 Jun 2023 21:49:51 -0700
Subject: [PATCH 2/3] update efa-device-plugin.yaml to one that workkks

Signed-off-by: sochat1 <sochat1@llnl.gov>
---
 pkg/addons/assets/efa-device-plugin.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/addons/assets/efa-device-plugin.yaml b/pkg/addons/assets/efa-device-plugin.yaml
index 657a74bd27..0cf0e77793 100644
--- a/pkg/addons/assets/efa-device-plugin.yaml
+++ b/pkg/addons/assets/efa-device-plugin.yaml
@@ -37,7 +37,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
               - matchExpressions:
-                  - key: "beta.kubernetes.io/instance-type"
+                  - key: "node.kubernetes.io/instance-type"
                     operator: In
                     values:
                       - c5n.18xlarge
@@ -62,6 +62,7 @@ spec:
                       - g6.24xlarge
                       - g6.48xlarge
                       - hpc6a.48xlarge
+                      - hpc7g.16xlarge
                       - i3en.12xlarge
                       - i3en.24xlarge
                       - i3en.metal
@@ -124,6 +125,7 @@ spec:
                       - g6.24xlarge
                       - g6.48xlarge
                       - hpc6a.48xlarge
+                      - hpc7g.16xlarge
                       - i3en.12xlarge
                       - i3en.24xlarge
                       - i3en.metal
@@ -175,3 +177,4 @@ spec:
         - name: device-plugin
           hostPath:
             path: /var/lib/kubelet/device-plugins
+

From f95076b2daa7490918a9bd99fe5787a49c884970 Mon Sep 17 00:00:00 2001
From: vsoch <vsoch@users.noreply.github.com>
Date: Fri, 30 Jun 2023 09:29:46 -0600
Subject: [PATCH 3/3] add additional hpc7g instance types

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
---
 pkg/addons/assets/efa-device-plugin.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/addons/assets/efa-device-plugin.yaml b/pkg/addons/assets/efa-device-plugin.yaml
index 0cf0e77793..7227d5ff62 100644
--- a/pkg/addons/assets/efa-device-plugin.yaml
+++ b/pkg/addons/assets/efa-device-plugin.yaml
@@ -63,6 +63,8 @@ spec:
                       - g6.48xlarge
                       - hpc6a.48xlarge
                       - hpc7g.16xlarge
+                      - hpc7g.8xlarge
+                      - hpc7g.4xlarge
                       - i3en.12xlarge
                       - i3en.24xlarge
                       - i3en.metal
@@ -126,6 +128,8 @@ spec:
                       - g6.48xlarge
                       - hpc6a.48xlarge
                       - hpc7g.16xlarge
+                      - hpc7g.8xlarge
+                      - hpc7g.4xlarge
                       - i3en.12xlarge
                       - i3en.24xlarge
                       - i3en.metal