feat: add zarf variable for what arch the package was built against

Signed-off-by: Allen Conlon <[email protected]>

Author: a1994sc

packages/gitea/gitea-values.yaml

@@ -8,6 +8,9 @@ persistence:
 
 replicaCount: ###ZARF_VAR_GIT_SERVER_REPLICA_COUNT###
 
+nodeSelector:
+  kubernetes.io/arch: "###ZARF_ARCHITECTURE###"
+
 gitea:
   admin:
     username: "###ZARF_GIT_PUSH###"

packages/zarf-agent/manifests/deployment.yaml

@@ -17,6 +17,8 @@ spec:
         # Don't mutate this pod, that would be sad times
         zarf.dev/agent: ignore
     spec:
+      nodeSelector:
+        kubernetes.io/arch: "###ZARF_ARCHITECTURE###"
       imagePullSecrets:
         - name: private-registry
       priorityClassName: system-node-critical

packages/zarf-registry/chart/templates/deployment.yaml

@@ -26,6 +26,10 @@ spec:
       annotations:
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
     spec:
+{{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .  | indent 8 }}
+{{- end }}
       serviceAccountName: {{ include "docker-registry.serviceAccountName" . }}
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:

packages/zarf-registry/chart/values.yaml

@@ -87,3 +87,5 @@ serviceAccount:
   create: false
   name: ""
   annotations: {}
+
+nodeSelector: {}

packages/zarf-registry/registry-values.yaml

@@ -62,3 +62,6 @@ serviceAccount:
   name: "###ZARF_VAR_REGISTRY_SERVICE_ACCOUNT_NAME###"
   annotations:
     ###ZARF_VAR_REGISTRY_SERVICE_ACCOUNT_ANNOTATIONS###
+
+nodeSelector:
+  kubernetes.io/arch: "###ZARF_ARCHITECTURE###"

src/internal/packager/template/template_test.go

