Commit dde4e3f2 authored Oct 02, 2024 by Jorge Moratinos

Change Mockserver default port to 9100 to avoid local deployment conflict with...

Change Mockserver default port to 9100 to avoid local deployment conflict with monitoring components

parent c08ce481

.gitignore

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -19,15 +19,15 @@ services/easy_rsa/certs/EasyRSA
	services/easy_rsa/certs/*.profile		services/easy_rsa/certs/*.profile
	services/easy_rsa/certs/*.csr		services/easy_rsa/certs/*.csr

	monitoring/grafana/grafana_db/*		services/monitoring/grafana/grafana_db/*
	!monitoring/grafana/grafana_db/.keep		!services/monitoring/grafana/grafana_db/.keep
	monitoring/prometheus/prometheus_db/*		services/monitoring/prometheus/prometheus_db/*
	!monitoring/prometheus/prometheus_db/.keep		!services/monitoring/prometheus/prometheus_db/.keep
	monitoring/prometheus/alert.rules/*		services/monitoring/prometheus/alert.rules/*
	!monitoring/prometheus/alert.rules/.keep		!services/monitoring/prometheus/alert.rules/.keep
	monitoring/tempo/tempo-data/*		services/monitoring/tempo/tempo-data/*
	!monitoring/tempo/tempo-data/.keep		!services/monitoring/tempo/tempo-data/.keep
			services/monitoring/grafana/grafana_db/*

	docs/testing_with_postman/node_modules		docs/testing_with_postman/node_modules
	docs/testing_with_postman/Responses		docs/testing_with_postman/Responses

helm/capif/charts/mock-server/README.md

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ A Helm chart for Kubernetes of mock-server OCF
	\| ingress.tls \| list \| `[]` \| \|		\| ingress.tls \| list \| `[]` \| \|
	\| livenessProbe.initialDelaySeconds \| int \| `20` \| \|		\| livenessProbe.initialDelaySeconds \| int \| `20` \| \|
	\| livenessProbe.periodSeconds \| int \| `5` \| \|		\| livenessProbe.periodSeconds \| int \| `5` \| \|
	\| livenessProbe.tcpSocket.port \| int \| `9090` \| \|		\| livenessProbe.tcpSocket.port \| int \| `9100` \| \|
	\| nameOverride \| string \| `""` \| \|		\| nameOverride \| string \| `""` \| \|
	\| nodeSelector \| object \| `{}` \| \|		\| nodeSelector \| object \| `{}` \| \|
	\| podAnnotations \| object \| `{}` \| \|		\| podAnnotations \| object \| `{}` \| \|
	@@ -39,7 +39,7 @@ A Helm chart for Kubernetes of mock-server OCF
	\| replicaCount \| int \| `1` \| \|		\| replicaCount \| int \| `1` \| \|
	\| resources \| object \| `{}` \| \|		\| resources \| object \| `{}` \| \|
	\| securityContext \| object \| `{}` \| \|		\| securityContext \| object \| `{}` \| \|
	\| service.port \| int \| `9090` \| \|		\| service.port \| int \| `9100` \| \|
	\| service.type \| string \| `"ClusterIP"` \| \|		\| service.type \| string \| `"ClusterIP"` \| \|
	\| serviceAccount.annotations \| object \| `{}` \| \|		\| serviceAccount.annotations \| object \| `{}` \| \|
	\| serviceAccount.automount \| bool \| `true` \| \|		\| serviceAccount.automount \| bool \| `true` \| \|

helm/capif/charts/mock-server/values.yaml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,7 @@ securityContext: {}

	service:		service:
	type: ClusterIP		type: ClusterIP
	port: 9090		port: 9100

	ingress:		ingress:
	enabled: true		enabled: true
	@@ -78,7 +78,7 @@ resources:

	livenessProbe:		livenessProbe:
	tcpSocket:		tcpSocket:
	port: 9090		port: 9100
	initialDelaySeconds: 20		initialDelaySeconds: 20
	periodSeconds: 5		periodSeconds: 5
	readinessProbe:		readinessProbe:

helm/scripts/create_remote_users.sh

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ CAPIF_VAULT_TOKEN=$VAULT_ACCESS_TOKEN

	# Mock Server		# Mock Server
	MOCK_SERVER_URL=http://mock-server-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN:80		MOCK_SERVER_URL=http://mock-server-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN:80
	NOTIFICATION_DESTINATION_URL=http://mock-server.$CAPIF_NAMESPACE.svc.cluster.local:9090		NOTIFICATION_DESTINATION_URL=http://mock-server.$CAPIF_NAMESPACE.svc.cluster.local:9100

	# Show variables		# Show variables
	echo "CAPIF_HOSTNAME = $CAPIF_HOSTNAME"		echo "CAPIF_HOSTNAME = $CAPIF_HOSTNAME"

helm/scripts/populate_create_remote_dummy_users.sh

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,7 @@ CAPIF_VAULT_TOKEN=$VAULT_ACCESS_TOKEN

	# Mock Server		# Mock Server
	MOCK_SERVER_URL=http://mock-server-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN:80		MOCK_SERVER_URL=http://mock-server-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN:80
	NOTIFICATION_DESTINATION_URL=http://mock-server.$CAPIF_NAMESPACE.svc.cluster.local:9090		NOTIFICATION_DESTINATION_URL=http://mock-server.$CAPIF_NAMESPACE.svc.cluster.local:9100


	# Show variables		# Show variables