Skip to content

Commit 7eb4f08

Browse files
bartrbartr
committed
updated version 0.20 from dev
1 parent c6c6140 commit 7eb4f08

File tree

115 files changed

+2982
-8439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+2982
-8439
lines changed

‎.devcontainer/cli-update.sh‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,33 @@ rm ds.tar.gz
3131
kic completion zsh > "$HOME/.oh-my-zsh/completions/_kic"
3232
ds completion zsh > "$HOME/.oh-my-zsh/completions/_ds"
3333

34+
# update sql command
35+
sed -i 's/31433/1433/g' $HOME/bin/sql
36+
3437
cd "$OLDPWD" || exit
3538

3639
echo ""
3740
echo "run compinit to reload CLI completions"
3841
echo ""
42+
43+
# copy CLI customizations
44+
if [ "$KIC_BASE" == "" ]; then
45+
KIC_BASE=$(kic env KIC_BASE)
46+
fi
47+
48+
if [ "$KIC_BASE" != "" ]; then
49+
if [ -f "$KIC_BASE/k3d.yaml" ]; then
50+
cp -r "$KIC_BASE/k3d.yaml" "$HOME/bin"
51+
fi
52+
53+
if [ -d "$KIC_BASE/.kic" ]; then
54+
rm -rf "$HOME/bin/.kic"
55+
cp -r "$KIC_BASE/.kic" "$HOME/bin"
56+
fi
57+
58+
if [ -d "$KIC_BASE/.ds" ]; then
59+
rm -rf "$HOME/bin/.ds"
60+
cp -r "$KIC_BASE/.ds" "$HOME/bin"
61+
fi
62+
fi
63+

‎.devcontainer/devcontainer.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"forwardPorts": [
4545
30000,
4646
30080,
47+
30088,
4748
31080,
4849
31088,
4950
32000,
@@ -55,11 +56,12 @@
5556
"portsAttributes": {
5657
"30000": { "label": "Prometheus" },
5758
"30080": { "label": "Res-Edge-UI" },
58-
"31080": { "label": "IMDb" },
59-
"31088": { "label": "dogs-cats" },
59+
"30088": { "label": "Config" },
60+
"31080": { "label": "POS" },
61+
"31088": { "label": "Merchandising" },
6062
"32000": { "label": "Grafana" },
6163
"32080": { "label": "Res-Edge-Api" },
62-
"32088": { "label": "tabs-spaces" }
64+
"32088": { "label": "Loyalty" }
6365
},
6466

6567
"waitFor": "postCreateCommand",

‎.devcontainer/on-create.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ kic cluster create
107107
echo "Pulling docker images"
108108
docker pull mcr.microsoft.com/dotnet/sdk:7.0
109109
docker pull mcr.microsoft.com/dotnet/aspnet:7.0-alpine
110-
docker pull ghcr.io/cse-labs/res-edge-webv:0.18
111-
docker pull ghcr.io/cse-labs/res-edge-automation:0.18
110+
docker pull ghcr.io/cse-labs/res-edge-webv:0.20
111+
docker pull ghcr.io/cse-labs/res-edge-automation:0.20
112112

113113
sudo apt-get update
114114

‎.devcontainer/post-start.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ echo "$(date +'%Y-%m-%d %H:%M:%S') post-start start" >> "$HOME/status"
88
echo "Pulling docker images"
99
docker pull mcr.microsoft.com/dotnet/sdk:7.0
1010
docker pull mcr.microsoft.com/dotnet/aspnet:7.0-alpine
11-
docker pull ghcr.io/cse-labs/res-edge-webv:0.18
12-
docker pull ghcr.io/cse-labs/res-edge-automation:0.18
11+
docker pull ghcr.io/cse-labs/res-edge-webv:0.20
12+
docker pull ghcr.io/cse-labs/res-edge-automation:0.20
1313

1414
echo "post-start complete"
1515
echo "$(date +'%Y-%m-%d %H:%M:%S') post-start complete" >> "$HOME/status"

‎.ds/check.yaml‎

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ commands:
66
- name: check
77
short: Check local apps
88
scriptCommands:
9-
- name: resedge
9+
- name: res-edge
1010
short: Check Res-Edge
11-
path: check/resedge
11+
path: check/res-edge
1212

1313
- name: ui
1414
short: Check Res-Edge UI
@@ -18,13 +18,9 @@ commands:
1818
short: Check webv
1919
path: check/webv
2020

21-
- name: mssql
22-
short: Check mssql
23-
path: check/mssql
24-
25-
- name: fluentbit
26-
short: Check fluentbit
27-
path: check/fluentbit
21+
- name: sql
22+
short: Check SQL
23+
path: check/sql
2824

2925
- name: grafana
3026
short: Check Grafana
@@ -33,27 +29,3 @@ commands:
3329
- name: prometheus
3430
short: Check Prometheus
3531
path: check/prometheus
36-
37-
- name: flux
38-
short: Check Flux service
39-
path: check/flux
40-
41-
- name: imdb
42-
short: Check imdb service
43-
path: check/imdb
44-
45-
- name: heartbeat
46-
short: Check heartbeat service
47-
path: check/heartbeat
48-
49-
- name: redis
50-
short: Check redis service
51-
path: check/redis
52-
53-
- name: dogs-cats
54-
short: Check dogs-cats service
55-
path: check/dogs-cats
56-
57-
- name: tabs-spaces
58-
short: Check tabs-spaces service
59-
path: check/tabs-spaces

‎.ds/cli-update.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
###
2+
# update command
3+
###
4+
5+
scriptCommands:
6+
- name: cli-update
7+
short: Update KiC CLI
8+
path: cli-update

‎.ds/commands/check/dogs-cats‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.ds/commands/check/fluentbit‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎.ds/commands/check/flux‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
#!/bin/bash
22

3+
echo "Checking Flux"
4+
35
flux get all

‎.ds/commands/check/grafana‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
#!/bin/bash
22

3-
function grafana_check {
4-
http localhost:32000/healthz
5-
}
3+
echo "Checking Grafana"
64

7-
if ! grafana_check; then
8-
echo "Grafana is not Running";
9-
else
10-
echo "Grafana is Running";
11-
fi
5+
http localhost:3000/healthz

0 commit comments

Comments
 (0)