Skip to content

feat(octopus): add agent as optional subchart for default worker #587

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.

Sign up for GitHub

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

Draft
mikhail-klimko wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(octopus): add agent as optional subchart for default worker #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions charts/kubernetes-agent/templates/pre-install-tentacle-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ spec:
name: {{ .Values.agent.bearerTokenSecretName | default (include "kubernetes-agent.preinstall.secrets.serverAuth" .) }}
key: bearer-token
{{- end }}
{{- if or .Values.agent.username .Values.agent.usernamePasswordSecretName }}
{{- if or .Values.global.username .Values.agent.username .Values.agent.usernamePasswordSecretName }}
- name: "ServerUsername"
valueFrom:
secretKeyRef:
name: {{ .Values.agent.usernamePasswordSecretName | default (include "kubernetes-agent.preinstall.secrets.serverAuth" .) }}
key: username
{{- end }}
{{- if or .Values.agent.password .Values.agent.usernamePasswordSecretName }}
{{- if or .Values.global.password .Values.agent.password .Values.agent.usernamePasswordSecretName }}
- name: "ServerPassword"
valueFrom:
secretKeyRef:
Expand Down
8 changes: 4 additions & 4 deletions charts/kubernetes-agent/templates/pre-install-tentacle-server-auth-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ data:
{{- if and (not .Values.agent.bearerTokenSecretName) (not .Values.agent.serverApiKeySecretName) (not .Values.agent.usernamePasswordSecretName) }}
{{- with .Values.agent.bearerToken }}
bearer-token: {{ . | b64enc }}
{{- end }}
{{- end }}
{{- with .Values.agent.serverApiKey }}
api-key: {{ . | b64enc }}
{{- end }}
{{- with .Values.agent.username }}
{{- with (coalesce .Values.global.username .Values.agent.username) }}
username: {{ . | b64enc }}
{{- end }}
{{- with .Values.agent.password }}
{{- with (coalesce .Values.global.password .Values.agent.password) }}
password: {{ . | b64enc }}
{{- end }}
{{- end }}
{{- with .Values.agent.pollingProxy.password }}
polling-proxy-password: {{ . | b64enc }}
{{- end }}
{{- end }}
18 changes: 9 additions & 9 deletions charts/kubernetes-agent/templates/tentacle-deployment.yaml
View file
Open in desktop
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 }}
{{- if or .Values.global.username .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 }}
{{- if or .Values.global.password .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
8 changes: 4 additions & 4 deletions charts/kubernetes-agent/templates/tentacle-server-auth-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ data:
{{- if and (not .Values.agent.bearerTokenSecretName) (not .Values.agent.serverApiKeySecretName) (not .Values.agent.usernamePasswordSecretName) }}
{{- with .Values.agent.bearerToken }}
bearer-token: {{ . | b64enc }}
{{- end }}
{{- end }}
{{- with .Values.agent.serverApiKey }}
api-key: {{ . | b64enc }}
{{- end }}
{{- with .Values.agent.username }}
{{- with (coalesce .Values.global.username .Values.agent.username) }}
username: {{ . | b64enc }}
{{- end }}
{{- with .Values.agent.password }}
{{- with (coalesce .Values.global.password .Values.agent.password) }}
password: {{ . | b64enc }}
{{- end }}
{{- end }}
{{- with .Values.agent.pollingProxy.password }}
polling-proxy-password: {{ . | b64enc }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions charts/octopus-deploy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ dependencies:
- name: mssql
condition: mssql.enabled
version: "0.0.1"
- name: kubernetes-agent
condition: kubernetes-agent.enabled
repository: "file://../kubernetes-agent"
version: "*"
13 changes: 8 additions & 5 deletions charts/octopus-deploy/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
global:
# Set the default storageClass to be used for all persistent volume claims
# this is overridden by the storageClassName in the individual volume claims if specified
storageClass: ""

username: ""
password: ""

octopus:
# Must be set to "Y" or true to accept the EULA at https://octopus.com/legal/customer-agreement
acceptEula: "N"
Expand Down Expand Up @@ -229,8 +237,3 @@ hooks:
# whose selector matchLabels still contain the legacy `helm.sh/chart` key, so that
# the StatefulSet can be re-created with the corrected selector.
enableSelectorLabelsFix: true

global:
# Set the default storageClass to be used for all persistent volume claims
# this is overridden by the storageClassName in the individual volume claims if specified
storageClass: ""
Loading