refactor Helm ConfigMaps: Load full configuration from values.yaml (bfbabdbf) · Commits · OCF / capif

helm/capif/charts/ocf-helper/templates/ocf-helper-configmap.yaml

+4 −22

Original line number	Diff line number	Diff line
		@@ -23,25 +23,7 @@ data:
		"token": {{ quote .Values.env.vaultAccessToken }}
		}

		capif_configuration: {
		'config_name': "{{ .Values.env.configName }}",
		'version': "{{ .Values.env.configVersion }}",
		'description': "{{ .Values.env.configDescription }}",
		'settings': {
		'certificates_expiry': {
		ttl_superadmin_cert: "{{ .Values.env.ttlSuperadminCert }}",
		ttl_invoker_cert: "{{ .Values.env.ttlInvokerCert }}",
		ttl_provider_cert: "{{ .Values.env.ttlProviderCert }}",
		},
		'security_method_priority': {
		oauth: "{{ .Values.env.oauthPriotity }}",
		pki: "{{ .Values.env.pkiPriority }}",
		psk: "{{ .Values.env.pskPriority }}"
		},
		'acl_policy_settings': {
		allowed_total_invocations: "{{ .Values.env.allowedTotalInvocations }}",
		allowed_invocations_per_second: "{{ .Values.env.allowedInvocationsPerSecond }}",
		allowed_invocation_time_range_days: "{{ .Values.env.allowedInvocationTimeRangeDays }}"
		}
		}
		}
		No newline at end of file
		{{- if .Values.capifConfiguration }}
		capif_configuration:
		{{- toYaml .Values.capifConfiguration \| regexReplaceAll "([a-z])([A-Z])" "${1}_${2}" \| lower \| nindent 4 }}
		{{- end }}
		No newline at end of file

+15 −9

Original line number	Diff line number	Diff line
		@@ -24,15 +24,21 @@ env:
		mongoInitdbRootUsername: root
		mongoInitdbRootPassword: example
		logLevel: "INFO"

		capifConfiguration:
		configName: "default"
		configVersion: "1.0"
		configDescription: "Default CAPIF Configuration"
		settings:
		certificatesExpiry:
		ttlSuperadminCert: "4300h"
		ttlInvokerCert: "4300h"
		ttlProviderCert: "4300h"
		oauthPriotity: 1
		securityMethodPriority:
		oauthPriority: 1
		pkiPriority: 2
		pskPriority: 3
		aclPolicySettings:
		allowedTotalInvocations: 5
		allowedInvocationsPerSecond: 10
		allowedInvocationTimeRangeDays: 365

+4 −10

Original line number	Diff line number	Diff line
		@@ -31,13 +31,7 @@ data:
		admin_pass: "password123"}
		}

		capif_configuration: {
		config_name: "{{ .Values.env.configName }}",
		version: "{{ .Values.env.configVersion }}",
		description: "{{ .Values.env.configDescription }}",
		settings: {
		certificates_expiry: {
		ttl_superadmin_cert: "{{ .Values.env.ttlSuperadminCert }}",
		}
		}
		}
		{{- if .Values.capifConfiguration }}
		capif_configuration:
		{{- toYaml .Values.capifConfiguration \| regexReplaceAll "([a-z])([A-Z])" "${1}_${2}" \| lower \| nindent 4 }}
		{{- end }}

+5 −1

Original line number	Diff line number	Diff line
		@@ -23,9 +23,13 @@ env:
		capifHostname: capif-test.example.int
		logLevel: "INFO"
		timeout: "30"

		capifConfiguration:
		configName: "default"
		configVersion: "1.0"
		configDescription: "Default Register Configuration"
		settings:
		certificatesExpiry:
		ttlSuperadminCert: "4300h"

		serviceAccount: