Skip to content
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
1 change: 1 addition & 0 deletions charts/kubernetes-agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ The Kubernetes monitor is optionally installed alongside the Kubernetes agent, [
| agent.machinePolicyName | string | `""` | The machine policy to register the agent with |
| agent.metadata | object | `{"annotations":{},"labels":{}}` | Additional metadata to add to the agent pod & container |
| agent.name | string | `""` | The name of the agent |
| agent.nodeSelector | object | `{}` | The node selectors to apply to the agent pod |
| agent.password | string | `""` | The password of the user used to authenticate with the target Octopus Server |
| agent.pollingConnectionCount | int | `5` | The number of polling TCP connections to open with the target Octopus Server |
| agent.pollingProxy | object | `{"host":"","password":"","port":80,"username":""}` | The host, port, username and password of the proxy server to use for polling connections |
Expand Down
18 changes: 11 additions & 7 deletions charts/kubernetes-agent/templates/tentacle-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,28 +165,28 @@ spec:
{{- if or .Values.agent.bearerToken .Values.agent.bearerTokenSecretName }}
- name: "BearerToken"
valueFrom:
secretKeyRef:
secretKeyRef:
name: {{ .Values.agent.bearerTokenSecretName | default (include "kubernetes-agent.secrets.serverAuth" .) }}
key: bearer-token
{{- end }}
{{- if or .Values.agent.username .Values.agent.usernamePasswordSecretName }}
- name: "ServerUsername"
valueFrom:
secretKeyRef:
secretKeyRef:
name: {{ .Values.agent.usernamePasswordSecretName | default (include "kubernetes-agent.secrets.serverAuth" .) }}
key: username
{{- end }}
{{- if or .Values.agent.password .Values.agent.usernamePasswordSecretName }}
- name: "ServerPassword"
valueFrom:
secretKeyRef:
secretKeyRef:
name: {{ .Values.agent.usernamePasswordSecretName | default (include "kubernetes-agent.secrets.serverAuth" .) }}
key: password
{{- end }}
{{- if .Values.agent.certificate }}
- name: "TentacleCertificateBase64"
valueFrom:
secretKeyRef:
secretKeyRef:
name: {{ include "kubernetes-agent.secrets.certificate" . }}
key: certificate
{{- end}}
Expand All @@ -202,14 +202,14 @@ spec:
- name: "TentaclePollingProxyPort"
value: {{ .Values.agent.pollingProxy.port | quote }}
- name: "TentaclePollingProxyUsername"
value: {{ .Values.agent.pollingProxy.username | quote }}
value: {{ .Values.agent.pollingProxy.username | quote }}
{{- if .Values.agent.pollingProxy.password }}
- name: "TentaclePollingProxyPassword"
valueFrom:
secretKeyRef:
secretKeyRef:
name: {{ include "kubernetes-agent.secrets.serverAuth" . }}
key: polling-proxy-password
{{- end }}
{{- end }}
{{- end }}
{{- with .Values.agent.containers.tentacle.env }}
{{- toYaml . | nindent 12 }}
Expand Down Expand Up @@ -292,6 +292,10 @@ spec:
- name: temp-dir
emptyDir: {}
{{- end }}
{{- with .Values.agent.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.agent.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
Expand Down
6 changes: 5 additions & 1 deletion charts/kubernetes-agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ agent:
# @section -- Agent values
tolerations: []

# -- The node selectors to apply to the agent pod
# @section -- Agent values
nodeSelector: {}

# -- The affinities to apply to the agent pod
# @section -- Agent values
affinity:
Expand Down Expand Up @@ -393,7 +397,7 @@ persistence:
# -- The NFS server PV reclaim policy
# @section -- Persistence
persistentVolumeReclaimPolicy: Retain

nfs:
# -- If enabled, runs an in-cluster NFS server pod to support scaled, multi-node script pod execution.
# @section -- Persistence
Expand Down
Loading