Skip to content

Commit f29610a

Browse files
authored
Merge pull request #337 from rabbitmq/cf-platform-eng/main
Change structure of Tanzu Service Manager yaml (move out of helm chart).
2 parents 457a376 + 2ad55dd commit f29610a

File tree

7 files changed

+6
-7
lines changed

7 files changed

+6
-7
lines changed

charts/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
This folder contains the `rabbitmq` Helm chart to deploy a `RabbitmqCluster` resource.
44

5-
The `rabbitmq` Helm chart can also be used in combination with [Container Services Manager for VMware Tanzu (KSM)](https://docs.pivotal.io/ksm/) for [Open Service Broker API](https://www.openservicebrokerapi.org/) integration.
5+
The `rabbitmq` chart can also be used in combination with [Tanzu Services Manager](https://docs.pivotal.io/ksm/) and the `tsmgr` direcotry for OSBAPI integration.

charts/rabbitmq/Chart.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ description: RabbitMQ Cluster
1212
apiVersion: v2
1313
version: 0.8.0
1414
appVersion: 3.8.5
15-
description: RabbitMQ Cluster Kubernetes Operator
1615
keywords:
1716
- rabbitmq
1817
- message queue
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/proposals/implemented/20200408-tls-support-amqp.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ As a RabbitMQ client (whether application or end user), I want to be sure that t
4242

4343
### Goals
4444

45-
- Write/Read a TLS 1.2 encrypted AMQP 0-9-1 message from an operator deployed RabbitMQ broker (standalone and KSM deployments)
45+
- Write/Read a TLS 1.2 encrypted AMQP 0-9-1 message from an operator deployed RabbitMQ broker (standalone and Tanzu Service Manager deployments)
4646
- Survey other TLS implementations in K8s operators for common patterns. Priority should be given to operators in the VMware portfolio
4747
- Document our standard approach to configuring TLS via the RabbitMQ Custom Resource
4848
- Document options for certificate management
@@ -66,7 +66,7 @@ As a RabbitMQ client (whether application or end user), I want to be sure that t
6666
- Add `5671` to the Container Ports in the Pod Template
6767
- Add `5671` to the port map in the Client Service
6868
- If we expose the Client Service template we can potentially depend on the user to specify the port
69-
- When deploying via KSM, a [Certificate Request](https://cert-manager.io/docs/concepts/certificaterequest/) is templated if the plan specified `tls: true`
69+
- When deploying via Tanzu Service Manager, a [Certificate Request](https://cert-manager.io/docs/concepts/certificaterequest/) is templated if the plan specified `tls: true`
7070

7171
### User Stories
7272

@@ -82,7 +82,7 @@ And I can retrieve that message over the same port
8282
```
8383
#### Story 2
8484
```
85-
Given I have a KSM environment
85+
Given I have a Tanzu Service Manager environment
8686
And a certificate manager is provisioned in the cluster with an appropriate CA
8787
And I deploy the RabbitMQ operator
8888
And I request a new RabbitMQCluster with TLS enabled
@@ -113,9 +113,9 @@ And I can retrieve that message over the same port
113113
#### Disabling non-TLS
114114
- Should we expose non-TLS ports when TLS is enabled? Would this be a blanket setting or per protocol? `listeners.tcp = none`, `mqtt.listeners.tcp = none` etc...
115115

116-
#### KSM
116+
#### Tanzu Service Manager
117117
- `plans` are too high level an abstraction to expect users to provide certificate details. We should consider how an operator would be configured and deployed with the ability to inject certificates for all the TLS-enabled RabbitMQ brokers.
118-
- This proposal make cert-manager a dependency for KSM deployed RabbitMQ for K8s. A plan with `tls: true` will deploy a cert-manager CertificateRequest with the RabbitMQCluster. The changes implemented at the operator will then ensure that the deployed RabbitMQCluster has the mounted certs.
118+
- This proposal make cert-manager a dependency for Tanzu Service Manager deployed RabbitMQ for K8s. A plan with `tls: true` will deploy a cert-manager CertificateRequest with the RabbitMQCluster. The changes implemented at the operator will then ensure that the deployed RabbitMQCluster has the mounted certs.
119119
- However, cert-manager is expects cluster-wide privileges. cert-manager also requires [Issuers](https://cert-manager.io/docs/concepts/issuer/) to be configured before Certificates can be issued. Both of these tasks seem out of scope and more general than RabbitMQ operator config. We are therefore assuming that cert-manager configuration will either be part of a higher-level Tanzu cluster setup or at least done ahead of Rabbit deployment.
120120
- bind.yaml needs to be configurable to enable ssl, specify the correct port and point to an https URI
121121

0 commit comments

Comments
 (0)