Skip to content

Commit 33859bb

Browse files
committed
docs: under ref jaas, restore authc, authz, sec scope, and add rebac, plus fix links and spelling
1 parent 72c2291 commit 33859bb

18 files changed

+156
-195
lines changed

.sphinx/spellingcheck.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ matrix:
22
- name: rST files
33
aspell:
44
lang: en
5+
# d: en_US
56
d: en_GB
67
dictionary:
78
wordlists:

.wordlist.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ addmodel
22
addons
33
auth
44
authenticy
5+
authorization
56
API
67
APIs
78
backend
@@ -26,6 +27,7 @@ hostname
2627
hostnames
2728
IAM
2829
installable
30+
Integrations
2931
JSON
3032
Juju
3133
Kubeflow
@@ -57,6 +59,7 @@ stateful
5759
subdirectories
5860
subfolders
5961
subtree
62+
superset
6063
Ubuntu
6164
UI
6265
UUID

howto/manage-juju-controllers.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jimmctl remove-controller
1414
jimmctl set-controller-deprecated
1515
-->
1616

17-
## Add a Juju controller to a JIMM controller
17+
(add-a-juju-controller)=
18+
## Add a Juju controller
1819

1920
JIMM gives a centralised view of all models in the system. However the work of managing
2021
the models is delegated to a set of Juju controllers deployed in various clouds
@@ -32,8 +33,8 @@ a JIMM controller.
3233
For this tutorial you will need the following:
3334

3435
- Basic knowledge of Juju
35-
- A JIMM controller deployed in MicroK8s, see {doc}`the tutorial <../tutorial/deploy_jaas_microk8s>`.
36-
- Administrator permission on the JIMM controller, see {doc}`bootstrapping permissions <./bootstrap_permissions>`.
36+
- A JIMM controller deployed in MicroK8s, see {doc}`the tutorial <../tutorial/index>`.
37+
<!--- Administrator permission on the JIMM controller, see {ref}`add-a-juju-controller`.-->
3738

3839

3940
### Prelude

howto/manage-models.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ In many scenarios it is necessary to migrate models to and from an environment t
1010

