Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chao] Add clientId value #107

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gremlin/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: gremlin
version: 0.18.0
version: 0.19.0
description: The Gremlin Inc client application
apiVersion: v1
home: https://www.gremlin.com
Expand Down
1 change: 1 addition & 0 deletions gremlin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ their default values. See values.yaml for all available options.
| `nodeSelector` | Map of node labels for pod assignment for the `gremlin` container | `{}` |
| `tolerations` | List of node taints to tolerate for the `gremlin` container | `[]` |
| `affinity` | Map of node/pod affinities for the `gremlin` container | `{}` |
| `chao.clientId` | An identifier for this specific client. Leaving this blank will generate a random one | `""` |
| `chao.podLabels` | Kubernetes labels applied to the chao deployment and it's Pods | `{}` |
| `chao.priorityClassName` | The name of the priority class to use for the Chao deployment | `""` |
| `chao.nodeSelector` | Map of node labels for pod assignment for the `chao` container | `{}` |
Expand Down
22 changes: 13 additions & 9 deletions gremlin/templates/chao-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,26 @@ spec:
args:
- "-api_url"
- "{{ include "gremlinServiceUrl" . }}/kubernetes"
{{- if (eq (include "gremlin.secretType" .) "certificate") }}
{{- if (eq (include "gremlin.secretType" .) "certificate") }}
- "-cert_path"
{{- /* If we aren't managing this secret and a teamID was supplied, assume teamID is not in the external secret */}}
{{- if or (not .Values.gremlin.secret.managed) (hasPrefix "-----BEGIN" .Values.gremlin.secret.certificate) }}
{{- if or (not .Values.gremlin.secret.managed) (hasPrefix "-----BEGIN" .Values.gremlin.secret.certificate) }}
- "/var/lib/gremlin/cert/gremlin.cert"
{{- else }}
{{- else }}
- {{ .Values.gremlin.secret.certificate | quote }}
{{- end }}
{{- end }}
- "-key_path"
{{- /* If we aren't managing this secret and a teamID was supplied, assume teamID is not in the external secret */}}
{{- if or (not .Values.gremlin.secret.managed) (hasPrefix "-----BEGIN" .Values.gremlin.secret.key) }}
{{- /* If we aren't managing this secret and a teamID was supplied, assume teamID is not in the external secret */}}
{{- if or (not .Values.gremlin.secret.managed) (hasPrefix "-----BEGIN" .Values.gremlin.secret.key) }}
- "/var/lib/gremlin/cert/gremlin.key"
{{- else }}
{{- else }}
- {{ .Values.gremlin.secret.key | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.chao.clientId }}
- "-client_id"
- {{ .Value.chao.clientId }}
{{- end }}
imagePullPolicy: {{ .Values.chaoimage.pullPolicy }}
name: chao
{{- if (or ((eq (include "gremlin.secretType" .) "certificate")) .Values.ssl.certFile) }}
Expand Down
4 changes: 4 additions & 0 deletions gremlin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,10 @@ chao:
# The name of the priority class to use for the Chao deployment
priorityClassName: ""

# chao.clientId -
# the client identifier used to communicate with the control plane
clientId: ""

nodeSelector: {}

tolerations: []
Expand Down