Merge branch 'main' into supervisor-with-discovery

This commit is contained in:
Ryan Richard 2020-10-09 10:00:50 -07:00
commit b71959961d

View File

@ -164,7 +164,7 @@ spec:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
#! If name is changed, must also change names.apiService in the ConfigMap above #! If name is changed, must also change names.apiService in the ConfigMap above and spec.service.name in the APIService below.
name: #@ data.values.app_name + "-api" name: #@ data.values.app_name + "-api"
namespace: #@ data.values.namespace namespace: #@ data.values.namespace
labels: labels:
@ -191,6 +191,6 @@ spec:
versionPriority: 10 versionPriority: 10
#! caBundle: Do not include this key here. Starts out null, will be updated/owned by the golang code. #! caBundle: Do not include this key here. Starts out null, will be updated/owned by the golang code.
service: service:
name: pinniped-api name: #@ data.values.app_name + "-api"
namespace: #@ data.values.namespace namespace: #@ data.values.namespace
port: 443 port: 443