redis: update to use inclusive language (#11800)

Part of https://github.com/envoyproxy/envoy/issues/11596

Signed-off-by: Matt Klein <mklein@lyft.com>

Mirrored from https://github.com/envoyproxy/envoy @ a9ae3b47892170b398455a5975800faba08fcc17

envoy/config/cluster/redis/redis_cluster.proto

@@ -18,7 +18,7 @@ option (udpa.annotations.file_status).package_version_status = FROZEN;
 // of :ref:`Envoy's support for Redis Cluster <arch_overview_redis>`.
 //
 // Redis Cluster is an extension of Redis which supports sharding and high availability (where a
-// shard that loses its master fails over to a replica, and designates it as the new master).
+// shard that loses its primary fails over to a replica, and designates it as the new primary).
 // However, as there is no unified frontend or proxy service in front of Redis Cluster, the client
 // (in this case Envoy) must locally maintain the state of the Redis Cluster, specifically the
 // topology. A random node in the cluster is queried for the topology using the `CLUSTER SLOTS

envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto

@@ -34,10 +34,10 @@ message RedisProxy {
     // because replication is asynchronous and requires some delay. You need to ensure that your
     // application can tolerate stale data.
     enum ReadPolicy {
-      // Default mode. Read from the current master node.
+      // Default mode. Read from the current primary node.
       MASTER = 0;
 
-      // Read from the master, but if it is unavailable, read from replica nodes.
+      // Read from the primary, but if it is unavailable, read from replica nodes.
       PREFER_MASTER = 1;
 
       // Read from replica nodes. If multiple replica nodes are present within a shard, a random
@@ -45,11 +45,11 @@ message RedisProxy {
       REPLICA = 2;
 
       // Read from the replica nodes (similar to REPLICA), but if all replicas are unavailable (not
-      // present or unhealthy), read from the master.
+      // present or unhealthy), read from the primary.
       PREFER_REPLICA = 3;
 
-      // Read from any node of the cluster. A random node is selected among the master and replicas,
-      // healthy nodes have precedent over unhealthy nodes.
+      // Read from any node of the cluster. A random node is selected among the primary and
+      // replicas, healthy nodes have precedent over unhealthy nodes.
       ANY = 4;
     }
 
@@ -112,7 +112,7 @@ message RedisProxy {
     // count.
     bool enable_command_stats = 8;
 
-    // Read policy. The default is to read from the master.
+    // Read policy. The default is to read from the primary.
     ReadPolicy read_policy = 7 [(validate.rules).enum = {defined_only: true}];
   }
 

envoy/extensions/clusters/redis/v3/redis_cluster.proto

@@ -19,7 +19,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 // of :ref:`Envoy's support for Redis Cluster <arch_overview_redis>`.
 //
 // Redis Cluster is an extension of Redis which supports sharding and high availability (where a
-// shard that loses its master fails over to a replica, and designates it as the new master).
+// shard that loses its primary fails over to a replica, and designates it as the new primary).
 // However, as there is no unified frontend or proxy service in front of Redis Cluster, the client
 // (in this case Envoy) must locally maintain the state of the Redis Cluster, specifically the
 // topology. A random node in the cluster is queried for the topology using the `CLUSTER SLOTS

envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.proto

@@ -8,6 +8,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";
 
 import "envoy/annotations/deprecation.proto";
+import "udpa/annotations/migrate.proto";
 import "udpa/annotations/sensitive.proto";
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
@@ -38,22 +39,22 @@ message RedisProxy {
     // because replication is asynchronous and requires some delay. You need to ensure that your
     // application can tolerate stale data.
     enum ReadPolicy {
-      // Default mode. Read from the current master node.
-      MASTER = 0;
+      // Default mode. Read from the current primary node.
+      MASTER = 0 [(udpa.annotations.enum_value_migrate).rename = "PRIMARY"];
 
-      // Read from the master, but if it is unavailable, read from replica nodes.
-      PREFER_MASTER = 1;
+      // Read from the primary, but if it is unavailable, read from replica nodes.
+      PREFER_MASTER = 1 [(udpa.annotations.enum_value_migrate).rename = "PREFER_PRIMARY"];
 
       // Read from replica nodes. If multiple replica nodes are present within a shard, a random
       // node is selected. Healthy nodes have precedent over unhealthy nodes.
       REPLICA = 2;
 
       // Read from the replica nodes (similar to REPLICA), but if all replicas are unavailable (not
-      // present or unhealthy), read from the master.
+      // present or unhealthy), read from the primary.
       PREFER_REPLICA = 3;
 
-      // Read from any node of the cluster. A random node is selected among the master and replicas,
-      // healthy nodes have precedent over unhealthy nodes.
+      // Read from any node of the cluster. A random node is selected among the primary and
+      // replicas, healthy nodes have precedent over unhealthy nodes.
       ANY = 4;
     }
 
@@ -116,7 +117,7 @@ message RedisProxy {
     // count. These commands are measured in microseconds.
     bool enable_command_stats = 8;
 
-    // Read policy. The default is to read from the master.
+    // Read policy. The default is to read from the primary.
     ReadPolicy read_policy = 7 [(validate.rules).enum = {defined_only: true}];
   }