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

bump channel,imc,subscription to v1, add e2e tests #3461

Merged
merged 9 commits into from
Jul 3, 2020

Conversation

vaikas
Copy link
Contributor

@vaikas vaikas commented Jul 1, 2020

Addresses #3446

Proposed Changes

  • Add v1 types for crds: channel,inmemorychannel,subscription
  • add e2e tests

Release Note

- 🎁 Add new feature bump channel, subscription, inmemorychannel to v1.
After upgrading to this version if you downgrade to .15 you must first manually patch (or edit) subscriptions.messaging.knative.dev CRD like so:
kubectl patch crd subscriptions.messaging.knative.dev --type='json' -p '[{"op" : "remove", "path" : "/spec/conversion/webhook"},{"op":"replace", "path":"/spec/conversion/strategy","value" : "None"}]'

# https://github.com/knative/eventing/issues/3466

Docs
knative/docs#2630

@knative-prow-robot knative-prow-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. area/test-and-release Test infrastructure, tests or release approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 1, 2020
@googlebot googlebot added the cla: yes Indicates the PR's author has signed the CLA. label Jul 1, 2020
@vaikas
Copy link
Contributor Author

vaikas commented Jul 2, 2020

There's something goofy going on with v1beta1<->v1 imc conversion hooks. I can patch:
v1beta1.channel, v1.channel, v1beta1.channel but I can't patch a v1 imc. I'll pick it back up tmw. bedtime...
If somebody want's to repro:

kubectl create -f - <<EOF
apiVersion: messaging.knative.dev/v1
kind: Channel
metadata:
  name: my-channel
  namespace: default
EOF
vaikas-a01:eventing vaikas$ kubectl patch inmemorychannels.v1beta1.messaging.knative.dev my-channel --type='merge' -p '{"spec":{"subscribers":[{"generation":1,"subscriberUri":"http://event-display.default.svc.cluster.local","uid":"f850e589-2a1f-402c-ba0b-0faacce370b4"},{"generation":1,"subscriberUri":"http://event-display.default.svc.cluster.local","uid":"4a529a64-33f7-4083-a3a5-4820c822ac5e"}]}}'
inmemorychannel.messaging.knative.dev/my-channel patched
vaikas-a01:eventing vaikas$ kubectl patch inmemorychannels.v1.messaging.knative.dev my-channel --type='merge' -p '{"spec":{"subscribers":[{"generation":1,"subscriberUri":"http://event-display.default.svc.cluster.local","uid":"f850e589-2a1f-402c-ba0b-0faacce370b4"},{"generation":1,"subscriberUri":"http://event-display.default.svc.cluster.local","uid":"4a529a64-33f7-4083-a3a5-4820c822ac5e"}]}}'
Error from server: conversion webhook for messaging.knative.dev/v1, Kind=InMemoryChannel failed: Post https://eventing-webhook.knative-eventing.svc:443/resource-conversion?timeout=30s: EOF

@aliok
Copy link
Member

aliok commented Jul 2, 2020

@vaikas I am now checking the conversion problem. I was able to reproduce it

@aliok
Copy link
Member

aliok commented Jul 2, 2020

@vaikas sent a PR against your PR branch: vaikas#4

I wanted to do it that way because there were would be some conflicts on your branch if I sent a new PR against master.

@knative-prow-robot knative-prow-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 2, 2020
@vaikas
Copy link
Contributor Author

vaikas commented Jul 2, 2020

Still sorting why the tests were failing, they ran fine against my cluster, this for example failed in previous run, but passes against my local cluster:

--- PASS: TestBrokerChannelFlowTriggerV1BrokerV1Beta1 (1.06s)
    --- PASS: TestBrokerChannelFlowTriggerV1BrokerV1Beta1/Channel-messaging.knative.dev/v1 (75.80s)
    --- PASS: TestBrokerChannelFlowTriggerV1BrokerV1Beta1/Channel-messaging.knative.dev/v1beta1 (76.41s)
    --- PASS: TestBrokerChannelFlowTriggerV1BrokerV1Beta1/InMemoryChannel-messaging.knative.dev/v1 (82.43s)
    --- PASS: TestBrokerChannelFlowTriggerV1BrokerV1Beta1/InMemoryChannel-messaging.knative.dev/v1beta1 (82.44s)
