Merge pull request #2242 from munnerz/cm-manifestlist-acmesolver

No longer use arch-specific acmesolver image
This commit is contained in:
jetstack-bot 2019-10-17 14:16:14 +01:00 committed by GitHub
commit 66d32a204f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,7 +19,6 @@ package options
import (
"fmt"
"net"
"runtime"
"time"
"github.com/spf13/pflag"
@ -139,16 +138,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"