Skip to content

Commit 60b478d

Browse files
committed
Merge branch 'main' into docs/api-compatibility-review
2 parents eff2e08 + d27dde5 commit 60b478d

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

internal/mode/static/nginx/file/manager.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
)
1111

1212
const (
13+
// regularFileMode defines the default file mode for regular files.
14+
regularFileMode = 0o644
1315
// secretFileMode defines the default file mode for files with secrets.
1416
secretFileMode = 0o640
1517
)
@@ -136,11 +138,20 @@ func writeFile(fileMgr OSFileManager, file File) error {
136138
}
137139
}()
138140

139-
if file.Type == TypeSecret {
141+
switch file.Type {
142+
case TypeRegular:
143+
if err := fileMgr.Chmod(f, regularFileMode); err != nil {
144+
resultErr = fmt.Errorf(
145+
"failed to set file mode to %#o for %q: %w", regularFileMode, file.Path, err)
146+
return resultErr
147+
}
148+
case TypeSecret:
140149
if err := fileMgr.Chmod(f, secretFileMode); err != nil {
141-
resultErr = fmt.Errorf("failed to set file mode for %q: %w", file.Path, err)
150+
resultErr = fmt.Errorf("failed to set file mode to %#o for %q: %w", secretFileMode, file.Path, err)
142151
return resultErr
143152
}
153+
default:
154+
panic(fmt.Sprintf("unknown file type %d", file.Type))
144155
}
145156

146157
if err := fileMgr.Write(f, file.Content); err != nil {

site/content/overview/gateway-api-compatibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ For a description of each field, visit the [Gateway API documentation](https://g
5353
| Gateway | Supported | Not supported | Not supported | v1 |
5454
{{< /bootstrap-table >}}
5555

56-
NGINX Gateway Fabric supports a single Gateway resource. The Gateway resource must reference NGINX Gateway Fabric's corresponding GatewayClass.
56+
NGINX Gateway Fabric supports a single Gateway resource. The Gateway resource must reference NGINX Gateway Fabric's corresponding GatewayClass.
5757

5858
See the [static-mode]({{< relref "/reference/cli-help.md#static-mode">}}) command for more information.
5959

0 commit comments

Comments
 (0)