PASS

@vaikas
Copy link
Contributor Author

vaikas commented Jul 2, 2020

/test pull-knative-eventing-unit-tests

@vaikas
Copy link
Contributor Author

vaikas commented Jul 2, 2020

#3466

@knative-prow-robot knative-prow-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 2, 2020
@knative-prow-robot knative-prow-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 2, 2020
@knative-metrics-robot
Copy link

The following is the coverage report on the affected files.
Say /test pull-knative-eventing-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/duck/v1beta1/subscribable_types_conversion.go 100.0% 95.7% -4.3
pkg/apis/messaging/v1beta1/in_memory_channel_conversion.go 94.9% 97.4% 2.5

Copy link
Contributor

@n3wscott n3wscott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@knative-prow-robot knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 2, 2020
@knative-prow-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: n3wscott, vaikas

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@vaikas
Copy link
Contributor Author

vaikas commented Jul 2, 2020

/test pull-knative-eventing-integration-tests

@vaikas
Copy link
Contributor Author

vaikas commented Jul 2, 2020

--- PASS: TestChannelBasedBrokerWithManyTriggers (316.80s)
    --- PASS: TestChannelBasedBrokerWithManyTriggers/Channel-messaging.knative.dev/v1 (1.03s)
        --- PASS: TestChannelBasedBrokerWithManyTriggers/Channel-messaging.knative.dev/v1/test_default_broker_with_many_attribute_and_extension_triggers (136.67s)
        --- PASS: TestChannelBasedBrokerWithManyTriggers/Channel-messaging.knative.dev/v1/test_default_broker_with_many_attribute_triggers (139.45s)
        --- PASS: TestChannelBasedBrokerWithManyTriggers/Channel-messaging.knative.dev/v1/test_default_broker_with_many_attribute_triggers_using_v1beta1_trigger (142.22s)
        --- PASS: TestChannelBasedBrokerWithManyTriggers/Channel-messaging.knative.dev/v1/test_default_broker_with_many_deprecated_triggers (162.90s)
    --- PASS: TestChannelBasedBrokerWithManyTriggers/InMemoryChannel-messaging.knative.dev/v1 (1.01s)
        --- PASS: TestChannelBasedBrokerWithManyTriggers/InMemoryChannel-messaging.knative.dev/v1/test_default_broker_with_many_attribute_and_extension_triggers (139.52s)
        --- PASS: TestChannelBasedBrokerWithManyTriggers/InMemoryChannel-messaging.knative.dev/v1/test_default_broker_with_many_attribute_triggers_using_v1beta1_trigger (141.64s)
        --- PASS: TestChannelBasedBrokerWithManyTriggers/InMemoryChannel-messaging.knative.dev/v1/test_default_broker_with_many_deprecated_triggers (142.54s)
        --- PASS: TestChannelBasedBrokerWithManyTriggers/InMemoryChannel-messaging.knative.dev/v1/test_default_broker_with_many_attribute_triggers (152.46s)
PASS
ok  	knative.dev/eventing/test/e2e	317.292s

and same for sequence, but scrolled out of the screen :)

@knative-test-reporter-robot

The following jobs failed:

Test name Triggers Retries
pull-knative-eventing-integration-tests 0/3

Failed non-flaky tests preventing automatic retry of pull-knative-eventing-integration-tests:

test/e2e.TestEventTransformationForSubscription
test/e2e.TestEventTransformationForSubscription/Channel-messaging.knative.dev/v1
test/conformance.TestChannelTracingWithReply
test/conformance.TestChannelTracingWithReply/Channel-messaging.knative.dev/v1

@vaikas
Copy link
Contributor Author

vaikas commented Jul 2, 2020

/test pull-knative-eventing-integration-tests

@knative-prow-robot knative-prow-robot merged commit 996c931 into knative:master Jul 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/test-and-release Test infrastructure, tests or release cla: yes Indicates the PR's author has signed the CLA. lgtm Indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants