Commit 211d2d70 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'staging' into 'OCF17-parse-response-from-db-to-object-to-accomplish-spec' 

# Conflicts:
#   services/register/register_service/core/register_operations.py
parents b115ba91 5497a0d3

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ monitoring/tempo/tempo-data/* 




docs/testing_with_postman/*node_modules*

docs/testing_with_postman/Responses

docs/testing_with_postman/package-lock.json



results

docs/testing_with_postman/CAPIF.postman_collection.json

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ 
				],

				"body": {

					"mode": "raw",

					"raw": "{\n\"name\": {{USERNAME_INVOKER}}\n}",

					"raw": "{\n\"name\": \"{{USERNAME_INVOKER}}\"\n}",

					"options": {

						"raw": {

							"language": "json"

docs/testing_with_postman/CAPIF.postman_environment.json

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@ 
			"type": "default",

			"enabled": true

		},

		{

			"key": "USERNAME_INVOKER",

			"value": "InvokerONE",

			"type": "default",

			"enabled": true

		},

		{

			"key": "PASSWORD",

			"value": "pass",

prometheus/kustomization.yaml

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
apiVersion: kustomize.config.k8s.io/v1beta1

kind: Kustomization

namespace: evol5-capif-mon

resources:

    - prometheus-claim1-persistentvolumeclaim.yaml

    - prometheus-claim2-persistentvolumeclaim.yaml

    - prometheus-claim3-persistentvolumeclaim.yaml

    - prometheus-claim4-persistentvolumeclaim.yaml

    - prometheus-configmap.yaml

    - prometheus-deployment.yaml

    - prometheus-service.yaml
 
 No newline at end of file

prometheus/prometheus-claim1-persistentvolumeclaim.yaml

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
apiVersion: v1

kind: PersistentVolumeClaim

metadata:

  creationTimestamp: null

  labels:

    io.kompose.service: prometheus-claim1

  name: prometheus-claim1

spec:

  accessModes:

    - ReadWriteOnce

  resources:

    requests:

      storage: 100Mi

status: {}