Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/webui-policy-tab (0606d208) · Commits · TFS / controller

deploy/tfs.sh

+51 −6

Original line number	Original line	Diff line number	Diff line
	@@ -428,7 +428,7 @@ if [[ "$TFS_COMPONENTS" == "webui" ]]; then
	curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{		curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{
	"access" : "proxy",		"access" : "proxy",
	"type" : "prometheus",		"type" : "prometheus",
	"name" : "Prometheus",		"name" : "prometheus",
	"url" : "http://prometheus-k8s.monitoring.svc:9090",		"url" : "http://prometheus-k8s.monitoring.svc:9090",
	"basicAuth": false,		"basicAuth": false,
	"isDefault": false,		"isDefault": false,
	@@ -438,23 +438,68 @@ if [[ "$TFS_COMPONENTS" == "webui" ]]; then
	}' ${GRAFANA_URL_UPDATED}/api/datasources		}' ${GRAFANA_URL_UPDATED}/api/datasources
	printf "\n\n"		printf "\n\n"

	echo ">> Creating dashboards..."		echo ">> Creating and staring dashboards..."
	# Ref: https://grafana.com/docs/grafana/latest/http_api/dashboard/		# Ref: https://grafana.com/docs/grafana/latest/http_api/dashboard/

			# Dashboard: L3 Monitoring KPIs
	curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_db_mon_kpis_psql.json' \		curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_db_mon_kpis_psql.json' \
	${GRAFANA_URL_UPDATED}/api/dashboards/db		${GRAFANA_URL_UPDATED}/api/dashboards/db
	echo		echo
			DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-l3-monit"
			DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" \| jq '.dashboard.id')
			curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}
			echo

			# Dashboard: Slice Grouping
	curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_db_slc_grps_psql.json' \		curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_db_slc_grps_psql.json' \
	${GRAFANA_URL_UPDATED}/api/dashboards/db		${GRAFANA_URL_UPDATED}/api/dashboards/db
	printf "\n\n"		echo
			DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-slice-grps"
			DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" \| jq '.dashboard.id')
			curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}
			echo

	echo ">> Staring dashboards..."		# Dashboard: Component RPCs
	DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-l3-monit"		curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_component_rpc.json' \
			${GRAFANA_URL_UPDATED}/api/dashboards/db
			echo
			DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-comp-rpc"
	DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" \| jq '.dashboard.id')		DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" \| jq '.dashboard.id')
	curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}		curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}
	echo		echo

	DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-slice-grps"		# Dashboard: Device Drivers
			curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_device_driver.json' \
			${GRAFANA_URL_UPDATED}/api/dashboards/db
			echo
			DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-dev-drv"
			DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" \| jq '.dashboard.id')
			curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}
			echo

			# Dashboard: Service Handlers
			curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_service_handler.json' \
			${GRAFANA_URL_UPDATED}/api/dashboards/db
			echo
			DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-svc-hdlr"
			DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" \| jq '.dashboard.id')
			curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}
			echo

			# Dashboard: Device ConfigureDevice Details
			curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_device_config_exec_details.json' \
			${GRAFANA_URL_UPDATED}/api/dashboards/db
			echo
			DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-dev-confdev"
			DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" \| jq '.dashboard.id')
			curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}
			echo

			# Dashboard: Load Generator Status
			curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_load_generator.json' \
			${GRAFANA_URL_UPDATED}/api/dashboards/db
			echo
			DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-loadgen-stats"
	DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" \| jq '.dashboard.id')		DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" \| jq '.dashboard.id')
	curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}		curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}
	echo		echo

manifests/cockroachdb/client-secure-operator.yaml

+2 −2

Original line number	Original line	Diff line number	Diff line
	# Copyright 2022 The Cockroach Authors		# Copyright 2023 The Cockroach Authors
	#		#
	# Licensed under the Apache License, Version 2.0 (the "License");		# Licensed under the Apache License, Version 2.0 (the "License");
	# you may not use this file except in compliance with the License.		# you may not use this file except in compliance with the License.
	@@ -23,7 +23,7 @@ spec:
	serviceAccountName: cockroachdb-sa		serviceAccountName: cockroachdb-sa
	containers:		containers:
	- name: cockroachdb-client-secure		- name: cockroachdb-client-secure
	image: cockroachdb/cockroach:v22.2.0		image: cockroachdb/cockroach:v22.2.8
	imagePullPolicy: IfNotPresent		imagePullPolicy: IfNotPresent
	volumeMounts:		volumeMounts:
	- name: client-certs		- name: client-certs

manifests/cockroachdb/cluster.yaml

+7 −8

