Merge branch 'update_helm_files' into 'staging' (fb23c3a7) · Commits · OCF / capif

helm/capif/Chart.yaml

+2 −2

Original line number	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
		# to the chart and its templates, including the app version.
		# 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
		# 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: "v3.1.4"
		appVersion: "v3.1.6"
		dependencies:
		- name: "tempo"
		condition: tempo.enabled

helm/capif/templates/deployment.yaml

+70 −2

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

helm/capif/templates/grafana-pvc.yaml

+1 −0

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

helm/capif/templates/loki-pvc.yaml

+1 −0

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

helm/capif/templates/mongo-pvc.yaml

+1 −0

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