Skip to content

Commit

Permalink
Merge pull request #80 from shopware/store-sa-mapping
Browse files Browse the repository at this point in the history
fix: add service account to store definition
  • Loading branch information
shadracnicholas authored and tombojer committed Oct 25, 2024
2 parents 47e6053 + 8f7bcb9 commit 5a6e3cf
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 3 additions & 3 deletions charts/shopware/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.22
version: 0.0.23

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.0.22"
appVersion: "0.0.23"

dependencies:
- name: pxc-operator
Expand Down Expand Up @@ -87,4 +87,4 @@ dependencies:
alias: otel-collector
version: 0.108.0
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
condition: otel-collector.enabled
condition: otel-collector.enabled
6 changes: 5 additions & 1 deletion charts/shopware/templates/store.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ spec:
s3Storage:
{{- include "getStoreS3" . | nindent 4 -}}

{{- if .Values.store.serviceAccountName }}
serviceAccountName: {{ .Values.store.serviceAccountName }}
{{- end }}

{{- if hasKey .Values "blackfire" }}
{{- if hasKey .Values.blackfire "serverID" }}
{{- if hasKey .Values.blackfire "serverToken" }}
Expand Down Expand Up @@ -244,4 +248,4 @@ spec:
name: {{ template "getFluentBitName" . }}
defaultMode: 420
{{- end}}


0 comments on commit 5a6e3cf

Please sign in to comment.