Original line number	Original line	Diff line number	Diff line
	# Copyright 2022 The Cockroach Authors		# Copyright 2023 The Cockroach Authors
	#		#
	# Licensed under the Apache License, Version 2.0 (the "License");		# Licensed under the Apache License, Version 2.0 (the "License");
	# you may not use this file except in compliance with the License.		# you may not use this file except in compliance with the License.
	@@ -33,17 +33,16 @@ spec:
	resources:		resources:
	requests:		requests:
	# This is intentionally low to make it work on local k3d clusters.		# This is intentionally low to make it work on local k3d clusters.
	cpu: 100m		cpu: 4
	memory: 1Gi
	limits:
	cpu: 1
	memory: 4Gi		memory: 4Gi
			limits:
			cpu: 8
			memory: 8Gi
	tlsEnabled: true		tlsEnabled: true
	# You can set either a version of the db or a specific image name		# You can set either a version of the db or a specific image name
	# cockroachDBVersion: v22.2.0		# cockroachDBVersion: v22.2.8
	image:		image:
	#name: cockroachdb/cockroach:v22.2.0		name: cockroachdb/cockroach:v22.2.8
	name: cockroachdb/cockroach:latest-v22.2
	# nodes refers to the number of crdb pods that are created		# nodes refers to the number of crdb pods that are created
	# via the statefulset		# via the statefulset
	nodes: 3		nodes: 3

manifests/cockroachdb/crds.yaml

+251 −17

File changed.

Preview size limit exceeded, changes collapsed.

manifests/cockroachdb/operator.yaml

+28 −2

Original line number	Original line	Diff line number	Diff line
	# Copyright 2022 The Cockroach Authors		# Copyright 2023 The Cockroach Authors
	#		#
	# Licensed under the Apache License, Version 2.0 (the "License");		# Licensed under the Apache License, Version 2.0 (the "License");
	# you may not use this file except in compliance with the License.		# you may not use this file except in compliance with the License.
	@@ -538,8 +538,34 @@ spec:
	value: cockroachdb/cockroach:v22.1.11		value: cockroachdb/cockroach:v22.1.11
	- name: RELATED_IMAGE_COCKROACH_v22_1_12		- name: RELATED_IMAGE_COCKROACH_v22_1_12
	value: cockroachdb/cockroach:v22.1.12		value: cockroachdb/cockroach:v22.1.12
			- name: RELATED_IMAGE_COCKROACH_v22_1_13
			value: cockroachdb/cockroach:v22.1.13
			- name: RELATED_IMAGE_COCKROACH_v22_1_14
			value: cockroachdb/cockroach:v22.1.14
			- name: RELATED_IMAGE_COCKROACH_v22_1_15
			value: cockroachdb/cockroach:v22.1.15
			- name: RELATED_IMAGE_COCKROACH_v22_1_16
			value: cockroachdb/cockroach:v22.1.16
			- name: RELATED_IMAGE_COCKROACH_v22_1_18
			value: cockroachdb/cockroach:v22.1.18
	- name: RELATED_IMAGE_COCKROACH_v22_2_0		- name: RELATED_IMAGE_COCKROACH_v22_2_0
	value: cockroachdb/cockroach:v22.2.0		value: cockroachdb/cockroach:v22.2.0
			- name: RELATED_IMAGE_COCKROACH_v22_2_1
			value: cockroachdb/cockroach:v22.2.1
			- name: RELATED_IMAGE_COCKROACH_v22_2_2
			value: cockroachdb/cockroach:v22.2.2
			- name: RELATED_IMAGE_COCKROACH_v22_2_3
			value: cockroachdb/cockroach:v22.2.3
			- name: RELATED_IMAGE_COCKROACH_v22_2_4
			value: cockroachdb/cockroach:v22.2.4
			- name: RELATED_IMAGE_COCKROACH_v22_2_5
			value: cockroachdb/cockroach:v22.2.5
			- name: RELATED_IMAGE_COCKROACH_v22_2_6
			value: cockroachdb/cockroach:v22.2.6
			- name: RELATED_IMAGE_COCKROACH_v22_2_7
			value: cockroachdb/cockroach:v22.2.7
			- name: RELATED_IMAGE_COCKROACH_v22_2_8
			value: cockroachdb/cockroach:v22.2.8
	- name: OPERATOR_NAME		- name: OPERATOR_NAME
	value: cockroachdb		value: cockroachdb
	- name: WATCH_NAMESPACE		- name: WATCH_NAMESPACE
	@@ -552,7 +578,7 @@ spec:
	valueFrom:		valueFrom:
	fieldRef:		fieldRef:
	fieldPath: metadata.namespace		fieldPath: metadata.namespace
	image: cockroachdb/cockroach-operator:v2.9.0		image: cockroachdb/cockroach-operator:v2.10.0
	imagePullPolicy: IfNotPresent		imagePullPolicy: IfNotPresent
	name: cockroach-operator		name: cockroach-operator
	resources:		resources: