Merge branch 'staging' into OCF43-update-register-service (59a3bfc4) · Commits · OCF / capif

.gitignore

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,7 @@ __pycache__/
	*.crt		*.crt
	*.zip		*.zip
	*.srl		*.srl
			*.log
	services/nginx/certs/sign_req_body.json		services/nginx/certs/sign_req_body.json
	services/easy_rsa/certs/pki		services/easy_rsa/certs/pki
	services/easy_rsa/certs/EasyRSA		services/easy_rsa/certs/EasyRSA
	@@ -35,4 +36,8 @@ docs/testing_with_postman/package-lock.json
	results		results

	helm/capif/*.lock		helm/capif/*.lock
			<<<<<<< HEAD
	helm/capif/charts		helm/capif/charts
			=======
			helm/capif/charts/tempo*
			>>>>>>> staging

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			delete me

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,8 @@ version: v3.1.6
	# It is recommended to use it with quotes.		# It is recommended to use it with quotes.
	appVersion: "v3.1.6"		appVersion: "v3.1.6"
	dependencies:		dependencies:
			- name: helper
			version: "*"
	- name: "tempo"		- name: "tempo"
	condition: tempo.enabled		condition: tempo.enabled
	repository: "https://grafana.github.io/helm-charts"		repository: "https://grafana.github.io/helm-charts"

0 → 100644

+23 −0

Original line number	Original line	Diff line number	Diff line
			# Patterns to ignore when building packages.
			# This supports shell glob matching, relative path matching, and
			# negation (prefixed with !). Only one pattern per line.
			.DS_Store
			# Common VCS dirs
			.git/
			.gitignore
			.bzr/
			.bzrignore
			.hg/
			.hgignore
			.svn/
			# Common backup files
			*.swp
			*.bak
			*.tmp
			*.orig
			*~
			# Various IDEs
			.project
			.idea/
			*.tmproj
			.vscode/

0 → 100644

+24 −0

Original line number	Original line	Diff line number	Diff line
			apiVersion: v2
			name: helper
			description: A Helm chart for Kubernetes

			# A chart can be either an 'application' or a 'library' chart.
			#
			# Application charts are a collection of templates that can be packaged into versioned archives
			# to be deployed.
			#
			# Library charts provide useful utilities or functions for the chart developer. They're included as
			# a dependency of application charts to inject those utilities and functions into the rendering
			# pipeline. Library charts do not define any templates and therefore cannot be deployed.
			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.1.0

			# 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: "1.16.0"