Use CRD & Webhook v1 APIs #3360
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Copyright 2020 The Knative Authors | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
|
|
@@ -12,7 +12,7 @@ | |
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: brokers.eventing.knative.dev | ||
|
|
@@ -22,17 +22,38 @@ metadata: | |
| duck.knative.dev/addressable: "true" | ||
| spec: | ||
| group: eventing.knative.dev | ||
| versions: | ||
| - &version | ||
| name: v1alpha1 | ||
| served: false | ||
| storage: false | ||
| subresources: | ||
| status: {} | ||
| schema: | ||
| openAPIV3Schema: | ||
| type: object | ||
| # this is a work around so we don't need to flush out the | ||
| # schema for each version at this time | ||
| # | ||
| # see issue: https://github.com/knative/serving/issues/912 | ||
| x-kubernetes-preserve-unknown-fields: true | ||
| additionalPrinterColumns: | ||
| - name: Ready | ||
| type: string | ||
| jsonPath: ".status.conditions[?(@.type==\"Ready\")].status" | ||
| - name: Reason | ||
| type: string | ||
| jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason" | ||
| - name: URL | ||
| type: string | ||
| jsonPath: .status.address.url | ||
| - name: Age | ||
| type: date | ||
| jsonPath: .metadata.creationTimestamp | ||
| - << : *version | ||
| name: v1beta1 | ||
| served: true | ||
| storage: true | ||
| names: | ||
| kind: Broker | ||
| plural: brokers | ||
|
|
@@ -42,31 +63,11 @@ spec: | |
| - knative | ||
| - eventing | ||
| scope: Namespaced | ||
| conversion: | ||
| strategy: Webhook | ||
| webhook: | ||
| conversionReviewVersions: ["v1", "v1beta1"] | ||
| clientConfig: | ||
| service: | ||
| name: eventing-webhook | ||
| namespace: knative-eventing | ||
|
Contributor
There was a problem hiding this comment. Looks like you can't drop the v1alpha1 for the brokers based on this from the failed upgrade tests:
Member
There was a problem hiding this comment. Yeah this requires the storage migration job to be run before the upgrade I do this after the upgrade in serving which is technically wrong (we've never dropped a version yet so we didn't catch it) |
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😱
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
well, we do that already with
everythingon the verbs ;-)but yeah 🙄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nah, it is fine :) Just some YAML magic that I didn't know before :)
Actually gets rid of some dupes, which is nice