Merge release-1.1 into master. (Final batch)

mixer/adapter/model/v1beta1/infrastructure_backend.proto

@@ -31,7 +31,7 @@ import "google/rpc/status.proto";
 // out of process adapter.
 //
 // `InfrastructureBackend` allows Mixer and the backends to have a session based model. In a session based model, Mixer passes
-// the relevant configuration state to the backend only once and estabilshes a session using a session identifier.
+// the relevant configuration state to the backend only once and establishes a session using a session identifier.
 // All future communications between Mixer and the backend uses the session identifier which refers to the previously
 // passed in configuration data.
 //
@@ -59,7 +59,7 @@ service InfrastructureBackend {
     //
     // Backend is allowed to return the same session id if given the same configuration block.
     // This would happen when multiple instances of Mixer in a deployment all create sessions with the same configuration.
-    // Note that given individial instances of Mixer can call `CloseSession`, reusing `session_id` by the backend
+    // Note that given individual instances of Mixer can call `CloseSession`, reusing `session_id` by the backend
     // assumes that the backend is doing reference counting.
     //
     // If the backend couldn't create a session for a specific handler configuration and

networking/v1alpha3/gateway.proto

@@ -335,6 +335,13 @@ message Server {
     // Optional: If specified, only support the specified cipher list.
     // Otherwise default to the default cipher list supported by Envoy.
     repeated string cipher_suites = 9;
+
+    // Optional: If specified, the gateway controllers (with SDS enabled)
+    // use the specified name as the SDS secret config name to call the SDS
+    // server, to retrieve the key and certificates. Otherwise, the gateway
+    // controllers (with SDS enabled) use the first value in the hosts as
+    // the SDS secret config name to call the SDS server.
+    string sds_name = 10;
   }
 
   // Set of TLS related options that govern the server's behavior. Use

proto.lock

@@ -3302,6 +3302,11 @@
                     "name": "cipher_suites",
                     "type": "string",
                     "is_repeated": true
+                  },
+                  {
+                    "id": 10,
+                    "name": "sds_name",
+                    "type": "string"
                   }
                 ]
               }