weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1419 from DanielMorsing/enable_httpstest

Browse Source 
Enable https redirect test
This commit is contained in:
jetstack-bot 2019-02-28 15:05:11 +00:00 committed by GitHub
commit c07bfd7181
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@ -148,7 +148,7 @@ go_repository(
## field in this rule
go_repository(
name = "org_letsencrypt_pebble",
commit = "cdd3ed3ddfdf9da7ab27fbe1fe032d0865b65376",
commit = "2e69bb16af048c491720f23cb284fce685e65fec",
importpath = "github.com/letsencrypt/pebble",
build_external = "vendored",
# Expose the generated go_default_library as 'public' visibility
@ -162,7 +162,7 @@ container_pull(
name = "io_kubernetes_ingress-nginx",
registry = "quay.io",
repository = "kubernetes-ingress-controller/nginx-ingress-controller",
tag = "0.21.0",
tag = "0.23.0",
)
container_pull(

2
hack/ci/lib/build_images.sh
View File

@ -43,7 +43,7 @@ build_images() {
"${DOCKER_REPO}"/cert-manager-acmesolver:"${DOCKER_TAG}" \
"${DOCKER_REPO}"/cert-manager-webhook:"${DOCKER_TAG}" \
"pebble:bazel" \
"quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.21.0" \
"quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.23.0" \
"k8s.gcr.io/defaultbackend:bazel" \
"vault:bazel" \
"gcr.io/kubernetes-helm/tiller:bazel" \

2
test/e2e/BUILD.bazel
View File

@ -6,7 +6,7 @@ container_bundle(
images = {
# A set of images to bundle up into a single tarball.
"pebble:bazel": "//test/e2e/charts/pebble:image",
"quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.21.0": "@io_kubernetes_ingress-nginx//image",
"quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.23.0": "@io_kubernetes_ingress-nginx//image",
"k8s.gcr.io/defaultbackend:bazel": "@io_gcr_k8s_defaultbackend//image",
"vault:bazel": "@com_hashicorp_vault//image",
"gcr.io/kubernetes-helm/tiller:bazel": "@io_gcr_helm_tiller//image",

2
test/e2e/charts/BUILD.bazel
View File

@ -5,7 +5,7 @@ container_bundle(
images = {
# A set of images to bundle up into a single tarball.
"pebble:bazel": "//test/e2e/charts/pebble:image",
"quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.21.0": "@io_kubernetes_ingress-nginx//image",
"quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.23.0": "@io_kubernetes_ingress-nginx//image",
"k8s.gcr.io/defaultbackend:bazel": "@io_gcr_k8s_defaultbackend//image",
"vault:bazel": "@com_hashicorp_vault//image",
"gcr.io/kubernetes-helm/tiller:bazel": "@io_gcr_helm_tiller//image",

15
test/e2e/framework/addon/nginxingress/nginx.go
View File

@ -100,7 +100,7 @@ func (n *Nginx) Setup(cfg *config.Config) error {
},
{
Key: "controller.image.tag",
Value: "0.21.0",
Value: "0.23.0",
},
{
Key: "defaultBackend.image.pullPolicy",
@ -120,15 +120,10 @@ func (n *Nginx) Setup(cfg *config.Config) error {
},
// nginx-ingress will by default not redirect http to https if
// the url is ".well-known"
// we should disable this behavior once nginx-ingress can handle
// redirects properly
// see https://github.com/kubernetes/ingress-nginx/issues/3192
/*
{
Key: "controller.config.no-tls-redirect-locations",
Value: "",
},
*/
{
Key: "controller.config.no-tls-redirect-locations",
Value: "",
},
},
}
err = n.chart.Setup(cfg)

2
test/e2e/suite/issuers/acme/certificate/http01.go
View File

@ -230,8 +230,6 @@ var _ = framework.CertManagerDescribe("ACME Certificate (HTTP01)", func() {
})
It("should obtain a signed certificate with a single CN from the ACME server when redirected", func() {
// if this skip is removed, remember to re-enable no-tls-redirects in nginx-ingress addons
Skip("nginx-ingress bug stops pebble from getting a certificate https://github.com/kubernetes/ingress-nginx/issues/3192")
certClient := f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name)