diff --git a/.devcontainer/scripts/configure-proxies.sh b/.devcontainer/scripts/configure-proxies.sh index 9a0d0def..8edcb2fa 100755 --- a/.devcontainer/scripts/configure-proxies.sh +++ b/.devcontainer/scripts/configure-proxies.sh @@ -22,7 +22,7 @@ if [ "$HTTP_PROXY" != "" ]; then CONFIGURE_GIT="true" FTP_PROXY=$HTTP_PROXY ALL_PROXY=$HTTP_PROXY - NO_PROXY="localhost,127.0.0.1,0.0.0.0,10.0.0.0/8,192.168.122.0/24,cattle-system.svc,.svc,.cluster.local" + NO_PROXY="localhost,127.0.0.1,0.0.0.0,10.0.0.0/8,192.168.122.0/24,172.0.0.0/8,cattle-system.svc,.svc,.cluster.local" fi echo "Use proxies: $USE_PROXIES" diff --git a/.vscode/scripts/runtime/k3d/configure_controlplane.sh b/.vscode/scripts/runtime/k3d/configure_controlplane.sh index ce9a814a..98edd1e9 100755 --- a/.vscode/scripts/runtime/k3d/configure_controlplane.sh +++ b/.vscode/scripts/runtime/k3d/configure_controlplane.sh @@ -33,10 +33,10 @@ then -p "31883:31883" \ -p "30555:30555" \ -p "30051:30051" \ + --volume $ROOT_DIRECTORY/deploy/runtime/k3d/volume:/mnt/data@server:0 \ -e "HTTP_PROXY=$HTTP_PROXY@server:0" \ -e "HTTPS_PROXY=$HTTPS_PROXY@server:0" \ - --volume $ROOT_DIRECTORY/deploy/runtime/k3d/volume:/mnt/data@server:0 \ - -e "NO_PROXY=localhost@server:0" + -e "NO_PROXY=$NO_PROXY@server:0" else echo "Creating cluster without proxy configuration" k3d cluster create cluster \ diff --git a/.vscode/scripts/runtime/k3d/deploy_runtime.sh b/.vscode/scripts/runtime/k3d/deploy_runtime.sh index fc97ca78..6b47deb9 100755 --- a/.vscode/scripts/runtime/k3d/deploy_runtime.sh +++ b/.vscode/scripts/runtime/k3d/deploy_runtime.sh @@ -48,7 +48,15 @@ then done # We set the tag to the version from the variables above in the script. This overwrites the default values in the values-file. - helm install vehicleappruntime $ROOT_DIRECTORY/deploy/runtime/k3d/helm --values $ROOT_DIRECTORY/deploy/runtime/k3d/helm/values.yaml --set imageSeatService.tag=$SEATSERVICE_TAG --set imageVehicleDataBroker.tag=$DATABROKER_TAG --set imageFeederCan.tag=$FEEDERCAN_TAG --wait --timeout 60s --debug + helm install vehicleappruntime \ + $ROOT_DIRECTORY/deploy/runtime/k3d/helm \ + --values $ROOT_DIRECTORY/deploy/runtime/k3d/helm/values.yaml \ + --set imageSeatService.tag=$SEATSERVICE_TAG \ + --set imageVehicleDataBroker.tag=$DATABROKER_TAG \ + --set imageFeederCan.tag=$FEEDERCAN_TAG \ + --wait \ + --timeout 60s \ + --debug else echo "Runtime already deployed. To redeploy the components, run the task 'K3D - Uninstall runtime' first."