Merge pull request #3545 from Hye-Dev/main

Fix typo in documented behavior in setting `restricted.containers.privilege` to `isolated`
This commit is contained in:
Stéphane Graber 2026-06-25 21:06:40 -04:00 committed by GitHub
commit ba0b00a9d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions

View File

@ -1660,7 +1660,7 @@ func projectValidateConfig(s *state.State, config map[string]string) error {
// Possible values are `unprivileged`, `isolated`, and `allow`.
//
// - When set to `unprivileged`, this option prevents setting {config:option}`instance-security:security.privileged` to `true`.
// - When set to `isolated`, this option prevents setting {config:option}`instance-security:security.privileged` and {config:option}`instance-security:security.idmap.isolated` to `true`.
// - When set to `isolated`, this option prevents setting {config:option}`instance-security:security.privileged` and {config:option}`instance-security:security.idmap.isolated` to `false`.
// - When set to `allow`, there is no restriction.
// ---
// type: string

View File

@ -4722,7 +4722,7 @@ When set to `allow`, {config:option}`instance-security:security.nesting` can be
Possible values are `unprivileged`, `isolated`, and `allow`.
- When set to `unprivileged`, this option prevents setting {config:option}`instance-security:security.privileged` to `true`.
- When set to `isolated`, this option prevents setting {config:option}`instance-security:security.privileged` and {config:option}`instance-security:security.idmap.isolated` to `true`.
- When set to `isolated`, this option prevents setting {config:option}`instance-security:security.privileged` and {config:option}`instance-security:security.idmap.isolated` to `false`.
- When set to `allow`, there is no restriction.
```

View File

@ -5307,7 +5307,7 @@
{
"restricted.containers.privilege": {
"defaultdesc": "`unprivileged`",
"longdesc": "Possible values are `unprivileged`, `isolated`, and `allow`.\n\n- When set to `unprivileged`, this option prevents setting {config:option}`instance-security:security.privileged` to `true`.\n- When set to `isolated`, this option prevents setting {config:option}`instance-security:security.privileged` and {config:option}`instance-security:security.idmap.isolated` to `true`.\n- When set to `allow`, there is no restriction.",
"longdesc": "Possible values are `unprivileged`, `isolated`, and `allow`.\n\n- When set to `unprivileged`, this option prevents setting {config:option}`instance-security:security.privileged` to `true`.\n- When set to `isolated`, this option prevents setting {config:option}`instance-security:security.privileged` and {config:option}`instance-security:security.idmap.isolated` to `false`.\n- When set to `allow`, there is no restriction.",
"shortdesc": "Which settings for privileged containers to prevent",
"type": "string"
}