Make preferred architexture empty by default

charts/noe/templates/webhook.yaml

@@ -88,7 +88,9 @@ spec:
         workingDir: /workdir
         args:
         - --registry-proxies={{ .Values.proxies | join "," }}
+{{ if .Values.schedulableArchitectures }}
         - --cluster-schedulable-archs={{ .Values.schedulableArchitectures | join "," }}
+{{ end }}
 {{ if and .Values.kubeletConfig .Values.kubeletConfig.binDir }}
         - --image-credential-provider-bin-dir={{ .Values.kubeletConfig.binDir }}
 {{ end }}
@@ -97,6 +99,9 @@ spec:
 {{ end }}
 {{ if .Values.privateRegistries }}
         - --private-registries={{ .Values.privateRegistries | join "," }}
+{{ end }}
+{{ if .Values.preferredArchitecture }}
+        - --preferred-arch={{ .Values.preferredArchitecture }}
 {{ end }}
         ports:
         - containerPort: 8443

charts/noe/values.yaml

@@ -6,6 +6,7 @@ image:
   registry: ghcr.io
   repository: adevinta/noe
   tag: latest
+preferredArchitecture: ""
 schedulableArchitectures: []
 proxies: []
 # - docker.io=docker-proxy.company.corp

cmd/noe/main.go

@@ -35,7 +35,7 @@ func main() {
 	var kubeletImageCredentialProviderBinBir, kubeletImageCredentialProviderConfig string
 	var privateregistriesPatterns string
 
-	flag.StringVar(&preferredArch, "preferred-arch", "amd64", "Preferred architecture when placing pods")
+	flag.StringVar(&preferredArch, "preferred-arch", "", "Preferred architecture when placing pods")
 	flag.StringVar(&schedulableArchs, "cluster-schedulable-archs", "", "Comma separated list of architectures schedulable in the cluster")
 	flag.StringVar(&systemOS, "system-os", "linux", "Sole OS supported by the system")
 	flag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")

pkg/arch/hook_test.go

@@ -457,6 +457,56 @@ func TestHookHonorsDefaultPreferredArch(t *testing.T) {
 	)
 }
 
+func TestHookSelectsAllMatchingArthitecturesWhenPreferredArchIsNotSet(t *testing.T) {
+	resp := runWebhookTest(
+		t,
+		NewHandler(
+			fake.NewClientBuilder().Build(),
+			RegistryFunc(func(ctx context.Context, imagePullSecret, image string) ([]registry.Platform, error) {
+				assert.Equal(t, "ubuntu", image)
+				return []registry.Platform{
+					{OS: "linux", Architecture: "arm64"},
+					{OS: "linux", Architecture: "amd64"},
+					{OS: "windows", Architecture: "amd64"},
+				}, nil
+			}),
+			WithOS("linux"),
+		),
+		&v1.Pod{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: "test",
+				Name:      "object",
+			},
+			Spec: v1.PodSpec{
+				Containers: []v1.Container{
+					{
+						Image: "ubuntu",
+					},
+				},
+			},
+		},
+	)
+	assert.True(t, resp.Allowed)
+	assert.Equal(t, http.StatusOK, int(resp.Result.Code))
+	require.Len(t, resp.Patches, 1)
+	assert.Contains(
+		t,
+		resp.Patches,
+		archNodeSelectorPatchForArchs("amd64", "arm64"),
+	)
+	assert.NotContains(
+		t,
+		resp.Patches,
+		jsonpatch.Operation{
+			Operation: "add",
+			Path:      "/spec/nodeSelector",
+			Value: map[string]interface{}{
+				"kubernetes.io/arch": "amd64",
+			},
+		},
+	)
+}
+
 func TestHookAcceptsMultipleImagesAndAddsSelector(t *testing.T) {
 	resp := runWebhookTest(
 		t,