Skip to content

Commit

Permalink
Backport of Fix some inconsistencies in jwt docs into release/1.16.x (#…
Browse files Browse the repository at this point in the history
…18254)

backport of commit 1d59989

Co-authored-by: jm96441n <john.maguire@hashicorp.com>
  • Loading branch information
hc-github-team-consul-core and jm96441n authored Jul 24, 2023
1 parent 583a3c1 commit 1650d2d
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 27 deletions.
6 changes: 3 additions & 3 deletions website/content/docs/connect/config-entries/jwt-provider.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ The following list outlines field hierarchy, language-specific data types, and r
<Tab heading="YAML" group="yaml">

- [`apiVersion`](#apiversion): string | required | must be set to `consul.hashicorp.com/v1alpha1`
- [`kind`](#kind): string | required | must be set to `jwtProvider`
- [`kind`](#kind): string | required | must be set to `JWTProvider`
- [`metadata`](#metadata): map | required
- [`name`](#metadata-name): string | required
- [`namespace`](#metadata-namespace): string
Expand Down Expand Up @@ -289,8 +289,8 @@ CacheConfig = {

```yaml
apiVersion: consul.hashicorp.com/v1alpha1 # required
kind: jwtProvider # required
metadata: # required
kind: JWTProvider # required
metadata: # required
name: <name-of-provider-configuration-entry> # required
namespace: <namespace>
spec: # required
Expand Down
45 changes: 21 additions & 24 deletions website/content/docs/connect/config-entries/service-intentions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,20 @@ The following outline shows how to format the service intentions configuration e
<Tab heading= "YAML" group="yaml">

- [`apiVersion`](#apiversion): string | must be set to `consul.hashicorp.com/v1alpha1`
- [`kind`](#kind): string | must be set to `ServiceIntentions`
- [`metadata`](#metadata): map | required
- [`name`](#metadata-name): string | required
- [`kind`](#kind): string | must be set to `ServiceIntentions`
- [`metadata`](#metadata): map | required
- [`name`](#metadata-name): string | required
- [`namespace`](#metadata-namespace): string | `default` | <EnterpriseAlert inline/>
- [`spec`](#spec): map | no default
- [`spec`](#spec): map | no default
- [`destination`](#spec-destination): map | no default
- [`name`](#spec-destination-name): string | required
- [`namespace`](#metadata-namespace): string | `default` | <EnterpriseAlert inline/>
- [`jwt`](#spec-jwt): map
- [`providers`](#spec-jwt-providers): list of maps
- [`name`](#spec-jwt-providers-name): string
- [`verifyClaims`](#spec-jwt-provider-verifyclaims): list of maps
- [`path`](#spec-jwt-provider-verifyclaims-path): list of strings
- [`value`](#spec-jwt-provider-verifyclaims-value): string
- [`jwt`](#spec-jwt): map
- [`providers`](#spec-jwt-providers): list of maps
- [`name`](#spec-jwt-providers-name): string
- [`verifyClaims`](#spec-jwt-provider-verifyclaims): list of maps
- [`path`](#spec-jwt-provider-verifyclaims-path): list of strings
- [`value`](#spec-jwt-provider-verifyclaims-value): string
- [`sources`](#spec-sources): list | no default
- [`name`](#spec-sources-name): string | no default
- [`peer`](#spec-sources-peer): string | no default
Expand All @@ -86,20 +86,19 @@ The following outline shows how to format the service intentions configuration e
- [`permissions`](#spec-sources-permissions): list | no default
- [`action`](#spec-sources-permissions-action): string | no default | required
- [`http`](#spec-sources-permissions-http): map | required
- [`pathExact`](#spec-sources-permissions-http): string | no default
- [`pathPrefix`](#spec-sources-permissions-http): string | no default
- [`pathRegex`](#spec-sources-permissions-http): string | no default
- [`methods`](#spec-sources-permissions-http): list | no default
- [`header`](#spec-sources-permissions-http-header): list of maps |no default
- [`pathExact`](#spec-sources-permissions-http): string | no default
- [`pathPrefix`](#spec-sources-permissions-http): string | no default
- [`pathRegex`](#spec-sources-permissions-http): string | no default
- [`methods`](#spec-sources-permissions-http): list | no default
- [`header`](#spec-sources-permissions-http-header): list of maps |no default
- [`name`](#spec-sources-permissions-http-header): string | required
- [`present`](#spec-sources-permissions-http-header): boolean | `false`
- [`present`](#spec-sources-permissions-http-header): boolean | `false`
- [`exact`](#spec-sources-permissions-http-header): string | no default
- [`prefix`](#spec-sources-permissions-http-header): string | no default
- [`suffix`](#spec-sources-permissions-http-header): string | no default
- [`regex`](#spec-sources-permissions-http-header): string | no default
- [`invert`](#spec-sources-permissions-http-header): boolean | `false`
- [`type`](#spec-sources-type): string | `consul`
- [`description`](#spec-sources-description): string
- [`invert`](#spec-sources-permissions-http-header): boolean | `false`
- [`description`](#spec-sources-description): string

</Tab>
</Tabs>
Expand Down Expand Up @@ -195,15 +194,14 @@ Sources = [

```yaml
apiVersion: consul.hashicorp.com/v1alpha1
kind: service-intentions
kind: ServiceIntentions
metadata:
name: <name of destination service>
namespace: <destination namespace>
spec:
destination:
destination:
name: <name of destination service>
namespace: <destination namespace>
name: <name of destination service>
namespace: <destination namespace>
jwt:
providers:
name: <JWT-provider-name>
Expand Down Expand Up @@ -238,7 +236,6 @@ spec:
- name: <http header name>
regex: <regex pattern to match>
invert: false
type: consul
description: <description for API responses>
```
</Tab>
Expand Down

0 comments on commit 1650d2d

Please sign in to comment.