Updated helm files (6cd10457) · Commits · OCF / capif

helm/capif/Chart.yaml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13,12 +13,12 @@ type: application
	# This is the chart version. This version number should be incremented each time you make changes		# 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.		# to the chart and its templates, including the app version.
	# Versions are expected to follow Semantic Versioning (https://semver.org/)		# Versions are expected to follow Semantic Versioning (https://semver.org/)
	version: v3.1.4		version: v3.1.6
	# This is the version number of the application being deployed. This version number should be		# 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		# 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.		# follow Semantic Versioning. They should reflect the version the application is using.
	# It is recommended to use it with quotes.		# It is recommended to use it with quotes.
	appVersion: "v3.1.4"		appVersion: "v3.1.6"
	dependencies:		dependencies:
	- name: "tempo"		- name: "tempo"
	condition: tempo.enabled		condition: tempo.enabled

helm/capif/templates/deployment.yaml

+70 −2

Original line number	Original line	Diff line number	Diff line
	@@ -558,8 +558,15 @@ spec:
	image: {{ .Values.mongoRegister.mongo.image.repository }}:{{ .Values.mongoRegister.mongo.image.tag \| default .Chart.AppVersion }}		image: {{ .Values.mongoRegister.mongo.image.repository }}:{{ .Values.mongoRegister.mongo.image.tag \| default .Chart.AppVersion }}
	imagePullPolicy: {{ .Values.mongoRegister.mongo.image.imagePullPolicy }}		imagePullPolicy: {{ .Values.mongoRegister.mongo.image.imagePullPolicy }}
	name: mongo-register		name: mongo-register
			{{- if .Values.mongoRegister.mongo.persistence.enable }}
			volumeMounts:
			- name: mongo-register-pvc
			mountPath: /data/db
			{{- end }}
	ports:		ports:
	- containerPort: 27017		- containerPort: 27017
			securityContext:
			runAsUser: 999
	resources:		resources:
	{{- toYaml .Values.mongoRegister.mongo.resources \| nindent 12 }}		{{- toYaml .Values.mongoRegister.mongo.resources \| nindent 12 }}
	readinessProbe:		readinessProbe:
	@@ -567,6 +574,12 @@ spec:
	port: 27017		port: 27017
	# initialDelaySeconds: 5		# initialDelaySeconds: 5
	periodSeconds: 5		periodSeconds: 5
			{{- if .Values.mongoRegister.mongo.persistence.enable }}
			volumes:
			- name: mongo-register-pvc
			persistentVolumeClaim:
			claimName: mongo-register-pvc
			{{- end }}
	restartPolicy: Always		restartPolicy: Always
	{{- end }}		{{- end }}
	---		---
	@@ -674,7 +687,7 @@ spec:
	ports:		ports:
	- containerPort: 27017		- containerPort: 27017
	securityContext:		securityContext:
	runAsUser: 0		runAsUser: 999
	{{- if eq .Values.mongo.persistence.enable "true" }}		{{- if eq .Values.mongo.persistence.enable "true" }}
	volumeMounts:		volumeMounts:
	- name: mongo-pvc		- name: mongo-pvc
	@@ -765,6 +778,61 @@ spec:
	periodSeconds: 5		periodSeconds: 5
	restartPolicy: Always		restartPolicy: Always
	---		---

			apiVersion: apps/v1
			kind: Deployment
			metadata:
			name: mongo-register-express
			labels:
			io.kompose.service: mongo-register-express
			{{- include "capif.labels" . \| nindent 4 }}
			annotations:
			kompose.cmd: kompose -f ../services/docker-compose.yml convert
			spec:
			replicas: {{ .Values.mongoRegisterExpress.replicas }}
			selector:
			matchLabels:
			io.kompose.service: mongo-register-express
			{{- include "capif.selectorLabels" . \| nindent 6 }}
			template:
			metadata:
			labels:
			io.kompose.network/services-default: "true"
			io.kompose.service: mongo-register-express
			{{- include "capif.selectorLabels" . \| nindent 8 }}
			annotations:
			date: "{{ now \| unixEpoch }}"
			spec:
			hostAliases:
			- ip: "{{ .Values.ingress.ip }}"
			hostnames:
			- "{{ .Values.nginx.nginx.env.capifHostname }}"
			containers:
			- env:
			- name: ME_CONFIG_MONGODB_ADMINPASSWORD
			value: {{ quote .Values.mongoRegisterExpress.mongoRegisterExpress.env.meConfigMongodbAdminpassword
			}}
			- name: ME_CONFIG_MONGODB_ADMINUSERNAME
			value: {{ quote .Values.mongoRegisterExpress.mongoRegisterExpress.env.meConfigMongodbAdminusername
			}}
			- name: ME_CONFIG_MONGODB_URL
			value: {{ quote .Values.mongoRegisterExpress.mongoRegisterExpress.env.meConfigMongodbUrl }}
			- name: KUBERNETES_CLUSTER_DOMAIN
			value: {{ quote .Values.kubernetesClusterDomain }}
			image: {{ .Values.mongoRegisterExpress.mongoRegisterExpress.image.repository }}:{{ .Values.mongoRegisterExpress.mongoRegisterExpress.image.tag \| default .Chart.AppVersion }}
			imagePullPolicy: {{ .Values.mongoRegisterExpress.mongoRegisterExpress.image.imagePullPolicy }}
			name: mongo-register-express
			ports:
			- containerPort: 8081
			resources:
			{{- toYaml .Values.mongoRegisterExpress.mongoRegisterExpress.resources \| nindent 12 }}
			readinessProbe:
			tcpSocket:
			port: 8081
			# initialDelaySeconds: 0
			periodSeconds: 5
			restartPolicy: Always
			---
	apiVersion: apps/v1		apiVersion: apps/v1
	kind: Deployment		kind: Deployment
	metadata:		metadata:

helm/capif/templates/grafana-pvc.yaml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,6 +7,7 @@ metadata:
	io.kompose.service: grafana-claim0		io.kompose.service: grafana-claim0
	name: grafana-claim0		name: grafana-claim0
	spec:		spec:
			storageClassName: {{ .Values.monitoring.grafana.persistence.storageClass }}
	accessModes:		accessModes:
	- ReadWriteOnce		- ReadWriteOnce
	resources:		resources:

helm/capif/templates/loki-pvc.yaml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,6 +7,7 @@ metadata:
	io.kompose.service: loki-claim0		io.kompose.service: loki-claim0
	name: loki-claim0		name: loki-claim0
	spec:		spec:
			storageClassName: {{ .Values.monitoring.loki.persistence.storageClass }}
	accessModes:		accessModes:
	- ReadWriteOnce		- ReadWriteOnce
	resources:		resources:

helm/capif/templates/mongo-pvc.yaml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,6 +7,7 @@ metadata:
	io.kompose.service: mongo-pvc		io.kompose.service: mongo-pvc
	name: mongo-pvc		name: mongo-pvc
	spec:		spec:
			storageClassName: {{ .Values.mongo.persistence.storageClass }}
	accessModes:		accessModes:
	- ReadWriteOnce		- ReadWriteOnce
	resources:		resources: