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

Fix errors while updating existing CRD #971

Merged
merged 2 commits into from Apr 5, 2018
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
5 changes: 4 additions & 1 deletion test/e2e/e2e.go
Expand Up @@ -48,6 +48,10 @@ var _ = BeforeSuite(func() {

root = framework.New(operatorConfig, options.TestNamespace, options.Cleanup)

if options.OperatorOnly { // run operator locally without running tests
root.Operator.RunInformers(nil)
}

By("Ensuring Test Namespace " + options.TestNamespace)
err = root.EnsureNamespace()
Expect(err).NotTo(HaveOccurred())
Expand All @@ -56,7 +60,6 @@ var _ = BeforeSuite(func() {

if !meta.PossiblyInCluster() {
go root.Operator.RunInformers(nil)
// select {} // run operator locally without running tests
}

Eventually(invocation.Ingress.Setup).Should(BeNil())
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/options.go
Expand Up @@ -24,6 +24,7 @@ type E2EOptions struct {
TestCertificate bool
DumpLocation string
LBPersistIP string
OperatorOnly bool
}

var (
Expand All @@ -34,6 +35,7 @@ var (
Cleanup: true,
TestCertificate: false,
DumpLocation: os.TempDir(),
OperatorOnly: false,
}
)

Expand All @@ -46,6 +48,7 @@ func init() {
flag.BoolVar(&options.TestCertificate, "cert", options.TestCertificate, "")
flag.StringVar(&options.DumpLocation, "dump", os.TempDir(), "")
flag.StringVar(&options.LBPersistIP, "lb-ip", options.LBPersistIP, "LoadBalancer persistent IP")
flag.BoolVar(&options.OperatorOnly, "operator-only", options.OperatorOnly, "run operator locally without running tests")
enableLogging()
}

Expand Down

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

4 changes: 2 additions & 2 deletions vendor/github.com/appscode/kutil/core/v1/pod.go

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

17 changes: 17 additions & 0 deletions vendor/github.com/appscode/kutil/core/v1/service.go

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

8 changes: 4 additions & 4 deletions vendor/github.com/appscode/kutil/tools/analytics/analytics.go

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