Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #3444 to 2.5 #3446

Merged
merged 2 commits into from
Mar 7, 2019
Merged

Backport #3444 to 2.5 #3446

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4808334
add tutorial, edit tutorials page
Mar 7, 2019
d4a6d89
trivial
Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
trivial
  • Loading branch information
Peter Matulis authored and Peter Matulis committed Mar 7, 2019
commit d4a6d89ceae15ce2360f383201acf4128c3cff54
13 changes: 7 additions & 6 deletions src/en/tutorial-k8s-charms.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,13 @@ Edit information file `README.ex` to provide guidance to users of the charm.
File `icon.svg` will be displayed in the Charm Store once the charm is put
there.

Note that a Kubernetes charm can implement the same hooks that traditional
charms can, and each hook, in turn, has at its disposal all traditional hook
tools.
Notes:

Charms, whether Kubernetes or traditional, are written using the
[Reactive Framework][charms-reactive].
- A Kubernetes charm can implement the same hooks that traditional charms can,
and each hook, in turn, has at its disposal all traditional hook tools.

- Charms, whether Kubernetes or traditional, are written using the
[Reactive Framework][charms-reactive].

### Container images

Expand Down Expand Up @@ -318,7 +319,7 @@ containers:
```

The `pod_spec_set()` function sends the pod configuration to Juju. This is
located within `mariadb-k8s-test/reactive/mysql.py`:
located within `mariadb-k8s-test/reactive/mariadb-k8s-test.py`:

```pythin
def config_mariadb():
Expand Down