Merge pull request #2381 from FabianKramm/main

FabianKramm · web-flow · commit 4aadfe774ddd · 2022-10-20T13:18:26.000+02:00
fix: arch detection in DevSpace
diff --git a/pkg/devspace/services/inject/inject.go b/pkg/devspace/services/inject/inject.go
@@ -67,10 +67,10 @@ func InjectDevSpaceHelper(ctx context.Context, client kubectl.Client, pod *v1.Po
 			arch = "-" + arch
 		}
 	} else {
-		// check arch on pod node\
+		// check arch on pod node
 		stdout, _, err := client.ExecBuffered(ctx, pod, container, []string{"uname", "-a"}, nil)
-		if err != nil {
-			if strings.Contains(string(stdout), "arm64") {
+		if err == nil {
+			if strings.Contains(string(stdout), "arm64") || strings.Contains(string(stdout), "aarch64") {
 				arch = "-" + string(latest.ContainerArchitectureArm64)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@ func InjectDevSpaceHelper(ctx context.Context, client kubectl.Client, pod *v1.Po`
`67`	`67`	`arch = "-" + arch`
`68`	`68`	`}`
`69`	`69`	`} else {`
`70`		`- // check arch on pod node\`
	`70`	`+ // check arch on pod node`
`71`	`71`	`stdout, _, err := client.ExecBuffered(ctx, pod, container, []string{"uname", "-a"}, nil)`
`72`		`- if err != nil {`
`73`		`- if strings.Contains(string(stdout), "arm64") {`
	`72`	`+ if err == nil {`
	`73`	`+ if strings.Contains(string(stdout), "arm64") \|\| strings.Contains(string(stdout), "aarch64") {`
`74`	`74`	`arch = "-" + string(latest.ContainerArchitectureArm64)`
`75`	`75`	`}`
`76`	`76`	`}`