Skip to content

Commit

Permalink
remove the v1alpha1 api versions all together (#3494)
Browse files Browse the repository at this point in the history
  • Loading branch information
vaikas authored Jul 9, 2020
1 parent 9d55a67 commit 5295d3e
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 141 deletions.
10 changes: 3 additions & 7 deletions config/channels/in-memory-channel/300-in-memory-channel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ spec:
group: messaging.knative.dev
versions:
- &version
name: v1alpha1
served: false
storage: false
name: v1beta1
served: true
storage: true
subresources:
status: {}
schema:
Expand All @@ -50,10 +50,6 @@ spec:
- name: Age
type: date
jsonPath: .metadata.creationTimestamp
- << : *version
name: v1beta1
served: true
storage: true
- << : *version
name: v1
served: true
Expand Down
10 changes: 3 additions & 7 deletions config/core/resources/broker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ spec:
group: eventing.knative.dev
versions:
- &version
name: v1alpha1
served: false
storage: false
name: v1beta1
served: true
storage: true
subresources:
status: {}
schema:
Expand All @@ -50,10 +50,6 @@ spec:
- name: Age
type: date
jsonPath: .metadata.creationTimestamp
- << : *version
name: v1beta1
served: true
storage: true
- << : *version
name: v1
served: true
Expand Down
94 changes: 3 additions & 91 deletions config/core/resources/channel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,85 +25,11 @@ spec:
group: messaging.knative.dev
versions:
- &version
name: v1alpha1
served: false
storage: false
name: v1beta1
served: true
storage: true
subresources:
status: {}
schema:
openAPIV3Schema:
type: object
properties:
spec:
type: object
properties:
channelTemplate:
description: "Channel implementation which dictates the durability guarantees of events. If not specified then the default channel is used. More information: https://knative.dev/docs/eventing/channels/default-channels."
type: object
properties:
apiVersion:
type: string
description: "API version of the channel implementation."
minLength: 1
kind:
type: string
description: "Kind of the channel implementation to use (InMemoryChannel, KafkaChannel, etc.)."
minLength: 1
spec:
type: object
description: "Spec defines the Spec to use for each channel created. Passed in verbatim to the Channel CRD as Spec section."
required:
- apiVersion
- kind
subscribable:
type: object
properties:
subscribers:
type: array
description: "Events received on the channel are forwarded to its subscribers."
items:
type: object
x-kubernetes-preserve-unknown-fields: true
required:
- uid
properties:
ref:
type: object
description: "a reference to a Kubernetes object from which to retrieve the target URI."
x-kubernetes-preserve-unknown-fields: true
required:
- namespace
- name
- uid
properties:
apiVersion:
type: string
kind:
type: string
name:
type: string
minLength: 1
namespace:
type: string
minLength: 1
uid:
type: string
minLength: 1
uid:
type: string
description: "Used to understand the origin of the subscriber."
minLength: 1
subscriberURI:
type: string
description: "Endpoint for the subscriber."
minLength: 1
replyURI:
type: string
description: "Endpoint for the reply."
minLength: 1
status:
type: object
x-kubernetes-preserve-unknown-fields: true
additionalPrinterColumns:
- name: Ready
type: string
Expand All @@ -117,10 +43,6 @@ spec:
- name: Age
type: date
jsonPath: .metadata.creationTimestamp
- << : *version
name: v1beta1
served: true
storage: true
schema:
openAPIV3Schema:
type: object
Expand All @@ -135,16 +57,6 @@ spec:
name: v1
served: true
storage: false
schema:
openAPIV3Schema:
type: object
properties:
spec:
type: object
x-kubernetes-preserve-unknown-fields: true
status:
type: object
x-kubernetes-preserve-unknown-fields: true
names:
kind: Channel
plural: channels
Expand Down
10 changes: 3 additions & 7 deletions config/core/resources/parallel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ spec:
group: flows.knative.dev
versions:
- &version
name: v1alpha1
served: false
storage: false
name: v1beta1
served: true
storage: true
subresources:
status: {}
schema:
Expand All @@ -49,10 +49,6 @@ spec:
- name: Age
type: date
jsonPath: .metadata.creationTimestamp
- << : *version
name: v1beta1
served: true
storage: true
- <<: *version
name: v1
served: true
Expand Down
10 changes: 3 additions & 7 deletions config/core/resources/sequence.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ spec:
group: flows.knative.dev
versions:
- &version
name: v1alpha1
served: false
storage: false
name: v1beta1
served: true
storage: true
subresources:
status: {}
schema:
Expand All @@ -49,10 +49,6 @@ spec:
- name: Age
type: date
jsonPath: .metadata.creationTimestamp
- << : *version
name: v1beta1
served: true
storage: true
- <<: *version
name: v1
served: true
Expand Down
10 changes: 3 additions & 7 deletions config/core/resources/subscription.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ spec:
group: messaging.knative.dev
versions:
- &version
name: v1alpha1
served: false
storage: false
name: v1beta1
served: true
storage: true
subresources:
status: {}
schema:
Expand All @@ -45,10 +45,6 @@ spec:
- name: Age
type: date
jsonPath: .metadata.creationTimestamp
- << : *version
name: v1beta1
served: true
storage: true
- <<: *version
name: v1
served: true
Expand Down
18 changes: 3 additions & 15 deletions config/core/resources/trigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,11 @@ spec:
group: eventing.knative.dev
versions:
- &version
name: v1alpha1
served: false
storage: false
name: v1beta1
served: true
storage: true
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
Expand All @@ -52,10 +44,6 @@ spec:
- name: Age
type: date
jsonPath: .metadata.creationTimestamp
- << : *version
name: v1beta1
served: true
storage: true
schema:
openAPIV3Schema:
type: object
Expand Down

0 comments on commit 5295d3e

Please sign in to comment.