Skip to content

Commit 8e8a890

Browse files
authored
Cleans up comments in config / config_template.yaml (#871)
The current TLS configuration is a bit confusing because it is not obvious internode vs frontend and server vs. client. We add comments to config_template.yaml to clean that up. Previous checkin introduced an incorrect comment. This fixes that.
1 parent 7d065a2 commit 8e8a890

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

common/service/config/config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ type (
133133
// The path to the file containing the PEM-encoded private key of the certificate to use.
134134
KeyFile string `yaml:"keyFile"`
135135
// A list of paths to files containing the PEM-encoded public key of the Certificate Authorities you wish to trust for client authentication.
136-
// This value is ignored if `requireClientAuth` is not enabled. Merged with the data from ClientCAData.
136+
// This value is ignored if `requireClientAuth` is not enabled. Cannot specify both ClientCAFiles and ClientCAData
137137
ClientCAFiles []string `yaml:"clientCaFiles"`
138138

139139
// Base64 equivalents of the above artifacts.
@@ -146,18 +146,18 @@ type (
146146
RequireClientAuth bool `yaml:"requireClientAuth"`
147147
}
148148

149-
// ClientTLS contains TLS configuration for clients.
149+
// ClientTLS contains TLS configuration for clients within the Temporal Cluster to connect to Temporal nodes.
150150
ClientTLS struct {
151151
// DNS name to validate against for server to server connections.
152152
// Required when TLS is enabled in a multi-host cluster.
153153
// This name should be referenced by the certificate specified in the ServerTLS section.
154154
ServerName string `yaml:"serverName"`
155155

156-
// Optional - A list of paths to files containing the PEM-encoded public key of the Certificate Authorities you wish to return to the client.
156+
// Optional - A list of paths to files containing the PEM-encoded public key of the Certificate Authorities that are used to validate the server's TLS certificate
157157
// You cannot specify both RootCAFiles and RootCAData
158158
RootCAFiles []string `yaml:"rootCaFiles"`
159159

160-
// Optional - A list of base64 PEM-encoded public keys of the Certificate Authorities you wish to return to the client.
160+
// Optional - A list of base64 PEM-encoded public keys of the Certificate Authorities that are used to validate the server's TLS certificate.
161161
// You cannot specify both RootCAFiles and RootCAData
162162
RootCAData []string `yaml:"rootCaData"`
163163
}

docker/config_template.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ global:
117117
broadcastAddress: {{ default .Env.TEMPORAL_BROADCAST_ADDRESS "" }}
118118
tls:
119119
internode:
120+
# This server section configures the TLS certificate that internal temporal
121+
# cluster nodes (history or matching) present to other clients within the Temporal Cluster.
120122
server:
121123
requireClientAuth: {{ default .Env.TEMPORAL_TLS_REQUIRE_CLIENT_AUTH "false" }}
122124

@@ -129,12 +131,18 @@ global:
129131
keyData: {{ default .Env.TEMPORAL_TLS_SERVER_KEY_DATA "" }}
130132
clientCaData:
131133
- {{ default .Env.TEMPORAL_TLS_SERVER_CA_CERT_DATA "" }}
134+
135+
# This client section is used to configure the TLS clients within
136+
# the Temporal Cluster that connect to an Internode (history or matching)
132137
client:
133138
rootCaFiles:
134139
- {{ default .Env.TEMPORAL_TLS_SERVER_CA_CERT "" }}
135140
rootCaData:
136141
- {{ default .Env.TEMPORAL_TLS_SERVER_CA_CERT_DATA "" }}
137142
frontend:
143+
# This server section configures the TLS certificate that the Frontend
144+
# server presents to all clients (specifically the Worker role within
145+
# the Temporal Cluster and all External SDKs connecting to the Cluster)
138146
server:
139147
requireClientAuth: {{ default .Env.TEMPORAL_TLS_REQUIRE_CLIENT_AUTH "false" }}
140148
certFile: {{ default .Env.TEMPORAL_TLS_FRONTEND_CERT "" }}
@@ -148,6 +156,9 @@ global:
148156
clientCaData:
149157
- {{ default .Env.TEMPORAL_TLS_CLIENT1_CA_CERT_DATA "" }}
150158
- {{ default .Env.TEMPORAL_TLS_CLIENT2_CA_CERT_DATA "" }}
159+
160+
# This client section is used to configure the TLS clients within
161+
# the Temporal Cluster (specifically the Worker role) that connect to the Frontend service
151162
client:
152163
rootCaFiles:
153164
- {{ default .Env.TEMPORAL_TLS_SERVER_CA_CERT "" }}

0 commit comments

Comments
 (0)