Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Prometheus operator dependency to 0.13.0 #609

Merged
merged 1 commit into from Oct 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion glide.yaml
Expand Up @@ -18,7 +18,7 @@ import:
version: v1.7.0
- package: github.com/benbjohnson/clock
- package: github.com/coreos/prometheus-operator
version: v0.12.0
version: v0.13.0
- package: github.com/ghodss/yaml
version: v1.0.0
- package: github.com/golang/glog
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/ingress_basicauth.go
Expand Up @@ -2,6 +2,7 @@ package e2e

import (
"net/http"
"time"

api "github.com/appscode/voyager/apis/voyager/v1beta1"
"github.com/appscode/voyager/test/framework"
Expand All @@ -11,7 +12,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
apiv1 "k8s.io/client-go/pkg/api/v1"
"time"
)

var _ = Describe("IngressWithBasicAuth", func() {
Expand Down Expand Up @@ -448,7 +448,7 @@ var _ = Describe("IngressWithBasicAuth", func() {
Expect(err).NotTo(HaveOccurred())

// Wait for update to be done
time.Sleep(time.Second*30)
time.Sleep(time.Second * 30)

err = f.Ingress.DoHTTPStatus(framework.NoRetry, ing, eps, "GET", "/testpath", func(r *testserverclient.Response) bool {
return Expect(r.Status).Should(Equal(http.StatusUnauthorized))
Expand Down
67 changes: 67 additions & 0 deletions vendor/github.com/appscode/kutil/util.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions vendor/github.com/golang/glog/glog.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.