Skip to content

Commit ad61027

Browse files
committed
Automatic update of nais application reference/example
liberator commit sha: afd1af5a2119138dd00a1b542a7f93b0f0168c44
1 parent 887c70f commit ad61027

File tree

2 files changed

+4
-27
lines changed

2 files changed

+4
-27
lines changed

docs/workloads/application/reference/application-spec.md

+2-15
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,6 @@ Sidecar configures a sidecar that intercepts every HTTP request, and performs th
778778
All requests to ingress + `/oauth2` will be processed only by the sidecar, whereas all other requests
779779
will be proxied to the application.
780780

781-
782781
If the user is authenticated with Entra ID, the `Authorization` header will be set to `Bearer <JWT>`.
783782

784783
Relevant information:
@@ -1109,11 +1108,9 @@ Allowed values: _(empty string)_, `metadata.annotations`, `metadata.labels`, `me
11091108
EnvFrom exposes all variables in the ConfigMap or Secret resources as environment variables.
11101109
One of `configMap` or `secret` is required.
11111110

1112-
11131111
Environment variables will take the form `KEY=VALUE`, where `key` is the ConfigMap or Secret key.
11141112
You can specify as many keys as you like in a single ConfigMap or Secret.
11151113

1116-
11171114
The ConfigMap and Secret resources must live in the same Kubernetes namespace as the Application resource.
11181115

11191116
Type: `array`<br />
@@ -1162,17 +1159,14 @@ Required: `false`<br />
11621159
List of ConfigMap, Secret, or EmptyDir resources that will have their contents mounted into the containers.
11631160
Either `configMap`, `secret`, or `emptyDir` is required.
11641161

1165-
11661162
Files will take the path `<mountPath>/<key>`, where `key` is the ConfigMap or Secret key.
11671163
You can specify as many keys as you like in a single ConfigMap or Secret, and they will all
11681164
be mounted to the same directory.
11691165

1170-
11711166
If you reference an emptyDir you will just get an empty directory, backed
11721167
by your requested memory or the disk on the node where your pod is
11731168
running.
11741169

1175-
11761170
The ConfigMap and Secret resources must live in the same Kubernetes namespace as the Application resource.
11771171

11781172
Type: `array`<br />
@@ -1262,7 +1256,6 @@ Filesystem path inside the pod where files are mounted.
12621256
The directory will be created if it does not exist. If the directory exists,
12631257
any files in the directory will be made unaccessible.
12641258

1265-
12661259
Defaults to `/var/run/configmaps/<NAME>`, `/var/run/secrets`, or `/var/run/pvc/<NAME>`, depending on which of them is specified.
12671260
For EmptyDir, MountPath must be set.
12681261

@@ -1815,7 +1808,6 @@ Allows you to uniformly control access to your Cloud Storage resources.
18151808
When you enable uniform bucket-level access on a bucket, Access Control Lists (ACLs) are disabled, and only bucket-level Identity
18161809
and Access Management (IAM) permissions grant access to that bucket and the objects it contains.
18171810

1818-
18191811
Uniform access control can not be reversed after 90 days! This is controlled by Google.
18201812

18211813
Relevant information:
@@ -2984,7 +2976,7 @@ Required: `false`<br />
29842976

29852977
##### gcp.sqlInstances[].maintenance.day
29862978
Type: `integer`<br />
2987-
Required: `false`<br />
2979+
Required: `true`<br />
29882980
Value range: `1`-`7`<br />
29892981

29902982
??? example
@@ -3026,7 +3018,7 @@ Value range: `1`-`7`<br />
30263018

30273019
##### gcp.sqlInstances[].maintenance.hour
30283020
Type: `integer`<br />
3029-
Required: `false`<br />
3021+
Required: `true`<br />
30303022
Value range: `0`-`23`<br />
30313023

30323024
??? example
@@ -3399,7 +3391,6 @@ Sidecar configures a sidecar that intercepts every HTTP request, and performs th
33993391
All requests to ingress + `/oauth2` will be processed only by the sidecar, whereas all other requests
34003392
will be proxied to the application.
34013393

3402-
34033394
If the user is authenticated with ID-porten, the `Authorization` header will be set to `Bearer <JWT>`.
34043395

34053396
Relevant information:
@@ -4755,7 +4746,6 @@ Command is the command line to execute inside the container before the pod is sh
47554746
The command is not run inside a shell, so traditional shell instructions (pipes, redirects, etc.) won't work.
47564747
To use a shell, you need to explicitly call out to that shell.
47574748

4758-
47594749
If the exit status is non-zero, the pod will still be shut down, and marked as `Failed`.
47604750

47614751
Type: `array`<br />
@@ -5813,14 +5803,11 @@ Required: `false`<br />
58135803
List of secret paths to be read from Vault and injected into the pod's filesystem.
58145804
Overriding the `paths` array is optional, and will give you fine-grained control over which Vault paths that will be mounted on the file system.
58155805

5816-
58175806
By default, the list will contain an entry with
58185807

5819-
58205808
`kvPath: /kv/<environment>/<zone>/<application>/<namespace>`
58215809
`mountPath: /var/run/secrets/nais.io/vault`
58225810

5823-
58245811
that will always be attempted to be mounted.
58255812

58265813
Type: `array`<br />

docs/workloads/job/reference/naisjob-spec.md

+2-12
Original file line numberDiff line numberDiff line change
@@ -917,11 +917,9 @@ Allowed values: _(empty string)_, `metadata.annotations`, `metadata.labels`, `me
917917
EnvFrom exposes all variables in the ConfigMap or Secret resources as environment variables.
918918
One of `configMap` or `secret` is required.
919919