1111
- A standalone Juju controller with a model (optionally with a running application).
1212
- A basic understanding of Juju model migrations, see the [docs](https://juju.is/docs/juju/manage-models).
13-
- A running JAAS, see the {doc}`tutorial <../tutorial/deploy_jaas_microk8s>`.
14-
- Administrator permissions for JAAS, see our {doc}`how-to <./bootstrap_permissions>`.
13+
- A running JAAS, see the {doc}`the tutorial <../tutorial/index>`.
14+
- Administrator permissions for JAAS, see our {doc}`how-to <./manage-your-jaas-deployment>`.
1515

1616
### 1. Create a new Juju controller
1717

@@ -28,7 +28,7 @@ is required.
2828
In order to use models with JAAS, the models must be running on a Juju controller that is properly configured. The
2929
necessary config values cannot be set after bootstrap time, so any existing models must be migrated to a new controller.
3030

31-
The process of creating a local Juju controller that is properly configured is described in {doc}`this how-to <./add_controller>`.
31+
The process of creating a local Juju controller that is properly configured is described in {ref}`add-a-juju-controller`.
3232

3333
Once a Juju controller that is configured to communicate with JIMM has been created, move onto the next step.
3434

@@ -104,10 +104,10 @@ The below is useful if you want to move the model to a specific controller.
104104
### Prerequisites
105105

106106
- A basic understanding of Juju model migrations, see the [docs](https://juju.is/docs/juju/manage-models).
107-
- A running JAAS with with multiple controllers attached, see the {doc}`tutorial <../tutorial/deploy_jaas_microk8s>` for deploying JAAS.
108-
- Administrator permissions for JAAS, so our {doc}`how-to <./bootstrap_permissions>`.
107+
- A running JAAS with with multiple controllers attached, see the {doc}`the tutorial <../tutorial/index>` for deploying JAAS.
108+
- Administrator permissions for JAAS, so our {ref}`add-a-juju-controller`.
109109

110-
Connecting multiple controllers to JAAS can be accomplished adding LXD controllers as described in our {doc}`how-to <./add_controller>`.
110+
Connecting multiple controllers to JAAS can be accomplished adding LXD controllers as described in {ref}`add-a-juju-controller`.
111111

112112
### 1. Identify the new controller
113113

howto/manage-service-accounts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(manage-service-accounts)=
22
# Manage service accounts
3-
> See also: {ref}`service account`
3+
<!-->> See also: {ref}`service account`-->
44

55
(manage-a-service-accounts-relation-to-an-entity)=
66
## Manage a service account's relation to an entity

howto/manage-your-jaas-deployment.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ JAAS supports Juju controllers with a minimum version 3.4.
1414
```
1515

1616

17-
TBA (for now please see the tutorial)
17+
TBA (for now please see {doc}`the tutorial <../tutorial/index>`)
1818

1919
<!--
2020
To deploy JAAS:
@@ -127,8 +127,8 @@ juju config jimm juju-dashboard-location="<juju-dashboard-url>"
127127

128128
For this how-to you will need the following:
129129

130-
- A basic understanding of JAAS tags, see our {doc}`explanation doc<../explanation/jaas_tags>`.
131-
- A running JAAS environment, see {doc}`our tutorial <../tutorial/deploy_jaas_microk8s>`.
130+
- A basic understanding of JAAS tags, see {ref}`tag`.
131+
- A running JAAS environment, see {doc}`the tutorial <../tutorial/index>`.
132132
- An understanding of Juju permissions, see the [Juju docs](https://juju.is/docs/juju/user-permissions).
133133

134134
### Creating an admin user
@@ -183,7 +183,7 @@ For the complete list of components in COS, read the
183183
- A running `COS-Lite` bundle.
184184
You can follow the [Getting started on MicroK8s](https://charmhub.io/topics/canonical-observability-stack/tutorials/install-microk8s).
185185
tutorial to get you started. Make sure to follow the section **Deploy the COS Lite bundle with overlays** section to create offers.
186-
- A running JAAS. Please refer to the deployment {doc}`tutorial<../tutorial/deploy_jaas_microk8s>`.
186+
- A running JAAS. Please refer to the deployment {doc}`the tutorial <../tutorial/index>`.
187187

188188
```{tip}
189189
[Juju offers](https://juju.is/docs/juju/manage-offers) are a way of sharing software as a service between models. Make sure you deploy COS and setup offers so that you can relate to it across models.
@@ -313,7 +313,8 @@ You will find the available dashboards by clicking on the Dashboards menu
313313
[cos]: https://charmhub.io/topics/canonical-observability-stack
314314

315315

316-
## Equip JAAS with TLS ingress
316+
(equip-your-jaas-deployment-with-tls-ingress)=
317+
## Equip your JAAS deployment with TLS ingress
317318

318319
The NGINX Ingress Integrator is a charm responsible for creating Kubernetes ingress rules,
319320
these rules can be hardened via TLS and the charm provides a means to do so. See [here](https://charmhub.io/nginx-ingress-integrator).
@@ -341,7 +342,7 @@ To explore Juju Dashboard features you can go [here](https://juju.is/docs/juju/t
341342

342343
For this how-to you will need the following:
343344

344-
- A running JAAS environment, see {doc}`our tutorial <../tutorial/deploy_jaas_microk8s>`.
345+
- A running JAAS environment, see {doc}`the tutorial <../tutorial/index>`.
345346

346347
### Deploy Juju Dashboard
347348

@@ -356,7 +357,7 @@ juju integrate dashboard jimm-app
356357
Then you need to expose your dashboard through an ingress.
357358

358359
```{tip}
359-
You can follow {doc}`this guide <./setup_ingress_with_tls>` to add TLS to your ingress.
360+
You can follow {ref}`equip-your-jaas-deployment-with-tls-ingress` to add TLS to your ingress.
360361
```
361362

362363
```text

howto/use_terraform.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ For this how-to you will need the following:
1111
- An identity provider that can be used to create OAuth2.0 client credentials.
1212
- Client credentials (`client_id` and `client_secret`) generated by the above identity provider.
1313
- A deployed JAAS configured to trust the identity provider. For instructions on
14-
how to deploy JIMM read {doc}`../tutorial/deploy_jaas_microk8s`.
14+
how to deploy JIMM read {doc}`the tutorial <../tutorial/index>`.
1515
- A Juju controller added to JIMM that can be used to control your chosen cloud. For instructions
16-
on how to add one read {doc}`add_controller`.
16+
on how to add one read {ref}`add-a-juju-controller`.
1717
- A Juju client.
1818
- Cloud credentials for the chosen cloud (see [here](https://juju.is/docs/juju/manage-credentials)).
1919
- Basic knowledge of Terraform, Juju Terraform provider and Juju.

redirects.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ explanation/jaas_tags/ reference/tag/
2020
reference/authorisation_model/ reference/jaas/authorisation_model/
2121
reference/authorisation_data/ reference/jaas/authorisation_data/
2222
reference/security/ reference/jaas/security/
23-
explanation/authentication/ reference/jaas/authentication/
24-
explanation/authorisation/ reference/jaas/authorisation/
23+
explanation/authentication/ reference/jaas/jaas-authentication/
24+
explanation/authorisation/ reference/jaas/jaas-authorization/
2525
explanation/jaas_architecture/ reference/jaas/jaas_architecture/
26-
explanation/jaas_security_scope/ reference/jaas/jaas_security_scope/
26+
explanation/jaas_security_scope/ reference/jaas/jaas-security-scope/
2727
howto/integrate_with_cos/ howto/manage-jimm-controllers/
2828
howto/migrate_models/ howto/manage-models/
2929
howto/migrate_models_internal/ howto/manage-models/
@@ -33,13 +33,13 @@ howto/setup_dashboard/ howto/manage-jimm-controllers/
3333
howto/bootstrap_permissions/ howto/manage-jimm-controllers/
3434
reference/jaas/authorisation_data/ reference/relation/
3535
reference/jaas/authorisation_model/ reference/relation/
36-
reference/jaas/authorisation/ reference/relation/
36+
reference/jaas/authorisation/ reference/jaas/jaas-authorization
3737
explanation/jaas_overview/ reference/jaas/jaas_architecture/
3838
howto/manage-jimm-controllers/ howto/manage-your-jaas-deployment/
3939
howto/setup_new_users/ howto/manage-users/
4040
reference/juju_required_version/ reference/jaas/supported-juju-versions/
41-
reference/jaas/authentication/ reference/jaas/security/
42-
reference/jaas/jaas_security_scope/ reference/jaas/security/
41+
# reference/jaas/authentication/ reference/jaas/security/
42+
# reference/jaas/jaas_security_scope/ reference/jaas/security/
4343
reference/jaas/security_hardening/ reference/jaas/security/
4444
reference/jaas/jaas_architecture/ reference/jaas/jaas-architecture/
4545
reference/jaas/security/ reference/jaas/jaas-security/

reference/audit_logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Filtering audit logs is also possible along a variety of fields including but no
1616
user executing the request, model name and command.
1717

1818
Finally, access to audit logs is, by default, only afforded to JIMM superusers i.e. administrators of JIMM.
19-
Read access to audit logs can be granted to other users via `jimmctl`, see {doc}`/tutorial/group_management`
19+
Read access to audit logs can be granted to other users via `jimmctl`, see {ref}`manage-groups`.
2020

2121
## Filter Logs
2222

reference/jaas/jaas-architecture.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
(jaas-architecture)=
12
# Architecture
23

34
The diagram below shows an overall picture of JAAS architecture.
@@ -32,7 +33,7 @@ The remainder of this document briefly goes into more detail on JAAS' deployment
3233

3334
The components of JAAS are deployed via Juju K8s charms. This implies that in order to deploy JAAS, you
3435
must first bootstrap a single Juju controller to manage the components of JAAS, this is described in
35-
more detail in our {doc}`tutorial <../tutorial/deploy_jaas_microk8s>`.
36+
more detail in our {ref}`tutorial`.
3637

3738
Not all the components of JAAS are expected to be deployed on Kubernetes. With the use of Juju [offers](https://juju.is/docs/juju/manage-offers)
3839
certain components can be deployed to virtual machines and used by the Kubernetes charms. These components

0 commit comments

Comments
 (0)