Skip to content

Commit a19b41e

Browse files
Merge pull request #15425 from php-coder/scc_improve_priority_desc
Automatic merge from submit-queue SecurityContextConstraints: update description of the Priority field Sync description with reality and [documentation](https://docs.openshift.org/latest/architecture/additional_concepts/authorization.html#scc-prioritization). PTAL @pweil- CC @simo5
2 parents 7db519c + dc63045 commit a19b41e

File tree

8 files changed

+20
-8
lines changed

8 files changed

+20
-8
lines changed

api/protobuf-spec/github_com_openshift_origin_pkg_security_apis_security_v1.proto

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/swagger-spec/api-v1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22791,7 +22791,7 @@
2279122791
"priority": {
2279222792
"type": "integer",
2279322793
"format": "int32",
22794-
"description": "Priority influences the sort order of SCCs when evaluating which SCCs to try first for a given pod request based on access in the Users and Groups fields. The higher the int, the higher priority. If scores for multiple SCCs are equal they will be sorted by name."
22794+
"description": "Priority influences the sort order of SCCs when evaluating which SCCs to try first for a given pod request based on access in the Users and Groups fields. The higher the int, the higher priority. An unset value is considered a 0 priority. If scores for multiple SCCs are equal they will be sorted from most restrictive to least restrictive. If both priorities and restrictions are equal the SCCs will be sorted by name."
2279522795
},
2279622796
"allowPrivilegedContainer": {
2279722797
"type": "boolean",

api/swagger-spec/openshift-openapi-spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -99141,7 +99141,7 @@
9914199141
"$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"
9914299142
},
9914399143
"priority": {
99144-
"description": "Priority influences the sort order of SCCs when evaluating which SCCs to try first for a given pod request based on access in the Users and Groups fields. The higher the int, the higher priority. If scores for multiple SCCs are equal they will be sorted by name.",
99144+
"description": "Priority influences the sort order of SCCs when evaluating which SCCs to try first for a given pod request based on access in the Users and Groups fields. The higher the int, the higher priority. An unset value is considered a 0 priority. If scores for multiple SCCs are equal they will be sorted from most restrictive to least restrictive. If both priorities and restrictions are equal the SCCs will be sorted by name.",
9914599145
"type": "integer",
9914699146
"format": "int32"
9914799147
},

pkg/openapi/zz_generated.openapi.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9160,7 +9160,7 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
91609160
},
91619161
"priority": {
91629162
SchemaProps: spec.SchemaProps{
9163-
Description: "Priority influences the sort order of SCCs when evaluating which SCCs to try first for a given pod request based on access in the Users and Groups fields. The higher the int, the higher priority. If scores for multiple SCCs are equal they will be sorted by name.",
9163+
Description: "Priority influences the sort order of SCCs when evaluating which SCCs to try first for a given pod request based on access in the Users and Groups fields. The higher the int, the higher priority. An unset value is considered a 0 priority. If scores for multiple SCCs are equal they will be sorted from most restrictive to least restrictive. If both priorities and restrictions are equal the SCCs will be sorted by name.",
91649164
Type: []string{"integer"},
91659165
Format: "int32",
91669166
},

pkg/security/apis/security/types.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ type SecurityContextConstraints struct {
2121

2222
// Priority influences the sort order of SCCs when evaluating which SCCs to try first for
2323
// a given pod request based on access in the Users and Groups fields. The higher the int, the
24-
// higher priority. If scores for multiple SCCs are equal they will be sorted by name.
24+
// higher priority. An unset value is considered a 0 priority. If scores
25+
// for multiple SCCs are equal they will be sorted from most restrictive to
26+
// least restrictive. If both priorities and restrictions are equal the
27+
// SCCs will be sorted by name.
2528
Priority *int32
2629

2730
// AllowPrivilegedContainer determines if a container can request to be run as privileged.

pkg/security/apis/security/v1/generated.proto

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/security/apis/security/v1/swagger_doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func (SELinuxContextStrategyOptions) SwaggerDoc() map[string]string {
130130
var map_SecurityContextConstraints = map[string]string{
131131
"": "SecurityContextConstraints governs the ability to make requests that affect the SecurityContext that will be applied to a container.",
132132
"metadata": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
133-
"priority": "Priority influences the sort order of SCCs when evaluating which SCCs to try first for a given pod request based on access in the Users and Groups fields. The higher the int, the higher priority. If scores for multiple SCCs are equal they will be sorted by name.",
133+
"priority": "Priority influences the sort order of SCCs when evaluating which SCCs to try first for a given pod request based on access in the Users and Groups fields. The higher the int, the higher priority. An unset value is considered a 0 priority. If scores for multiple SCCs are equal they will be sorted from most restrictive to least restrictive. If both priorities and restrictions are equal the SCCs will be sorted by name.",
134134
"allowPrivilegedContainer": "AllowPrivilegedContainer determines if a container can request to be run as privileged.",
135135
"defaultAddCapabilities": "DefaultAddCapabilities is the default set of capabilities that will be added to the container unless the pod spec specifically drops the capability. You may not list a capabiility in both DefaultAddCapabilities and RequiredDropCapabilities.",
136136
"requiredDropCapabilities": "RequiredDropCapabilities are the capabilities that will be dropped from the container. These are required to be dropped and cannot be added.",

pkg/security/apis/security/v1/types.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ type SecurityContextConstraints struct {
2323

2424
// Priority influences the sort order of SCCs when evaluating which SCCs to try first for
2525
// a given pod request based on access in the Users and Groups fields. The higher the int, the
26-
// higher priority. If scores for multiple SCCs are equal they will be sorted by name.
26+
// higher priority. An unset value is considered a 0 priority. If scores
27+
// for multiple SCCs are equal they will be sorted from most restrictive to
28+
// least restrictive. If both priorities and restrictions are equal the
29+
// SCCs will be sorted by name.
2730
Priority *int32 `json:"priority" protobuf:"varint,2,opt,name=priority"`
2831

2932
// AllowPrivilegedContainer determines if a container can request to be run as privileged.

0 commit comments

Comments
 (0)