version 0.16 (#98)

* version 0.16

Author: bartr

.devcontainer/cli-update.sh

@@ -10,7 +10,7 @@ mkdir -p "$HOME/bin"
 cd "$HOME/bin" || exit
 
 # remove old CLI
-rm -rf kic .kic flt .flt ds .ds
+rm -rf kic .kic ds .ds
 
 # use latest release
 if [ "$tag" = "" ]; then
@@ -22,19 +22,13 @@ wget -O kic.tar.gz "https://github.com/cse-labs/res-edge-labs/releases/download/
 tar -xvzf kic.tar.gz
 rm kic.tar.gz
 
-# install flt
-# wget -O flt.tar.gz "https://github.com/cse-labs/res-edge-labs/releases/download/$tag/flt-$tag-linux-amd64.tar.gz"
-# tar -xvzf flt.tar.gz
-# rm flt.tar.gz
-
 # install ds
 wget -O ds.tar.gz "https://github.com/cse-labs/res-edge-labs/releases/download/$tag/ds-$tag-linux-amd64.tar.gz"
 tar -xvzf ds.tar.gz
 rm ds.tar.gz
 
 # update completions
 kic completion zsh > "$HOME/.oh-my-zsh/completions/_kic"
-# flt completion zsh > "$HOME/.oh-my-zsh/completions/_flt"
 ds completion zsh > "$HOME/.oh-my-zsh/completions/_ds"
 
 cd "$OLDPWD" || exit

.devcontainer/deploy-res-edge.sh

@@ -27,6 +27,21 @@ kic cluster create
 # create the namespace
 kubectl apply -f ns.yaml
 
+# create secrets
+kubectl create secret generic mssql -n res-edge \
+    --from-literal=MSSQL_SA_PASSWORD="$MSSQL_SA_PASSWORD"
+
+kubectl create secret generic api -n res-edge \
+    --from-literal=SQL_CONN_STRING="Server=mssql;Database=ist;UID=sa;Password=$MSSQL_SA_PASSWORD;TrustServerCertificate=True;" \
+    --from-literal=GIT_OPS_PAT="$PAT"
+
+# note - this is to support an easy inner-loop
+#        production should be integrated with AD, OpenId, or other SSO provider
+kubectl create secret generic ui -n res-edge \
+    --from-literal=DATA_SERVICE_URL="http://api:8080" \
+    --from-literal=USER_PWD="Res-Edge-User" \
+    --from-literal=ADMIN_PWD="Res-Edge-Admin"
+
 # deploy SQL Server with sample data
 kubectl apply -k mssql
 

.devcontainer/devcontainer.json

@@ -37,33 +37,29 @@
 	},
 
 	"hostRequirements": {
-		"cpus": 4
+		"cpus": 8
 	},
 
 	// forward ports for the app
 	"forwardPorts": [
 		30000,
 		30080,
-		30088,
 		31080,
 		31088,
 		32000,
 		32080,
-		32088,
-		32089
+		32088
 	],
 
 	// add labels
 	"portsAttributes": {
 		"30000": { "label": "Prometheus" },
-		"30080": { "label": "MyApp" },
-		"30088": { "label": "heartbeat" },
+		"30080": { "label": "Res-Edge-UI" },
 		"31080": { "label": "IMDb" },
 		"31088": { "label": "dogs-cats" },
 		"32000": { "label": "Grafana" },
-		"32080": { "label": "Res-Edge" },
-		"32088": { "label": "tabs-spaces" },
-		"32089": { "label": "ArgoCD-dashboard" }
+		"32080": { "label": "Res-Edge-Api" },
+		"32088": { "label": "tabs-spaces" }
 	},
 
 	"waitFor": "postCreateCommand",

.devcontainer/on-create.sh

@@ -23,6 +23,7 @@ sudo chsh --shell /bin/zsh vscode
 
     #shellcheck disable=2016,2028
     echo 'hsort() { read -r; printf "%s\\n" "$REPLY"; sort }'
+    echo "alias kuse='kubectl config use-context'"
     echo ""
 
     # add cli to path
@@ -107,8 +108,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.15
-docker pull ghcr.io/cse-labs/res-edge-automation:0.15
+docker pull ghcr.io/cse-labs/res-edge-webv:0.16
+docker pull ghcr.io/cse-labs/res-edge-automation:0.16
 
 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.15
-docker pull ghcr.io/cse-labs/res-edge-automation:0.15
+docker pull ghcr.io/cse-labs/res-edge-webv:0.16
+docker pull ghcr.io/cse-labs/res-edge-automation:0.16
 
 echo "post-start complete"
 echo "$(date +'%Y-%m-%d %H:%M:%S')    post-start complete" >> "$HOME/status"

.ds/commands/.gitkeep

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 function webv_check {
-    kubectl exec -it jumpbox -- http webv.api.svc.cluster.local:8080/version
+    kubectl exec -it jumpbox -- http webv.res-edge.svc.cluster.local:8080/version
 }
 
 

.ds/commands/check/webv

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# "ds cicd" use the Res-Edge Automation docker image and the Res-Edge Data Service
+# to generate GitOps manifest files for each Cluster
+
+# Run "git status" to see the repo changes
+
+# The changes are not pushed to GitHub
+# use "ds deploy" to push any GitOps changes
+
+echo "Running ci-cd locally ..."
+
+docker run -it --rm \
+        --net host \
+        -v "$PWD":/goa \
+        ghcr.io/cse-labs/res-edge-automation:0.16 \
+        -s "${DS_URL}" --no-git

.ds/commands/cicd

@@ -45,7 +45,7 @@ kind: Kustomization
 metadata:
   annotations:
     version: $DS_APP_VERSION
-    clusters: none
+    expression: none
 resources:
 - ../../base