Skip to content

Commit

Permalink
e2e: remove workarounds for etcd2 test jobs
Browse files Browse the repository at this point in the history
Now we've removed support for etcd2, we should make sure we're testing
chunking fully.
  • Loading branch information
justinsb committed Oct 11, 2018
1 parent 6b9de2b commit 9023dae
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
8 changes: 0 additions & 8 deletions test/e2e/apimachinery/chunking.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {
list, err := client.List(opts)
Expect(err).ToNot(HaveOccurred())
framework.Logf("Retrieved %d/%d results with rv %s and continue %s", len(list.Items), opts.Limit, list.ResourceVersion, list.Continue)
// TODO: kops PR job is still using etcd2, which prevents this feature from working. Remove this check when kops is upgraded to etcd3
if len(list.Items) > int(opts.Limit) {
framework.Skipf("ERROR: This cluster does not support chunking, which means it is running etcd2 and not supported.")
}
Expect(len(list.Items)).To(BeNumerically("<=", opts.Limit))

if len(lastRV) == 0 {
Expand Down Expand Up @@ -120,10 +116,6 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {
opts := metav1.ListOptions{}
opts.Limit = oneTenth
list, err := client.List(opts)
// TODO: kops PR job is still using etcd2, which prevents this feature from working. Remove this check when kops is upgraded to etcd3
if len(list.Items) > int(opts.Limit) {
framework.Skipf("ERROR: This cluster does not support chunking, which means it is running etcd2 and not supported.")
}
Expect(err).ToNot(HaveOccurred())
firstToken := list.Continue
firstRV := list.ResourceVersion
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/apimachinery/table_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() {
SetHeader("Accept", "application/json;as=Table;v=v1beta1;g=meta.k8s.io").
Do().Into(pagedTable)
Expect(err).NotTo(HaveOccurred())
// TODO: kops PR job is still using etcd2, which prevents this feature from working. Remove this check when kops is upgraded to etcd3
if len(pagedTable.Rows) > 2 {
framework.Skipf("ERROR: This cluster does not support chunking, which means it is running etcd2 and not supported.")
}
Expect(len(pagedTable.Rows)).To(Equal(2))
Expect(pagedTable.ResourceVersion).ToNot(Equal(""))
Expect(pagedTable.SelfLink).ToNot(Equal(""))
Expand Down

0 comments on commit 9023dae

Please sign in to comment.