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

Injecting Region Mapping Config into KEB #820

Merged
merged 3 commits into from
Jun 12, 2024
Merged

Injecting Region Mapping Config into KEB #820

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6408273
Injecting Region Mapping Config into KEB
ralikio Jun 10, 2024
d697496
Apply suggestions from code review
ralikio Jun 11, 2024
2ab03d0
Merge branch 'main' into features/region-mappings-config-yamls
ralikio Jun 12, 2024
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
2 changes: 2 additions & 0 deletions cmd/broker/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ type Config struct {
EuAccessWhitelistedGlobalAccountsFilePath string
EuAccessRejectionMessage string `envconfig:"default=Due to limited availability you need to open support ticket before attempting to provision Kyma clusters in EU Access only regions"`

SapConvergedCloudRegionMappingsFilePath string

MaxPaginationPage int `envconfig:"default=100"`

LogLevel string `envconfig:"default=info"`
Expand Down
4 changes: 4 additions & 0 deletions resources/keb/templates/app-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ data:
euAccessWhitelistedGlobalAccountIds.yaml: |-
{{- with .Values.euAccessWhitelistedGlobalAccountIds }}
{{ tpl . $ | indent 4 }}
{{- end }}
sapConvergedPlanRegionMappings.yaml: |-
ralikio marked this conversation as resolved.
Show resolved Hide resolved
{{- with .Values.sapConvergedPlanRegionMappings }}
ralikio marked this conversation as resolved.
Show resolved Hide resolved
{{ tpl . $ | indent 4 }}
{{- end }}
skrOIDCDefaultValues.yaml: |-
{{- with .Values.skrOIDCDefaultValues }}
Expand Down
2 changes: 2 additions & 0 deletions resources/keb/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@ spec:
value: /config/trialRegionMapping.yaml
- name: APP_EU_ACCESS_WHITELISTED_GLOBAL_ACCOUNTS_FILE_PATH
value: /config/euAccessWhitelistedGlobalAccountIds.yaml
- name: APP_SAP_CONVERGED_CLOUD_REGION_MAPPINGS_FILE_PATH
value: /config/sapConvergedPlanRegionMappings.yaml
ralikio marked this conversation as resolved.
Show resolved Hide resolved
- name: APP_EU_ACCESS_REJECTION_MESSAGE
value: "{{ .Values.euAccessRejectionMessage }}"
- name: APP_FREEMIUM_PROVIDERS
Expand Down
9 changes: 9 additions & 0 deletions resources/keb/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,15 @@ euAccessWhitelistedGlobalAccountIds: |-
whitelist:
euAccessRejectionMessage: "Due to limited availability, you need to open support ticket before attempting to provision Kyma clusters in EU Access only regions"

# Following data serves just as a template
sapConvergedPlanRegionMappings: |-
ralikio marked this conversation as resolved.
Show resolved Hide resolved
cf-eu20-staging:
- eu-de-1
- eu-de-2
cf-eu21-staging:
- eu-de-3
- eu-de-4

kymaVersion: "2.0"
kymaVersionOnDemand: "false"

Expand Down
Loading