Skip to content

Commit 03c81a5

Browse files
yanksyoonerinecon
andauthored
fix: charm architecture (#264)
* fix: charm architecture * chore: update repo contributing guides * Update docs/explanation/charm-architecture.md Co-authored-by: Erin Conley <[email protected]> --------- Co-authored-by: Erin Conley <[email protected]>
1 parent cd6a258 commit 03c81a5

6 files changed

+13
-31
lines changed

.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ Applicable spec: <link>
2525
- [ ] The [charm style guide](https://juju.is/docs/sdk/styleguide) was applied
2626
- [ ] The [contributing guide](https://github.com/canonical/is-charms-contributing-guide) was applied
2727
- [ ] The changes are compliant with [ISD054 - Managing Charm Complexity](https://discourse.charmhub.io/t/specification-isd014-managing-charm-complexity/11619)
28-
- [ ] The documentation is generated using `src-docs`
2928
- [ ] The documentation for charmhub is updated.
29+
- [ ] The changelog `docs/changelog.md` is updated.
3030
- [ ] The PR is tagged with appropriate label (`urgent`, `trivial`, `complex`)
3131

3232
<!-- Explanation for any unchecked items above -->

CONTRIBUTING.md

-9
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,3 @@ charmcraft pack
1919
juju deploy ./wordpress-k8s_ubuntu-22.04-amd64.charm \
2020
--resource jenkins-image=localhost:32000/wordpress:test
2121
```
22-
23-
## Generating src docs for every commit
24-
25-
Run the following command:
26-
27-
```bash
28-
echo -e "tox -e src-docs\ngit add src-docs\n" > .git/hooks/pre-commit
29-
chmod +x .git/hooks/pre-commit
30-
```

docs/changelog.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22

3+
### 20250-03-11
4+
5+
- docs: fix charm architecture diagram (separate charm containers boundary)
6+
37
### 2025-03-10
48

59
- Add charm architecture diagram.
6-
- Add changelog for tracking user-relevant changes.
10+
- Add changelog for tracking user-relevant changes.

docs/explanation/charm-architecture.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@ C4Context
1818
title Component diagram for Wordpress Charm
1919
2020
Container_Boundary(wordpress, "WordPress") {
21-
Component(pebble, "Pebble", "", "Starts the WordPress server and app")
2221
Component(apache-server, "Apache server", "", "Serves the WordPress application")
23-
Component(charm, "WordPress App", "", "WordPress application")
22+
Component(pebble, "Pebble", "", "Starts the WordPress server and app")
2423
2524
Rel(pebble, apache-server, "")
26-
Rel(apache-server, charm, "")
25+
}
26+
27+
Container_Boundary(charm, "WordPress Operator") {
28+
Component(charm, "WordPress Operator", "", "WordPress Operator (charm)")
29+
30+
Rel(pebble, charm, "")
2731
}
2832
```
2933

generate-src-docs.sh

-6
This file was deleted.

tox.ini

-11
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,6 @@ commands =
3030
isort {[vars]all_path}
3131
black {[vars]all_path}
3232

33-
[testenv:src-docs]
34-
allowlist_externals=sh
35-
description = Generate documentation for src
36-
deps =
37-
cosl
38-
lazydocs
39-
-r{toxinidir}/requirements.txt
40-
commands =
41-
; can't run lazydocs directly due to needing to run it on src/*.py which produces an invocation error in tox
42-
sh generate-src-docs.sh
43-
4433
[testenv:lint]
4534
description = Check code against coding style standards
4635
deps =

0 commit comments

Comments
 (0)