merged 0.17 from dev

Author: bartr

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"name": "Res-Edge-Labs",
+	"name": "Pizza-Labs",
 	"dockerFile": "Dockerfile",
 
 	// do not change these if you want Docker in Docker support

.devcontainer/on-create.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
 
-# if you change this, you will have to update the sql and api containers as well
-export MSSQL_SA_PASSWORD=Res-Edge23
-
 # this runs as part of pre-build
 
 echo "on-create start"
 echo "$(date +'%Y-%m-%d %H:%M:%S')    on-create start" >> "$HOME/status"
 
+export MSSQL_NAME=localhost,31433
+
 # Change shell to zsh for vscode
 sudo chsh --shell /bin/zsh vscode
 
@@ -30,7 +29,7 @@ sudo chsh --shell /bin/zsh vscode
     echo "export KIC_BASE=$PWD"
     echo "export KIC_REPO_FULL=\$(git remote get-url --push origin)"
     echo "export KIC_BRANCH=\$(git branch --show-current)"
-    echo "export MSSQL_SA_PASSWORD=$MSSQL_SA_PASSWORD"
+    echo "export MSSQL_NAME=$MSSQL_NAME"
     echo ""
 
     echo "if [ -z \$DS_URL ]; then"
@@ -59,7 +58,7 @@ sudo chsh --shell /bin/zsh vscode
 {
     echo '#!/bin/zsh'
     echo ""
-    echo '/opt/mssql-tools/bin/sqlcmd -d ist -S localhost,31433 -U sa -P "$MSSQL_SA_PASSWORD" "$@"'
+    echo '/opt/mssql-tools/bin/sqlcmd -d ist -S "$MSSQL_NAME" -U sa -P "$MSSQL_SA_PASSWORD" "$@"'
 } > "$HOME/bin/sql"
 chmod +x "$HOME/bin/sql"
 
@@ -108,8 +107,8 @@ kic cluster create
 echo "Pulling docker images"
 docker pull mcr.microsoft.com/dotnet/sdk:7.0
 docker pull mcr.microsoft.com/dotnet/aspnet:7.0-alpine
-docker pull ghcr.io/cse-labs/res-edge-webv:0.16
-docker pull ghcr.io/cse-labs/res-edge-automation:0.16
+docker pull ghcr.io/cse-labs/res-edge-webv:0.17
+docker pull ghcr.io/cse-labs/res-edge-automation:0.17
 
 sudo apt-get update
 

.devcontainer/post-start.sh

@@ -8,8 +8,8 @@ echo "$(date +'%Y-%m-%d %H:%M:%S')    post-start start" >> "$HOME/status"
 echo "Pulling docker images"
 docker pull mcr.microsoft.com/dotnet/sdk:7.0
 docker pull mcr.microsoft.com/dotnet/aspnet:7.0-alpine
-docker pull ghcr.io/cse-labs/res-edge-webv:0.16
-docker pull ghcr.io/cse-labs/res-edge-automation:0.16
+docker pull ghcr.io/cse-labs/res-edge-webv:0.17
+docker pull ghcr.io/cse-labs/res-edge-automation:0.17
 
 echo "post-start complete"
 echo "$(date +'%Y-%m-%d %H:%M:%S')    post-start complete" >> "$HOME/status"

.ds/commands/cicd

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+kubectl port-forward -n res-edge svc/api 8080:8080

.ds/commands/overlay

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+kubectl port-forward -n res-edge svc/mssql 1433:1433

.ds/commands/port-forward/api

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+kubectl port-forward -n res-edge svc/ui 8088:8088

.ds/commands/port-forward/mssql

@@ -4,7 +4,7 @@ echo "Running tests on the cluster with both successful and failing requests"
 
 # Integration.json is executed 5 times to generate more metrics for dashboard
 docker run --net host --rm \
-    ghcr.io/cse-labs/res-edge-webv:0.16 \
+    ghcr.io/cse-labs/res-edge-webv:0.17 \
     --server "${DS_URL}" \
     --log-format TsvMin \
     --timeout 5 \

.ds/commands/port-forward/ui

@@ -5,7 +5,7 @@ echo "Running integration tests on the cluster with failing requests (400 and 40
 #!/bin/bash
 
 docker run --net host --rm \
-    ghcr.io/cse-labs/res-edge-webv:0.16 \
+    ghcr.io/cse-labs/res-edge-webv:0.17 \
     --server "${DS_URL}" \
     --log-format TsvMin \
     --timeout 5 \