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.

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

Fix build main #40

Merged
merged 4 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
10 changes: 9 additions & 1 deletion .github/workflows/automatic-doc-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,12 @@ jobs:
documentation-checks:
uses: canonical/documentation-workflows/.github/workflows/documentation-checks.yaml@main
with:
working-directory: '.'
working-directory: '.'
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build with warnings as errors
run: make check-html-build
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ run: install
html: install
. $(VENV); $(SPHINXBUILD) -b dirhtml "$(SOURCEDIR)" "$(BUILDDIR)" -w $(SPHINXDIR)/warnings.txt $(SPHINXOPTS)

check-html-build: install
. $(VENV); $(SPHINXBUILD) -b dirhtml "$(SOURCEDIR)" "$(BUILDDIR)" -E --fail-on-warning --keep-going $(SPHINXOPTS)

epub: install
. $(VENV); $(SPHINXBUILD) -b epub "$(SOURCEDIR)" "$(BUILDDIR)" -w $(SPHINXDIR)/warnings.txt $(SPHINXOPTS)

Expand Down
3 changes: 1 addition & 2 deletions contribute.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,5 @@ footer of every page.

For this documentation we use Sphinx and reStructuredText (reST), which is the default plain text markup language used by Sphinx.
Here are some useful resources on reStructuredText:

- `Sphinx reStructuredText Primer <https://tinyurl.com/rstprimer>`_
- `Sphinx reStructuredText Primer <https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html>`_ :none:`wokeignore:rule=master,`
- `reStructuredText style guide <https://canonical-documentation-with-sphinx-and-readthedocscom.readthedocs-hosted.com/style-guide/>`_
1 change: 1 addition & 0 deletions custom_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
custom_excludes = [
'doc-cheat-sheet*',
'README.md',
'starter-guide.rst',
]

# Add CSS files (located in .sphinx/_static/)
Expand Down
4 changes: 2 additions & 2 deletions how-to/add_controller.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ Deploy controller

``juju status --format json | jq '.applications.haproxy.units["haproxy/0"]["public-address"]'``

10. Go to the `Route 53 dashboard <https://us-east-1.console.aws.amazon.com/route53/v2/home>`_.
10. Go to the `Route 53 dashboard <https://us-east-1.console.aws.amazon.com/route53/v2/home>`__.

11. Add an A record for the deployed controller and the DNS name specified in step 1 with the IP obtained in step 9.

12. Obtain a valid certificate for the deployed candid by running:

``juju run-action --wait certbot/0 get-certificate agree-tos=true aws-access-key-id=<Access key ID> aws-secret-access-key=<Secret access key> domains=<dns name specified in step 1 (jimm.canonical.example.com)> email=<Your email address> plugin=dns-route53``

13. Install the JAAS snap that you download from `here <https://drive.google.com/file/d/1LiOvVpVQ13V3x3l2PhgS2fTHDUtCEe7p/view?usp=sharing>`_.
13. Install the JAAS snap that you download from `here <https://drive.google.com/file/d/1LiOvVpVQ13V3x3l2PhgS2fTHDUtCEe7p/view?usp=sharing>`__.

14. To add the bootstrapped controller to JIMM we need to create a controller-information document. To do this, run the following command:

Expand Down
7 changes: 3 additions & 4 deletions how-to/deploy_candid_k8s.rst
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,10 @@ Appendix
Don’t have a PostgreSQL database
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. wokeignore:rule=master
In case you do not have access to a PostgreSQL database you can use Amazon’s RDS to create one. Navigate to the RDS console and select “Create database”. Under “Engine type” select “PostgreSQL”, specify “Master username” and “Master password”. Also make sure to select “Public access” as “Yes”. You can customise all other options to your preference. Once the database is created, navigate to the database’s dashboard. There you will see the “Endpoint” and “Port” strings, which you will need to connect to the database. Use the following command to configure Candid:
In case you do not have access to a PostgreSQL database you can use Amazon's RDS to create one. Navigate to the RDS console and select "Create database". Under "Engine type" select "PostgreSQL", specify "Master username" and "Master password". Also make sure to select "Public access" as "Yes". You can customise all other options to your preference. Once the database is created, navigate to the database's dashboard. There you will see the "Endpoint" and "Port" strings, which you will need to connect to the database. :none:`wokeignore:rule=master,`
Use the following command to configure Candid: :none:`wokeignore:rule=master,`

.. wokeignore:rule=master
``juju config candid-k8s dns=’postgres://<master username>:<master password>@<database endpoint>:<database port>/<database name>``
``juju config candid-k8s dns=postgres://<master username>:<master password>@<database endpoint>:<database port>/<database name>`` :none:`wokeignore:rule=master,`

Don’t have certificates
~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
6 changes: 2 additions & 4 deletions how-to/deploy_jimm_k8s.rst
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,9 @@ Appendix
Don’t have a PostgreSQL database
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. wokeignore:rule=master
In case you do not have access to a PostgreSQL database you can use Amazon’s RDS to create one. Navigate to the RDS console and select “Create database”. Under “Engine type” select “PostgreSQL”, specify “Master username” and “Master password”. Also make sure to select “Public access” as “Yes”. You can customise all other options to your preference. Once the database is created, navigate to the database’s dashboard. There you will see the “Endpoint” and “Port” strings, which you will need to connect to the database. Use the following command to configure JIMM:
In case you do not have access to a PostgreSQL database you can use Amazon's RDS to create one. Navigate to the RDS console and select "Create database". Under "Engine type" select "PostgreSQL", specify "Master username" and "Master password". Also make sure to select "Public access" as "Yes". You can customise all other options to your preference. Once the database is created, navigate to the database's dashboard. There you will see the "Endpoint" and "Port" strings, which you will need to connect to the database. Use the following command to configure JIMM: :none:`wokeignore:rule=master,`

.. wokeignore:rule=master
``juju config jimm-k8s dns=’postgres://<master username>:<master password>@<database endpoint>:<database port>/<database name>``
``juju config jimm-k8s dns=postgres://<master username>:<master password>@<database endpoint>:<database port>/<database name>`` :none:`wokeignore:rule=master,`

Don’t have certificates
~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
Loading
Loading