Skip to content

Commit

Permalink
Add warning about queue arguments in crd api description (#175)
Browse files Browse the repository at this point in the history
* Add warning about queue arguments in crd api description

- recommend people to use policies instead
  • Loading branch information
ChunyiLyu committed Jun 29, 2021
1 parent d6e20bc commit d31861e
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 23 deletions.
9 changes: 5 additions & 4 deletions api/v1beta1/queue_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,19 @@ import (

// QueueSpec defines the desired state of Queue
type QueueSpec struct {
// Name of the queue; required property
// Name of the queue; required property.
// +kubebuilder:validation:Required
Name string `json:"name"`
// Default to vhost '/'
// +kubebuilder:default:=/
Vhost string `json:"vhost,omitempty"`
Type string `json:"type,omitempty"`
// When set to false queues does not survive server restart
// When set to false queues does not survive server restart.
Durable bool `json:"durable,omitempty"`
// when set to true, queues that has at least one consumer before, are deleted after last consumer unsubscribes
// when set to true, queues that have had at least one consumer before are deleted after the last consumer unsubscribes.
AutoDelete bool `json:"autoDelete,omitempty"`
// Queue arguments in the format of KEY: VALUE. e.g. x-delivery-limit: 10000
// Queue arguments in the format of KEY: VALUE. e.g. x-delivery-limit: 10000.
// Configuring queues through arguments is not recommended because they cannot be updated once set; we recommend configuring queues through policies instead.
// +kubebuilder:validation:Type=object
// +kubebuilder:pruning:PreserveUnknownFields
Arguments *runtime.RawExtension `json:"arguments,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_bindings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: bindings.rabbitmq.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_exchanges.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: exchanges.rabbitmq.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_federations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: federations.rabbitmq.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_permissions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: permissions.rabbitmq.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_policies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: policies.rabbitmq.com
spec:
Expand Down
14 changes: 8 additions & 6 deletions config/crd/bases/rabbitmq.com_queues.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: queues.rabbitmq.com
spec:
Expand Down Expand Up @@ -40,18 +40,20 @@ spec:
properties:
arguments:
description: 'Queue arguments in the format of KEY: VALUE. e.g. x-delivery-limit:
10000'
10000. Configuring queues through arguments is not recommended because
they cannot be updated once set; we recommend configuring queues
through policies instead.'
type: object
x-kubernetes-preserve-unknown-fields: true
autoDelete:
description: when set to true, queues that has at least one consumer
before, are deleted after last consumer unsubscribes
description: when set to true, queues that have had at least one consumer
before are deleted after the last consumer unsubscribes.
type: boolean
durable:
description: When set to false queues does not survive server restart
description: When set to false queues does not survive server restart.
type: boolean
name:
description: Name of the queue; required property
description: Name of the queue; required property.
type: string
rabbitmqClusterReference:
description: Reference to the RabbitmqCluster that the queue will
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_schemareplications.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: schemareplications.rabbitmq.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_shovels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: shovels.rabbitmq.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_users.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: users.rabbitmq.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_vhosts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: vhosts.rabbitmq.com
spec:
Expand Down
8 changes: 4 additions & 4 deletions docs/api/rabbitmq.com.ref.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -553,12 +553,12 @@ QueueSpec defines the desired state of Queue
[cols="25a,75a", options="header"]
|===
| Field | Description
| *`name`* __string__ | Name of the queue; required property
| *`name`* __string__ | Name of the queue; required property.
| *`vhost`* __string__ | Default to vhost '/'
| *`type`* __string__ |
| *`durable`* __boolean__ | When set to false queues does not survive server restart
| *`autoDelete`* __boolean__ | when set to true, queues that has at least one consumer before, are deleted after last consumer unsubscribes
| *`arguments`* __xref:{anchor_prefix}-k8s-io-apimachinery-pkg-runtime-rawextension[$$RawExtension$$]__ | Queue arguments in the format of KEY: VALUE. e.g. x-delivery-limit: 10000
| *`durable`* __boolean__ | When set to false queues does not survive server restart.
| *`autoDelete`* __boolean__ | when set to true, queues that have had at least one consumer before are deleted after the last consumer unsubscribes.
| *`arguments`* __xref:{anchor_prefix}-k8s-io-apimachinery-pkg-runtime-rawextension[$$RawExtension$$]__ | Queue arguments in the format of KEY: VALUE. e.g. x-delivery-limit: 10000. Configuring queues through arguments is not recommended because they cannot be updated once set; we recommend configuring queues through policies instead.
| *`rabbitmqClusterReference`* __xref:{anchor_prefix}-github-com-rabbitmq-messaging-topology-operator-api-v1beta1-rabbitmqclusterreference[$$RabbitmqClusterReference$$]__ | Reference to the RabbitmqCluster that the queue will be created in. Required property.
|===

Expand Down

0 comments on commit d31861e

Please sign in to comment.