@@ -44,12 +44,14 @@ func TestGetSanitizedTemplateMap(t *testing.T) {
 				"###ZARF_GIT_AUTH_PUSH###": {Sensitive: true, Value: "secret2"},
 				"###ZARF_GIT_PUSH###":      {Sensitive: false, Value: "zarf-git-user"},
 				"###ZARF_GIT_PULL###":      {Sensitive: false, Value: "zarf-git-read-user"},
+				"###ZARF_ARCHITECTURE###":  {Sensitive: false, Value: "amd64"},
 			},
 			expected: map[string]string{
 				"###ZARF_GIT_AUTH_PULL###": "**sanitized**",
 				"###ZARF_GIT_AUTH_PUSH###": "**sanitized**",
 				"###ZARF_GIT_PULL###":      "zarf-git-read-user",
 				"###ZARF_GIT_PUSH###":      "zarf-git-user",
+				"###ZARF_ARCHITECTURE###":  "amd64",
 			},
 		},
 		{

src/pkg/cluster/injector.go

@@ -35,7 +35,7 @@ import (
 )
 
 // StartInjection initializes a Zarf injection into the cluster.
-func (c *Cluster) StartInjection(ctx context.Context, tmpDir, imagesDir string, injectorSeedSrcs []string) error {
+func (c *Cluster) StartInjection(ctx context.Context, tmpDir, imagesDir string, architecture string, injectorSeedSrcs []string) error {
 	l := logger.From(ctx)
 	start := time.Now()
 	// Stop any previous running injection before starting.
@@ -93,7 +93,7 @@ func (c *Cluster) StartInjection(ctx context.Context, tmpDir, imagesDir string,
 	// TODO: Remove use of passing data through global variables.
 	config.ZarfSeedPort = fmt.Sprintf("%d", svc.Spec.Ports[0].NodePort)
 
-	pod := buildInjectionPod(injectorNodeName, injectorImage, payloadCmNames, shasum, resReq)
+	pod := buildInjectionPod(injectorNodeName, injectorImage, payloadCmNames, shasum, resReq, architecture)
 	_, err = c.Clientset.CoreV1().Pods(*pod.Namespace).Apply(ctx, pod, metav1.ApplyOptions{Force: true, FieldManager: FieldManagerName})
 	if err != nil {
 		return fmt.Errorf("error creating pod in cluster: %w", err)
@@ -308,7 +308,7 @@ func hasBlockingTaints(taints []corev1.Taint) bool {
 	return false
 }
 
-func buildInjectionPod(nodeName, image string, payloadCmNames []string, shasum string, resReq *v1ac.ResourceRequirementsApplyConfiguration) *v1ac.PodApplyConfiguration {
+func buildInjectionPod(nodeName, image string, payloadCmNames []string, shasum string, resReq *v1ac.ResourceRequirementsApplyConfiguration, architecture string) *v1ac.PodApplyConfiguration {
 	executeMode := int32(0777)
 	userID := int64(1000)
 	groupID := int64(2000)
@@ -367,6 +367,9 @@ func buildInjectionPod(nodeName, image string, payloadCmNames []string, shasum s
 								WithType(corev1.SeccompProfileTypeRuntimeDefault),
 						),
 				).
+				WithNodeSelector(map[string]string{
+					"kubernetes.io/arch": architecture,
+				}).
 				WithContainers(
 					v1ac.Container().
 						WithName("injector").

src/pkg/cluster/injector_test.go

@@ -107,7 +107,7 @@ func TestInjector(t *testing.T) {
 		_, err = layout.Write(filepath.Join(tmpDir, "seed-images"), idx)
 		require.NoError(t, err)
 
-		err = c.StartInjection(ctx, tmpDir, t.TempDir(), nil)
+		err = c.StartInjection(ctx, tmpDir, t.TempDir(), "amd64", nil)
 		require.NoError(t, err)
 
 		podList, err := cs.CoreV1().Pods(state.ZarfNamespaceName).List(ctx, metav1.ListOptions{})
@@ -163,7 +163,7 @@ func TestBuildInjectionPod(t *testing.T) {
 				corev1.ResourceCPU:    resource.MustParse("1"),
 				corev1.ResourceMemory: resource.MustParse("256Mi"),
 			})
-	pod := buildInjectionPod("injection-node", "docker.io/library/ubuntu:latest", []string{"foo", "bar"}, "shasum", resReq)
+	pod := buildInjectionPod("injection-node", "docker.io/library/ubuntu:latest", []string{"foo", "bar"}, "shasum", resReq, "amd64")
 	require.Equal(t, "injector", *pod.Name)
 	b, err := json.MarshalIndent(pod, "", "  ")
 	require.NoError(t, err)

src/pkg/cluster/testdata/expected-injection-pod.json

@@ -98,6 +98,9 @@
       }
     ],
     "restartPolicy": "Never",
+    "nodeSelector": {
+      "kubernetes.io/arch": "amd64"
+    },
     "nodeName": "injection-node",
     "securityContext": {
       "runAsUser": 1000,

src/pkg/packager/deploy.go

@@ -73,7 +73,7 @@ type deployer struct {
 // Deploy takes a reference to a `layout.PackageLayout` and deploys the package. If successful, returns a list of components that were successfully deployed.
 func Deploy(ctx context.Context, pkgLayout *layout.PackageLayout, opts DeployOptions) ([]state.DeployedComponent, error) {
 	l := logger.From(ctx)
-	l.Info("starting deploy", "package", pkgLayout.Pkg.Metadata.Name)
+	l.Info("starting deploy", "package", pkgLayout.Pkg.Metadata.Name, "architecture", pkgLayout.Pkg.Metadata.Architecture)
 	start := time.Now()
 	if opts.NamespaceOverride != "" {
 		if err := OverridePackageNamespace(pkgLayout.Pkg, opts.NamespaceOverride); err != nil {
@@ -267,7 +267,7 @@ func (d *deployer) deployInitComponent(ctx context.Context, pkgLayout *layout.Pa
 
 	// Before deploying the seed registry, start the injector
 	if isSeedRegistry {
-		err := d.c.StartInjection(ctx, pkgLayout.DirPath(), pkgLayout.GetImageDirPath(), component.Images)
+		err := d.c.StartInjection(ctx, pkgLayout.DirPath(), pkgLayout.GetImageDirPath(), pkgLayout.Pkg.Metadata.Architecture, component.Images)
 		if err != nil {
 			return nil, err
 		}
@@ -329,6 +329,13 @@ func (d *deployer) deployComponent(ctx context.Context, pkgLayout *layout.Packag
 	}
 
 	applicationTemplates, err := template.GetZarfTemplates(ctx, component.Name, d.s)
+
+	// This variable needs to be set from the package metadata architecture
+	// This might be able to be expanded to include all the .metadata settings
+	applicationTemplates["###ZARF_ARCHITECTURE###"] = &variables.TextTemplate{
+		Value: pkgLayout.Pkg.Metadata.Architecture,
+	}
+
 	if err != nil {
 		return nil, err
 	}
@@ -595,6 +602,7 @@ func setupState(ctx context.Context, c *cluster.Cluster, pkg v1alpha1.ZarfPackag
 	if s == nil {
 		return nil, errors.New("cluster state should not be nil")
 	}
+	s.Architecture = pkg.Metadata.Architecture
 	if pkg.Metadata.YOLO && s.Distro != "YOLO" {
 		l.Warn("This package is in YOLO mode, but the cluster was already initialized with 'zarf init'. " +
 			"This may cause issues if the package does not exclude any charts or manifests from the Zarf Agent using " +