Collapse on top of upstream ETCD storage test #21412
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
sig/master
size/XXL
deads2k
reviewed
Nov 1, 2018
| @@ -195,8 +195,7 @@ func BuildStorageFactory(server *kapiserveroptions.ServerRunOptions, enforcedSto | |||
| storageFactory.AddCohabitatingResources(apps.Resource("replicasets"), extensions.Resource("replicasets")) | |||
| storageFactory.AddCohabitatingResources(networking.Resource("networkpolicies"), extensions.Resource("networkpolicies")) | |||
| storageFactory.AddCohabitatingResources(security.Resource("securitycontextconstraints"), kapi.Resource("securitycontextconstraints")) | |||
| // TODO: switch to prefer policy API group in 3.11 | |||
| storageFactory.AddCohabitatingResources(extensions.Resource("podsecuritypolicies"), policy.Resource("podsecuritypolicies")) | |||
| storageFactory.AddCohabitatingResources(policy.Resource("podsecuritypolicies"), extensions.Resource("podsecuritypolicies")) | |||
There was a problem hiding this comment.
This matters? If so, it means we're testing the wrong thing.
There was a problem hiding this comment.
Artifact from earlier code, dropped.
enj
force-pushed
the
enj/t/shared_etcd_stubs
branch
from
fc15add
to
38531a1
Compare
|
/retest |
soltysh
requested changes
Nov 5, 2018
| @@ -898,6 +521,78 @@ func TestEtcd3StoragePath(t *testing.T) { | |||
| t.Fatalf("error creating test namespace: %#v", err) | |||
| } | |||
|
|
|||
| etcdStorageData := etcddata.GetEtcdStorageData() | |||
|
|
|||
| // TODO storage is broken somehow. failing on v1beta1 serialization | |||
There was a problem hiding this comment.
Would you mind creating an issue about that?
There was a problem hiding this comment.
| gvk *schema.GroupVersionKind | ||
| } | ||
|
|
||
| // TODO we store these in the wrong place and version in etcd |
There was a problem hiding this comment.
Fix this, master team will be addressing those as part of the migration story we own: https://jira.coreos.com/browse/MSTR-213
There was a problem hiding this comment.
@deads2k I thought you fixed that one, didn't you?
enj
force-pushed
the
enj/t/shared_etcd_stubs
branch
from
38531a1
to
80b6fec
Compare
openshift-ci-robot
removed
the
approved
…ices This reverts commit 5399017.
This change updates the ETCD storage test so that its data is exported. Thus it can be used by other tests. The dry run test was updated to consume this data instead of having a duplicate copy. The code to start a master that can be used for "one of every resource" style tests was also factored out. It is reused in the dry run test as well. This prevents these tests from drifting in the future and reduces the long term maintenance burden. Signed-off-by: Monis Khan <mkhan@redhat.com>
We do not have the REST storage for these resources yet. Signed-off-by: Monis Khan <mkhan@redhat.com>
This change updates the etcd storage path test to exercise custom resource storage by creating custom resource definitions before running the test. Duplicated custom resource definition test logic was consolidated. Signed-off-by: Monis Khan <mkhan@redhat.com>
Signed-off-by: Monis Khan <mkhan@redhat.com>
Signed-off-by: Monis Khan <mkhan@redhat.com>
This change updates the OpenShift ETCD storage test to reuse the upstream ETCD storage test's data. This makes it easy for us to keep up with upstream changes. It also makes it clear in which areas we differ. Signed-off-by: Monis Khan <mkhan@redhat.com>
Signed-off-by: Monis Khan <mkhan@redhat.com>
enj
force-pushed
the
enj/t/shared_etcd_stubs
branch
from
80b6fec
to
a1efaa6
Compare
|
/retest |
enj
added
the
approved
|
Bypassing approve since we are just reverting a patch master team is working on removing. |
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: enj, soltysh The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
UPSTREAM: 70019: Refactor dry run test to reuse ETCD storage data
This change updates the ETCD storage test so that its data is
exported. Thus it can be used by other tests. The dry run test was
updated to consume this data instead of having a duplicate copy.
The code to start a master that can be used for "one of every
resource" style tests was also factored out. It is reused in the
dry run test as well.
This prevents these tests from drifting in the future and reduces
the long term maintenance burden.
Signed-off-by: Monis Khan mkhan@redhat.com
UPSTREAM: : 70019: Remove too new ETCD storage data
We do not have the REST storage for these resources yet.
Signed-off-by: Monis Khan mkhan@redhat.com
Remove dead code from ETCD storage test
Signed-off-by: Monis Khan mkhan@redhat.com
Use new exported types in ETCD storage test
Signed-off-by: Monis Khan mkhan@redhat.com
Collapse on top of upstream ETCD storage test
This change updates the OpenShift ETCD storage test to reuse the
upstream ETCD storage test's data. This makes it easy for us to
keep up with upstream changes. It also makes it clear in which
areas we differ.
Signed-off-by: Monis Khan mkhan@redhat.com
Use upstream etcddata.GetResources in ETCD storage test
Signed-off-by: Monis Khan mkhan@redhat.com
/assign @deads2k @soltysh
@openshift/sig-master