Skip to content

Commit f6e825b

Browse files
Merge pull request #148 from nautobot/main-to-develop-post-3.1.1
Main to develop post 3.1.1
2 parents 5ba63c1 + 895a7fd commit f6e825b

File tree

8 files changed

+117
-65
lines changed

8 files changed

+117
-65
lines changed

changes/144.housekeeping

Lines changed: 0 additions & 1 deletion
This file was deleted.

changes/145.changed

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/admin/providers/hashicorp_setup.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ PLUGINS_CONFIG = {
1616
```
1717

1818
- `url` - (required) The URL to the HashiCorp Vault instance (e.g. `http://localhost:8200`).
19-
- `auth_method` - (optional / defaults to "token") The method used to authenticate against the HashiCorp Vault instance. Either `"approle"`, `"aws"`, `"kubernetes"` or `"token"`. For information on using AWS authentication with vault see the [authentication](#authentication) section above.
19+
- `auth_method` - (optional / defaults to "token") The method used to authenticate against the HashiCorp Vault instance. Either `"approle"`, `"aws"`, `"kubernetes"` or `"token"`.
2020
- `ca_cert` - (optional) Path to a PEM formatted CA certificate to use when verifying the Vault connection. Can alternatively be set to `False` to ignore SSL verification (not recommended) or `True` to use the system certificates.
2121
- `default_mount_point` - (optional / defaults to "secret") The default mount point of the K/V Version 2 secrets engine within Hashicorp Vault.
2222
- `kv_version` - (optional / defaults to "v2") The version of the KV engine to use, can be `v1` or `v2`
2323
- `k8s_token_path` - (optional) Path to the kubernetes service account token file. Defaults to "/var/run/secrets/kubernetes.io/serviceaccount/token".
24-
- `token` - (optional) Required when `"auth_method": "token"` or `auth_method` is not supplied. The token for authenticating the client with the HashiCorp Vault instance. As with other sensitive service credentials, we recommend that you provide the token value as an environment variable and retrieve it with `{"token": os.getenv("NAUTOBOT_HASHICORP_VAULT_TOKEN")}` rather than hard-coding it in your `nautobot_config.py`.
24+
- `token` - (optional) Required when `"auth_method": "token"` or `auth_method` is not supplied. The token for authenticating the client with the HashiCorp Vault instance. As with other sensitive service credentials, we recommend that you provide the `token` value as an environment variable and retrieve it with `{"token": os.getenv("NAUTOBOT_HASHICORP_VAULT_TOKEN")}` rather than hard-coding it in your `nautobot_config.py`.
2525
- `role_name` - (optional) Required when `"auth_method": "kubernetes"`, optional when `"auth_method": "aws"`. The Vault Kubernetes role or Vault AWS role to assume which the pod's service account has access to.
26-
- `role_id` - (optional) Required when `"auth_method": "approle"`. As with other sensitive service credentials, we recommend that you provide the role_id value as an environment variable and retrieve it with `{"role_id": os.getenv("NAUTOBOT_HASHICORP_VAULT_ROLE_ID")}` rather than hard-coding it in your `nautobot_config.py`.
27-
- `secret_id` - (optional) Required when `"auth_method": "approle"`.As with other sensitive service credentials, we recommend that you provide the secret_id value as an environment variable and retrieve it with `{"secret_id": os.getenv("NAUTOBOT_HASHICORP_VAULT_SECRET_ID")}` rather than hard-coding it in your `nautobot_config.py`.
26+
- `role_id` - (optional) Required when `"auth_method": "approle"`. As with other sensitive service credentials, we recommend that you provide the `role_id` value as an environment variable and retrieve it with `{"role_id": os.getenv("NAUTOBOT_HASHICORP_VAULT_ROLE_ID")}` rather than hard-coding it in your `nautobot_config.py`.
27+
- `secret_id` - (optional) Required when `"auth_method": "approle"`.As with other sensitive service credentials, we recommend that you provide the `secret_id value` as an environment variable and retrieve it with `{"secret_id": os.getenv("NAUTOBOT_HASHICORP_VAULT_SECRET_ID")}` rather than hard-coding it in your `nautobot_config.py`.
2828
- `login_kwargs` - (optional) Additional optional parameters to pass to the login method for [`approle`](https://hvac.readthedocs.io/en/stable/source/hvac_api_auth_methods.html#hvac.api.auth_methods.AppRole.login), [`aws`](https://hvac.readthedocs.io/en/stable/source/hvac_api_auth_methods.html#hvac.api.auth_methods.Aws.iam_login) and [`kubernetes`](https://hvac.readthedocs.io/en/stable/source/hvac_api_auth_methods.html#hvac.api.auth_methods.Kubernetes.login) authentication methods.
2929
- `namespace` - (optional) Namespace to use for the [`X-Vault-Namespace` header](https://github.com/hvac/hvac/blob/main/hvac/adapters.py#L287) on all hvac client requests. Required when the [`Namespaces`](https://developer.hashicorp.com/vault/docs/enterprise/namespaces#usage) feature is enabled in Vault Enterprise.
3030

docs/admin/release_notes/version_3.1.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ This document describes all new features and changes in the release `3.1`. The f
66

77
This release adds support for multiple HashiCorp Vault secrets providers.
88

9+
## [v3.1.1 (2024-08-22)](https://github.com/nautobot/nautobot-app-secrets-providers/releases/tag/v3.1.1)
10+
11+
### Dependencies
12+
13+
- [#145](https://github.com/nautobot/nautobot-app-secrets-providers/issues/145) - Updated `boto3` dependency to permit newer releases.
14+
15+
### Housekeeping
16+
17+
- [#144](https://github.com/nautobot/nautobot-app-secrets-providers/issues/144) - Rebaked from the cookie `nautobot-app-v2.3.0`.
18+
- [#147](https://github.com/nautobot/nautobot-app-secrets-providers/pull/147) - Updated documentation dependencies and added a pin for the `griffe` documentation dependency.
19+
920
## [v3.1.0 (2024-08-01)](https://github.com/nautobot/nautobot-app-secrets-providers/releases/tag/v3.1.0)
1021

1122
### Added

docs/requirements.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
mkdocs==1.5.2
2-
mkdocs-material==9.1.15
1+
mkdocs==1.6.0
2+
mkdocs-material==9.5.32
33
markdown-version-annotations==1.0.1
4-
mkdocstrings-python==1.5.2
5-
mkdocstrings==0.22.0
4+
griffe==1.1.1
5+
mkdocstrings-python==1.10.8
6+
mkdocstrings==0.25.2

mkdocs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
dev_addr: "127.0.0.1:8001"
3-
edit_uri: "edit/main/nautobot-app-secrets-providers/docs"
3+
edit_uri: "edit/main/docs"
44
site_dir: "nautobot_secrets_providers/static/nautobot_secrets_providers/docs"
55
site_name: "Secrets Providers Documentation"
66
site_url: "https://docs.nautobot.com/projects/secrets-providers/en/latest/"
@@ -121,6 +121,7 @@ nav:
121121
- Compatibility Matrix: "admin/compatibility_matrix.md"
122122
- Release Notes:
123123
- "admin/release_notes/index.md"
124+
- v3.1: "admin/release_notes/version_3.1.md"
124125
- v3.0: "admin/release_notes/version_3.0.md"
125126
- v2.0: "admin/release_notes/version_2.0.md"
126127
- v1.4: "admin/release_notes/version_1.4.md"

0 commit comments

Comments
 (0)