920-
921920
Environment variables will take the form `KEY=VALUE`, where `key` is the ConfigMap or Secret key.
922921
You can specify as many keys as you like in a single ConfigMap or Secret.
923922

924-
925923
The ConfigMap and Secret resources must live in the same Kubernetes namespace as the Naisjob resource.
926924

927925
Type: `array`<br />
@@ -983,12 +981,10 @@ Default value: `1`<br />
983981
List of ConfigMap or Secret resources that will have their contents mounted into the containers as files.
984982
Either `configMap` or `secret` is required.
985983

986-
987984
Files will take the path `<mountPath>/<key>`, where `key` is the ConfigMap or Secret key.
988985
You can specify as many keys as you like in a single ConfigMap or Secret, and they will all
989986
be mounted to the same directory.
990987

991-
992988
The ConfigMap and Secret resources must live in the same Kubernetes namespace as the Naisjob resource.
993989

994990
Type: `array`<br />
@@ -1078,7 +1074,6 @@ Filesystem path inside the pod where files are mounted.
10781074
The directory will be created if it does not exist. If the directory exists,
10791075
any files in the directory will be made unaccessible.
10801076

1081-
10821077
Defaults to `/var/run/configmaps/<NAME>`, `/var/run/secrets`, or `/var/run/pvc/<NAME>`, depending on which of them is specified.
10831078
For EmptyDir, MountPath must be set.
10841079

@@ -1581,7 +1576,6 @@ Allows you to uniformly control access to your Cloud Storage resources.
15811576
When you enable uniform bucket-level access on a bucket, Access Control Lists (ACLs) are disabled, and only bucket-level Identity
15821577
and Access Management (IAM) permissions grant access to that bucket and the objects it contains.
15831578

1584-
15851579
Uniform access control can not be reversed after 90 days! This is controlled by Google.
15861580

15871581
Relevant information:
@@ -2750,7 +2744,7 @@ Required: `false`<br />
27502744

27512745
##### gcp.sqlInstances[].maintenance.day
27522746
Type: `integer`<br />
2753-
Required: `false`<br />
2747+
Required: `true`<br />
27542748
Value range: `1`-`7`<br />
27552749

27562750
??? example
@@ -2792,7 +2786,7 @@ Value range: `1`-`7`<br />
27922786

27932787
##### gcp.sqlInstances[].maintenance.hour
27942788
Type: `integer`<br />
2795-
Required: `false`<br />
2789+
Required: `true`<br />
27962790
Value range: `0`-`23`<br />
27972791

27982792
??? example
@@ -4113,7 +4107,6 @@ Command is the command line to execute inside the container before the pod is sh
41134107
The command is not run inside a shell, so traditional shell instructions (pipes, redirects, etc.) won't work.
41144108
To use a shell, you need to explicitly call out to that shell.
41154109

4116-
41174110
If the exit status is non-zero, the pod will still be shut down, and marked as `Failed`.
41184111

41194112
Type: `array`<br />
@@ -4728,14 +4721,11 @@ Required: `false`<br />
47284721
List of secret paths to be read from Vault and injected into the pod's filesystem.
47294722
Overriding the `paths` array is optional, and will give you fine-grained control over which Vault paths that will be mounted on the file system.
47304723

4731-
47324724
By default, the list will contain an entry with
47334725

4734-
47354726
`kvPath: /kv/<environment>/<zone>/<application>/<namespace>`
47364727
`mountPath: /var/run/secrets/nais.io/vault`
47374728

4738-
47394729
that will always be attempted to be mounted.
47404730

47414731
Type: `array`<br />

0 commit comments

Comments
 (0)