Resolve "Prepare Code for Hackfest"

Jorge Moratinosrequested to merge
OCF79-prepare-code-for-hackfest into staging

PLEASE CHECK IF LOCALLY ALL SERVICES ARE WORKING, INCLUDING MONITORING. USE ./run.sh -sm

Edited by Jorge Moratinos

Merge request reports

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

+2 −2
Changes for helm/capif/charts/mock-server/README.md: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ A Helm chart for Kubernetes of mock-server OCF 
| ingress.tls | list | `[]` |  |

| livenessProbe.initialDelaySeconds | int | `20` |  |

| livenessProbe.periodSeconds | int | `5` |  |

| livenessProbe.tcpSocket.port | int | `9090` |  |

| livenessProbe.tcpSocket.port | int | `9100` |  |

| nameOverride | string | `""` |  |

| nodeSelector | object | `{}` |  |

| podAnnotations | object | `{}` |  |
@@ -39,7 +39,7 @@ A Helm chart for Kubernetes of mock-server OCF 
| replicaCount | int | `1` |  |

| resources | object | `{}` |  |

| securityContext | object | `{}` |  |

| service.port | int | `9090` |  |

| service.port | int | `9100` |  |

| service.type | string | `"ClusterIP"` |  |

| serviceAccount.annotations | object | `{}` |  |

| serviceAccount.automount | bool | `true` |  |

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

+2 −2
Changes for helm/capif/charts/mock-server/values.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ securityContext: {} 


service:

  type: ClusterIP

  port: 9090

  port: 9100



ingress:

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


livenessProbe:

  tcpSocket:

    port: 9090

    port: 9100

  initialDelaySeconds: 20

  periodSeconds: 5

readinessProbe:

helm/scripts/create_remote_users.sh

+9 −1
Changes for helm/scripts/create_remote_users.sh: 9 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -75,7 +75,14 @@ CAPIF_VAULT_TOKEN=$VAULT_ACCESS_TOKEN 


# Mock Server

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

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

echo "MOCK_SERVER_URL=$MOCK_SERVER_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

if [[ $? -ne 0 ]]

helm/scripts/populate_create_remote_dummy_users.sh

+8 −1
Changes for helm/scripts/populate_create_remote_dummy_users.sh: 8 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -56,8 +56,14 @@ CAPIF_VAULT_TOKEN=$VAULT_ACCESS_TOKEN 


# Mock Server

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

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

echo "MOCK_SERVER_URL=$MOCK_SERVER_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

if [[ $? -ne 0 ]]

helm/scripts/populate_remove_remote_dummy_users.sh

+8 −1
Changes for helm/scripts/populate_remove_remote_dummy_users.sh: 8 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -45,8 +45,14 @@ CAPIF_VAULT_TOKEN=$VAULT_ACCESS_TOKEN 


# Mock Server

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

echo "CAPIF_HOSTNAME = $CAPIF_HOSTNAME"
@@ -61,6 +67,7 @@ echo "USERNAME_PREFIX=$USERNAME_PREFIX" 
echo "USER_PASSWORD=$USER_PASSWORD"

echo "MOCK_SERVER_URL=$MOCK_SERVER_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

if [[ $? -ne 0 ]]