Skip to content

Commit 337a5ae

Browse files
committed
Merge remote-tracking branch 'upstream/main' into in-container-only
2 parents 277fa8e + 8481e4b commit 337a5ae

File tree

99 files changed

+4094
-48
lines changed

Some content is hidden

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

99 files changed

+4094
-48
lines changed

.gitignore

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
**/charts/*.tgz
33
**/.specstory/
44

5-
6-
# Ignore Helm dependency directories
7-
**/charts/*.lock
8-
95
# General files to ignore
106
*.log
117
*.gz
@@ -53,6 +49,6 @@ applications/mlflow/tests/.venv/
5349
# wg-easy specific
5450
*.kubeconfig
5551
applications/wg-easy/release/
56-
applications/wg-easy/*/charts/
57-
applications/wg-easy/*/Chart.lock
5852
.aider*
53+
# SpecStory explanation file
54+
.specstory/.what-is-this.md

applications/wg-easy/README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,21 @@ Use tools to automate repetitive tasks, reducing human error and increasing deve
5656

5757
```
5858
applications/wg-easy/
59-
├── charts/templates/ # Common templates shared across charts
60-
├── cert-manager/ # Wrapped cert-manager chart
61-
├── cert-manager-issuers/ # Chart for cert-manager issuers
59+
├── charts
60+
│   ├── cert-manager # Wrapped cert-manager chart
61+
│   ├── cert-manager-issuers # Chart for cert-manager issuers
62+
│   ├── replicated-sdk # Replicated SDK chart
63+
│   ├── templates # Common templates shared across charts
64+
│   ├── traefik # Wrapped Traefik chart
65+
│   └── wg-easy # Main application chart
6266
├── replicated/ # Root Replicated configuration
63-
├── replicated-sdk/ # Replicated SDK chart
6467
├── taskfiles/ # Task utility functions
65-
├── traefik/ # Wrapped Traefik chart
66-
├── wg-easy/ # Main application chart
6768
├── helmfile.yaml # Defines chart installation order
6869
└── Taskfile.yaml # Main task definitions
6970
```
7071

7172
## Architecture Overview
7273

73-
![Architecture Diagram](docs/architecture.png)
74-
7574
Key components:
7675
- **Taskfile**: Orchestrates the workflow with automated tasks
7776
- **Helmfile**: Manages chart dependencies and installation order

applications/wg-easy/Taskfile.yaml

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ includes:
1111
tasks:
1212
default:
1313
desc: Show available tasks
14+
silent: true
1415
cmds:
1516
- task --list
1617

@@ -35,7 +36,7 @@ tasks:
3536
vars:
3637
CMD: 'task {{.TASK}}'
3738

38-
list-cluster:
39+
cluster-list:
3940
desc: List the cluster
4041
cmds:
4142
- task: container:exec
@@ -70,7 +71,7 @@ tasks:
7071
vars:
7172
CMD: 'task {{.TASK}}'
7273

73-
ports-expose:
74+
cluster-ports-expose:
7475
desc: Expose configured ports and capture exposed URLs
7576
cmds:
7677
- task: container:exec
@@ -105,6 +106,13 @@ tasks:
105106
vars:
106107
CMD: 'task {{.TASK}}'
107108

109+
customer-create:
110+
desc: Create a new customer or get existing customer with matching name and return their ID
111+
cmds:
112+
- task: container:exec
113+
vars:
114+
CMD: 'task {{.TASK}}'
115+
108116
gcp-vm-create:
109117
desc: Create a simple GCP VM instance
110118
cmds:
@@ -126,6 +134,27 @@ tasks:
126134
vars:
127135
CMD: 'task {{.TASK}}'
128136

137+
customer-ls:
138+
desc: List customers for the application
139+
cmds:
140+
- task: container:exec
141+
vars:
142+
CMD: 'task {{.TASK}}'
143+
144+
customer-delete:
145+
desc: Archive a customer by ID
146+
cmds:
147+
- task: container:exec
148+
vars:
149+
CMD: 'task {{.TASK}}'
150+
151+
clean:
152+
desc: Remove temporary Helm directories, chart dependencies, and release folder
153+
cmds:
154+
- task: container:exec
155+
vars:
156+
CMD: 'task {{.TASK}}'
157+
129158
full-test-cycle:
130159
desc: Create cluster, get kubeconfig, expose ports, update dependencies, deploy charts, test, and delete
131160
cmds:
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
dependencies:
2+
- name: cert-manager
3+
repository: https://charts.jetstack.io
4+
version: v1.14.5
5+
- name: templates
6+
repository: file://../templates
7+
version: 1.0.0
8+
digest: sha256:ab86a335f7f473446968c607ed7920bf4ce29f625e5ff6175be17bb2e1101a32
9+
generated: "2025-05-06T15:35:47.871225-04:00"

applications/wg-easy/cert-manager/Chart.yaml renamed to applications/wg-easy/charts/cert-manager/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ dependencies:
77
repository: https://charts.jetstack.io
88
- name: templates
99
version: '*'
10-
repository: file://../charts/templates
10+
repository: file://../templates

0 commit comments

Comments
 (0)