Commit 51078a90 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'OCF79-prepare-code-for-hackfest' into 'staging' 

Resolve "Prepare Code for Hackfest"

See merge request !68
parents b6dc9a05 edefdbb2

.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

+9 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,14 @@ 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



PLATFORM=$(uname -m)

if [ "x86_64" == "$PLATFORM" ]; then

  DOCKER_ROBOT_IMAGE_VERSION=$DOCKER_ROBOT_IMAGE_VERSION-amd64

else

  DOCKER_ROBOT_IMAGE_VERSION=$DOCKER_ROBOT_IMAGE_VERSION-arm64

fi





# Show variables

# Show variables

echo "CAPIF_HOSTNAME = $CAPIF_HOSTNAME"

echo "CAPIF_HOSTNAME = $CAPIF_HOSTNAME"
@@ -90,6 +97,7 @@ echo "USERNAME_PREFIX=$USERNAME_PREFIX" 
echo "USER_PASSWORD=$USER_PASSWORD"

echo "USER_PASSWORD=$USER_PASSWORD"

echo "MOCK_SERVER_URL=$MOCK_SERVER_URL"

echo "MOCK_SERVER_URL=$MOCK_SERVER_URL"

echo "NOTIFICATION_DESTINATION_URL=$NOTIFICATION_DESTINATION_URL"

echo "NOTIFICATION_DESTINATION_URL=$NOTIFICATION_DESTINATION_URL"

echo "DOCKER_ROBOT_IMAGE = $DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION"





docker >/dev/null 2>/dev/null

docker >/dev/null 2>/dev/null

if [[ $? -ne 0 ]]

if [[ $? -ne 0 ]]

helm/scripts/populate_create_remote_dummy_users.sh

+8 −1
Original line number Original line Diff line number Diff line
@@ -56,8 +56,14 @@ 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





PLATFORM=$(uname -m)

if [ "x86_64" == "$PLATFORM" ]; then

  DOCKER_ROBOT_IMAGE_VERSION=$DOCKER_ROBOT_IMAGE_VERSION-amd64

else

  DOCKER_ROBOT_IMAGE_VERSION=$DOCKER_ROBOT_IMAGE_VERSION-arm64

fi





# Show variables

# Show variables

echo "CAPIF_HOSTNAME = $CAPIF_HOSTNAME"

echo "CAPIF_HOSTNAME = $CAPIF_HOSTNAME"
@@ -72,6 +78,7 @@ echo "USERNAME_PREFIX=$USERNAME_PREFIX" 
echo "USER_PASSWORD=$USER_PASSWORD"

echo "USER_PASSWORD=$USER_PASSWORD"

echo "MOCK_SERVER_URL=$MOCK_SERVER_URL"

echo "MOCK_SERVER_URL=$MOCK_SERVER_URL"

echo "NOTIFICATION_DESTINATION_URL=$NOTIFICATION_DESTINATION_URL"

echo "NOTIFICATION_DESTINATION_URL=$NOTIFICATION_DESTINATION_URL"

echo "DOCKER_ROBOT_IMAGE = $DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION"





docker >/dev/null 2>/dev/null

docker >/dev/null 2>/dev/null

if [[ $? -ne 0 ]]

if [[ $? -ne 0 ]]