Merge branch 'staging' into 'main' (4382dfea) · Commits · OCF / capif

.gitignore

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -37,4 +37,5 @@ results

	helm/capif/*.lock		helm/capif/*.lock
	helm/capif/charts/tempo*		helm/capif/charts/tempo*
			*.bakresults/
	*.bak		*.bak

helm/capif/Chart.yaml

+38 −10

Original line number	Original line	Diff line number	Diff line
	@@ -22,57 +22,85 @@ appVersion: "v3.1.6"
	dependencies:		dependencies:
	- name: ocf-access-control-policy		- name: ocf-access-control-policy
	version: "*"		version: "*"
			tags: ["core"]
	- name: ocf-api-invoker-management		- name: ocf-api-invoker-management
	version: "*"		version: "*"
			tags: ["core"]
	- name: ocf-api-provider-management		- name: ocf-api-provider-management
	version: "*"		version: "*"
			tags: ["core"]
	- name: ocf-api-invocation-logs		- name: ocf-api-invocation-logs
	version: "*"		version: "*"
			tags: ["core"]
	- name: ocf-events		- name: ocf-events
	version: "*"		version: "*"
			tags: ["core"]
	- name: ocf-helper		- name: ocf-helper
	version: "*"		version: "*"
			tags: ["core"]
	- name: ocf-routing-info		- name: ocf-routing-info
	version: "*"		version: "*"
			tags: ["core"]
	- name: ocf-security		- name: ocf-security
	version: "*"		version: "*"
	- name: ocf-register		tags: ["core"]
	version: "*"
	- name: mongo-register
	version: "*"
	- name: ocf-auditing-api-logs		- name: ocf-auditing-api-logs
	version: "*"		version: "*"
			tags: ["core"]
	- name: ocf-publish-service-api		- name: ocf-publish-service-api
	version: "*"		version: "*"
			tags: ["core"]
	- name: ocf-discover-service-api		- name: ocf-discover-service-api
	version: "*"		version: "*"
	- name: mongo		tags: ["core"]
	version: "*"
	- name: mongo-express
	version: "*"
	- name: mongo-register-express
	version: "*"
	- name: nginx		- name: nginx
	version: "*"		version: "*"
			tags: ["core"]
	- name: mock-server		- name: mock-server
	version: "*"		version: "*"
			tags: ["core"]
	- name: redis		- name: redis
	version: "*"		version: "*"
			tags: ["core"]
	- name: fluentbit		- name: fluentbit
	version: "*"		version: "*"
			tags: ["core"]
	- name: grafana		- name: grafana
	version: "*"		version: "*"
			tags: ["core"]
	- name: loki		- name: loki
	version: "*"		version: "*"
			tags: ["core"]
	- name: otelcollector		- name: otelcollector
	version: "*"		version: "*"
			tags: ["core"]
	- name: renderer		- name: renderer
	version: "*"		version: "*"
			tags: ["core"]
	- name: celery-beat		- name: celery-beat
	version: "*"		version: "*"
			tags: ["core"]
	- name: celery-worker		- name: celery-worker
	version: "*"		version: "*"
			tags: ["core"]
	- name: "tempo"		- name: "tempo"
	condition: tempo.enabled		condition: tempo.enabled
	repository: "https://grafana.github.io/helm-charts"		repository: "https://grafana.github.io/helm-charts"
	version: "^1.3.1"		version: "^1.3.1"
			tags: ["core"]
			- name: ocf-register
			version: "*"
			tags: ["register"]
			- name: mongo-register
			version: "*"
			tags: ["register-db"]
			- name: mongo-register-express
			version: "*"
			tags: ["register-db"]
			- name: mongo
			version: "*"
			tags: ["core-db"]
			- name: mongo-express
			version: "*"
			tags: ["core-db"]

helm/capif/charts/mongo/templates/deployment.yaml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,7 @@ spec:
	{{- toYaml . \| nindent 12 }}		{{- toYaml . \| nindent 12 }}
	{{- end }}		{{- end }}
	- name: mongo-helper		- name: mongo-helper
	image: busybox		image: "{{ .Values.busybox.repository }}:{{ .Values.busybox.tag \| default .Chart.AppVersion }}"
	command:		command:
	- sh		- sh
	- -c		- -c

helm/capif/charts/mongo/values.yaml

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10,6 +10,12 @@ image:
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "6.0.2"		tag: "6.0.2"

			busybox:
			repository: busybox
			pullPolicy: Always
			# Overrides the image tag whose default is the chart appVersion.
			tag: "1.37.0"

	imagePullSecrets: []		imagePullSecrets: []
	nameOverride: ""		nameOverride: ""
	fullnameOverride: ""		fullnameOverride: ""

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

+16 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,3 +27,18 @@ data:
	{{- if .Values.capifConfiguration }}		{{- if .Values.capifConfiguration }}
	capif_configuration: {{ .Values.capifConfiguration \| toYaml \| nindent 6 }}		capif_configuration: {{ .Values.capifConfiguration \| toYaml \| nindent 6 }}
	{{- end }}		{{- end }}

			package_paths: {
			"helper_api": {
			"path": "/api",
			"openapi_file": "api/openapi/openapi.yaml"
			},
			"configuration_api": {
			"path": "/configuration",
			"openapi_file": "configuration/openapi/openapi.yaml"
			},
			"visibility_control": {
			"path": "/visibility-control",
			"openapi_file": "visibility_control/openapi/openapi.yaml"
			}
			}
			No newline at end of file