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.

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

Adding default configmap and secret to promtail-app #49

Merged
merged 20 commits into from
Mar 24, 2023
Merged

Adding default configmap and secret to promtail-app #49

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1afc8b3
Adding defautl configmap and secret to promtail-app
Mar 22, 2023
87ff009
Fix yaml
Mar 22, 2023
a84f93d
Fix yaml
Mar 22, 2023
d9bd637
Revert namespace update for promtail-app
Mar 22, 2023
4548c46
Move promtail secret definition
Mar 22, 2023
5c0236a
Remove space
Mar 22, 2023
2d4b909
Remove blank line
Mar 22, 2023
6e7fd9a
Use extraConfigs in place of userConfigs for promtail-app
Mar 22, 2023
c6059a5
Templating configmap/secret name and namespace for promtail
Mar 22, 2023
d7d33a3
Move templating in values
Mar 22, 2023
a03d480
Revert the move of the templating
Mar 22, 2023
b212d90
Using anchor to get clusterId
Mar 22, 2023
fec17ad
Fix join syntax
Mar 22, 2023
332cec3
Revert anchor
Mar 22, 2023
1a1a052
Try using tpl function to reuse clusterID in values
Mar 22, 2023
b749603
Revert using tpl function to reuse clusterID in values
Mar 22, 2023
38f2ad3
Use template to set cluster-id
QuentinBisson Mar 22, 2023
5e3f7ca
Merge branch 'main' into add-config-and-secret-to-promtail
QuentinBisson Mar 23, 2023
7121cc7
Update CHANGELOG
Mar 24, 2023
5f62cbf
Merge branch 'main' into add-config-and-secret-to-promtail
marieroque Mar 24, 2023
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 helm/observability-bundle/templates/apps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ spec:
{{- end }}
{{- range $extraConfig := .extraConfigs }}
- kind: {{ $extraConfig.kind }}
name: {{ $.Values.clusterID }}-{{ $extraConfig.name }}
namespace: {{ $.Release.Namespace }}
name: {{ $extraConfig.name }}
namespace: {{ $extraConfig.namespace }}
{{- end }}
{{- end }}
{{- if .userConfig }}
Expand Down
6 changes: 4 additions & 2 deletions helm/observability-bundle/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ apps:
# https://github.com/giantswarm/rfc/tree/main/multi-layer-app-config#example
extraConfigs:
- kind: secret
name: logging-secret
name: {{ $.Values.clusterID }}-logging-secret
marieroque marked this conversation as resolved.
Show resolved Hide resolved
namespace: {{ $.Release.Namespace }}
- kind: configMap
name: logging-config
name: {{ $.Values.clusterID }}-logging-config
namespace: {{ $.Release.Namespace }}