Merge pull request #5 from rabbitmq/live

Merge from source
rabbitmq · Jul 23, 2020 · b82a82d · b82a82d
2 parents d4bd75a + a18e7ca
commit b82a82d
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 10 deletions.
diff --git a/site/clustering.md b/site/clustering.md
@@ -27,7 +27,7 @@ This guide covers fundamental topics related to RabbitMQ clustering:
  * What clustering [means for clients](#clustering-and-clients)
  * [How clusters are formed](#cluster-formation)
  * How nodes [authenticate to each other](#erlang-cookie) (and with CLI tools)
- * Why [two cluster nodes are highly recommended against](#node-count)
+ * Why it's important to [use an odd number of nodes](#node-count) and **two cluster nodes are highly recommended against**
  * [Node restarts](#restarting) and how nodes rejoin their cluster
  * How to [remove a cluster node](#removing-nodes)
  * How to [reset a cluster node](#resetting-nodes)
@@ -337,11 +337,11 @@ Because several features (e.g. [quorum queues](/quorum-queues.html), [client tra
 require a consensus between cluster members, odd numbers of cluster nodes are highly recommended:
 1, 3, 5, 7 and so on.
 
-Two node clusters are *highly recommended against* since it's impossible for cluster nodes to identify
+Two node clusters are **highly recommended against** since it's impossible for cluster nodes to identify
 a majority and form a consensus in case of connectivity loss. For example, when the two nodes lose connectivity
 MQTT client connections won't be accepted, quorum queues would lose their availability, and so on.
 
-From the consensus point of view, Four or six node clusters would have the same availability
+From the consensus point of view, four or six node clusters would have the same availability
 characteristics as three and five node clusters.
 
 The [Quorum Queues guide](/quorum-queues.html) covers this topic in more detail.

diff --git a/site/kubernetes/operator/using-operator.md b/site/kubernetes/operator/using-operator.md
@@ -436,6 +436,38 @@ spec:
     secretName: rabbitmq-server-certs
 </pre>
 
+### <a name='override' class='anchor' href='#override'>Override Resource Properties</a>
+
+**Description:** Use with caution! Customize resources created by the operator by overriding their properties or providing additional settings. This is an advanced feature that allows you to enable features that are not explicitly supported but can easily render your RabbitMQ Cluster unusable if used incorrectly. You can customize the StatefulSet and the Service used by client applications. The values for <code>spec.override.statefulSet</code> and <code>spec.override.clientService</code> should match [StatefulSet object](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#statefulset-v1-apps) and [Service object](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#service-v1-core) specification respectively.
+
+**Default Value:** N/A
+
+**Example:**
+
+<pre class="lang-yaml">
+apiVersion: rabbitmq.com/v1beta1
+kind: RabbitmqCluster
+metadata:
+  name: additional-port
+spec:
+  override:
+    clientService:
+      spec:
+        ports:
+          - name: additional-port # adds an additional port on the client service
+            protocol: TCP
+            port: 12345
+    statefulSet:
+      spec:
+        template:
+          spec:
+            containers:
+              - name: rabbitmq
+                ports:
+                  - containerPort: 12345 # opens an additional port on the rabbitmq server container
+                    name: additional-port
+                    protocol: TCP
+</pre>
 
 ## <a id='update' class='anchor' href='#update'>Update a RabbitMQ Instance</a>
 
@@ -607,6 +639,17 @@ The configurations are listed in the table below.
 	section for the list of always generated configuration.
       </td>
     </tr>
+    <tr>
+      <td>
+        <code>spec.override</code>
+      </td>
+      <td>
+        Arbitrary overrides to the resources created by RabbitMQ Cluster Kubernetes Operator. This feature should be
+        used with <strong>great care</strong> as overriding essential properties can render a RabbitMQ cluster unusable
+        to applications or unreachable to the Operator.
+        See the <a href='#override'>Override section</a> to learn more.
+      </td>
+    </tr>
     </col>
 </table>
 

diff --git a/site/trademark-guidelines.md b/site/trademark-guidelines.md
@@ -20,7 +20,7 @@ limitations under the License.
 <ol class="plain">
   <li>
     <p>
-      <strong>PURPOSE.</strong> Pivotal Software, Inc. (“Pivotal”) owns a number of
+      <strong>PURPOSE.</strong> VMware, Inc. (“VMware”) owns a number of
       international trademarks and logos that identify the RabbitMQ community
       and individual RabbitMQ projects (“RabbitMQ Marks”). These trademarks
       include:
@@ -39,7 +39,7 @@ limitations under the License.
       </li>
     </ol>
     <p>
-      This policy outlines Pivotal’s policy and guidelines about the use of
+      This policy outlines VMware’s policy and guidelines about the use of
       the RabbitMQ trademarks by members of the RabbitMQ development and
       user community.
     </p>
@@ -156,7 +156,7 @@ limitations under the License.
               <li>
                 <p>
                   There is no suggestion that your project is approved,
-                  sponsored, or affiliated with Pivotal.
+                  sponsored, or affiliated with VMware.
                 </p>
               </li>
               <li>
@@ -175,7 +175,7 @@ limitations under the License.
         <p>
           <strong>
             Attribution.
-          </strong> Identify the trademarks as trademarks of Pivotal, as
+          </strong> Identify the trademarks as trademarks of VMware, as
           set forth in Section 7.
         </p>
       </li>
@@ -218,7 +218,7 @@ limitations under the License.
       <strong>
         IMPROPER USE OF THE TRADEMARKS AND LOGOS.
       </strong> Use of the logos is
-      reserved solely for use by Pivotal in its unaltered form. Examples of
+      reserved solely for use by VMware in its unaltered form. Examples of
       unauthorized use of the RabbitMQ trademarks include:
     </p>
     <ol class="alpha">
@@ -329,7 +329,7 @@ limitations under the License.
           <strong>
             Endorsement or Sponsorship.
           </strong> You may not use the RabbitMQ
-          trademarks in a manner that would imply Pivotal’s affiliation
+          trademarks in a manner that would imply VMware’s affiliation
           with or endorsement, sponsorship, or support of a product or
           service.
         </p>
@@ -376,7 +376,7 @@ limitations under the License.
       (i.e.,  ®) should appear at least with the first use of the RabbitMQ
       trademarks (for example, RABBITMQ®). When you use a RabbitMQ
       trademark you should include a statement attributing the trademark to
-      Pivotal. For example, "RabbitMQ is a trademark of Pivotal Software,
+      VMware. For example, "RabbitMQ is a trademark of VMware,
       Inc. in the U.S. and other countries."
     </p>
   </li>