From 7eb2e5efa08be31f846b3e68ef6edc8a270e9646 Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Wed, 16 Oct 2019 16:24:34 +0100
Subject: [PATCH] No longer use arch-specific acmesolver image

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 cmd/controller/app/options/options.go | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/cmd/controller/app/options/options.go b/cmd/controller/app/options/options.go
index 67dfec808..6012b9fc6 100644
--- a/cmd/controller/app/options/options.go
+++ b/cmd/controller/app/options/options.go
@@ -19,7 +19,6 @@ package options
 import (
 	"fmt"
 	"net"
-	"runtime"
 	"time"
 
 	"github.com/spf13/pflag"
@@ -137,16 +136,8 @@ var (
 	}
 )
 
-func computeACMEHTTP01SolverImage(arch string) string {
-	if arch == "amd64" {
-		return fmt.Sprintf("quay.io/jetstack/cert-manager-acmesolver:%s", util.AppVersion)
-	} else {
-		return fmt.Sprintf("quay.io/jetstack/cert-manager-acmesolver-%s:%s", runtime.GOARCH, util.AppVersion)
-	}
-}
-
 var (
-	defaultACMEHTTP01SolverImage                 = computeACMEHTTP01SolverImage(runtime.GOARCH)
+	defaultACMEHTTP01SolverImage                 = fmt.Sprintf("quay.io/jetstack/cert-manager-acmesolver:%s", util.AppVersion)
 	defaultACMEHTTP01SolverResourceRequestCPU    = "10m"
 	defaultACMEHTTP01SolverResourceRequestMemory = "64Mi"
 	defaultACMEHTTP01SolverResourceLimitsCPU     = "100m"