Skip to content

adding support for setting up the secretKey in both user provided sec… #355

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

adding support for setting up the secretKey in both user provided sec… #355

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
1 change: 1 addition & 0 deletions charts/komodor-agent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ The command removes all the Kubernetes components associated with the chart and
|-----|------|---------|-------------|
| apiKey | guid | `nil` | **(*required*)** To be obtained from komodor app during onboarding |
| apiKeySecret | string | `nil` | Secret name containing Komodor agent api key |
| secretKey | string | `apiKey` | Secret key used in the provided secret |
| createNamespace | bool | `true` | Creates the namespace |
| tags | dict | `{}` | Tags the agent in order to identify it based on `key:value` properties separated by semicolon (`;`) example: `--set tags.env=staging,tags.team=payments` --- Can also be set in the values under `tags` as a dictionary of key:value strings |
| clusterName | string | `nil` | **(*required*)** Name to be displayed in the Komodor web application |
Expand Down
4 changes: 2 additions & 2 deletions charts/komodor-agent/templates/metrics/_containers_deamon.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@
secretKeyRef:
{{- if .Values.apiKeySecret }}
name: {{ .Values.apiKeySecret | required "Existing secret name required!" }}
key: apiKey
key: {{ .Values.secretKey }}
{{- else }}
name: {{ include "komodorAgent.secret.name" . }}
key: apiKey
key: {{ .Values.secretKey }}
{{- end }}
{{- if gt (len .Values.components.komodorDaemon.metricsInit.extraEnvVars) 0 }}
{{ toYaml .Values.components.komodorDaemon.metricsInit.extraEnvVars | nindent 2 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/komodor-agent/templates/metrics/_containers_deployment.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
secretKeyRef:
{{- if .Values.apiKeySecret }}
name: {{ .Values.apiKeySecret | required "Existing secret name required!" }}
key: apiKey
key: {{ .Values.secretKey }}
{{- else }}
name: {{ include "komodorAgent.secret.name" . }}
key: apiKey
key: {{ .Values.secretKey }}
{{- end }}
{{- if gt (len .Values.components.komodorMetrics.metricsInit.extraEnvVars) 0 }}
{{ toYaml .Values.components.komodorMetrics.metricsInit.extraEnvVars | nindent 2 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/komodor-agent/templates/node-enricher/_containers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
secretKeyRef:
{{- if .Values.apiKeySecret }}
name: {{ .Values.apiKeySecret | required "Existing secret name required!" }}
key: apiKey
key: {{ .Values.secretKey }}
{{- else }}
name: {{ include "komodorAgent.secret.name" . }}
key: apiKey
key: {{ .Values.secretKey }}
{{- end }}
- name: NODE_NAME
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion charts/komodor-agent/templates/secret-credentials.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ metadata:
name: {{ include "komodorAgent.secret.name" . }}
type: Opaque
data:
apiKey: {{ .Values.apiKey | required "apiKey is a required value!" | b64enc }}
{{ .Values.secretKey }} : {{ .Values.apiKey | required "apiKey is a required value!" | b64enc }}
{{- end }}
10 changes: 5 additions & 5 deletions charts/komodor-agent/templates/watcher/_containers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
secretKeyRef:
{{- if .Values.apiKeySecret }}
name: {{ .Values.apiKeySecret | required "Existing secret name required!" }}
key: apiKey
key: {{ .Values.secretKey }}
{{- else }}
name: {{ include "komodorAgent.secret.name" . }}
key: apiKey
key: {{ .Values.secretKey }}
{{- end }}
- name: KOMOKW_CLUSTER_NAME
value: {{ .Values.clusterName }}
Expand Down Expand Up @@ -66,7 +66,7 @@
port: http-healthz
initialDelaySeconds: 5
periodSeconds: 5
failureThreshold: 3
failureThreshold: 3git
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
failureThreshold: 3git
failureThreshold: 3

successThreshold: 1
{{- end -}}

Expand All @@ -87,10 +87,10 @@
secretKeyRef:
{{- if .Values.apiKeySecret }}
name: {{ .Values.apiKeySecret }}
key: apiKey
key: {{ .Values.secretKey }}
{{- else }}
name: {{ include "komodorAgent.secret.name" . }}
key: apiKey
key: {{ .Values.secretKey }}
{{- end }}
- name: KOMOKW_SERVERS_HEALTHCHECK_PORT
value: {{ .Values.components.komodorAgent.supervisor.ports.healthCheck | quote }}
Expand Down
2 changes: 2 additions & 0 deletions charts/komodor-agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# secretKey -- (string) Secret key to be used in the secret
secretKey: apiKey
# apiKey -- (guid) **(*required*)** To be obtained from komodor app during onboarding
apiKey:
# apiKeySecret -- (string) Secret name containing Komodor agent api key
Expand Down