Skip to content

Commit 25aca14

Browse files
authored
Merge pull request #257 from mengqiy/update_testing_framework
🐛 fix flag in testenv
2 parents 99de6ad + f70e2dc commit 25aca14

File tree

10 files changed

+80
-73
lines changed

10 files changed

+80
-73
lines changed

Gopkg.lock

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ required = ["sigs.k8s.io/testing_frameworks/integration",
4444
name = "k8s.io/client-go"
4545
version = "kubernetes-1.12.3"
4646

47+
[[constraint]]
48+
name = "sigs.k8s.io/testing_frameworks"
49+
version = "v0.1.1"
50+
4751
[[constraint]]
4852
name = "github.com/onsi/ginkgo"
4953
version = "v1.5.0"
@@ -67,9 +71,6 @@ required = ["sigs.k8s.io/testing_frameworks/integration",
6771
# these are not listed explicitly until we get version tags,
6872
# since dep doesn't like bare revision dependencies
6973

70-
# [[constraint]]
71-
# name = "sigs.k8s.io/testing_frameworks"
72-
#
7374
# [[constraint]]
7475
# name = "github.com/go-logr/logr"
7576
#

pkg/envtest/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ var DefaultKubeAPIServerFlags = []string{
5959
"--cert-dir={{ .CertDir }}",
6060
"--insecure-port={{ if .URL }}{{ .URL.Port }}{{ end }}",
6161
"--insecure-bind-address={{ if .URL }}{{ .URL.Hostname }}{{ end }}",
62-
"--secure-port=0",
62+
"--secure-port={{ if .SecurePort }}{{ .SecurePort }}{{ end }}",
6363
"--admission-control=AlwaysAdmit",
6464
}
6565

vendor/sigs.k8s.io/testing_frameworks/integration/addr/manager.go

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/testing_frameworks/integration/apiserver.go

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/testing_frameworks/integration/doc.go

Lines changed: 17 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/testing_frameworks/integration/etcd.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/testing_frameworks/integration/internal/address_manager.go

Lines changed: 0 additions & 53 deletions
This file was deleted.

vendor/sigs.k8s.io/testing_frameworks/integration/internal/apiserver.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/testing_frameworks/integration/internal/process.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)