Skip to content

Commit 83ac5ae

Browse files
authored
Merge pull request #20152 from bparees/apibump
api bump
2 parents 954eba1 + 2a1b2d7 commit 83ac5ae

File tree

54 files changed

+1491
-505
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1491
-505
lines changed

api/docs/api/v1.SecurityContextConstraints.adoc

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Expand or mouse-over a field for more information about it.
2323
</div><div style="margin-left:13px;"><span title="(boolean) AllowHostNetwork determines if the policy allows the use of HostNetwork in the pod spec.">allowHostNetwork</span>:
2424
</div><div style="margin-left:13px;"><span title="(boolean) AllowHostPID determines if the policy allows host pid in the containers.">allowHostPID</span>:
2525
</div><div style="margin-left:13px;"><span title="(boolean) AllowHostPorts determines if the policy allows host ports in the containers.">allowHostPorts</span>:
26+
</div><div style="margin-left:13px;"><span title="(boolean) AllowPrivilegeEscalation determines if a pod can request to allow privilege escalation. If unspecified, defaults to true.">allowPrivilegeEscalation</span>:
2627
</div><div style="margin-left:13px;"><span title="(boolean) AllowPrivilegedContainer determines if a container can request to be run as privileged.">allowPrivilegedContainer</span>:
2728
</div><details><summary><span title="(array) AllowedCapabilities is a list of capabilities that can be requested to add to the container. Capabilities in this field maybe added at the pod author&#39;s discretion. You must not list a capability in both AllowedCapabilities and RequiredDropCapabilities. To allow all capabilities you may use &#39;*&#39;.">allowedCapabilities</span>:
2829
</summary><div style="margin-left:13px;">- <span title="(string)">[string]</span>:
@@ -31,7 +32,8 @@ Expand or mouse-over a field for more information about it.
3132
</div></details><div style="margin-left:13px;"><span title="(string) APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources">apiVersion</span>:
3233
</div><details><summary><span title="(array) 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.">defaultAddCapabilities</span>:
3334
</summary><div style="margin-left:13px;">- <span title="(string)">[string]</span>:
34-
</div></details><details><summary><span title="(v1.FSGroupStrategyOptions) FSGroup is the strategy that will dictate what fs group is used by the SecurityContext.">fsGroup</span>:
35+
</div></details><div style="margin-left:13px;"><span title="(boolean) DefaultAllowPrivilegeEscalation controls the default setting for whether a process can gain more privileges than its parent process.">defaultAllowPrivilegeEscalation</span>:
36+
</div><details><summary><span title="(v1.FSGroupStrategyOptions) FSGroup is the strategy that will dictate what fs group is used by the SecurityContext.">fsGroup</span>:
3537
</summary><details><summary> <span title="(array) Ranges are the allowed ranges of fs groups. If you would like to force a single fs group then supply a single range with the same start and end.">ranges</span>:
3638
</summary><div style="margin-left:13px;"> - <span title="(integer) Max is the end of the range, inclusive.">max</span>:
3739
</div><div style="margin-left:13px;"> <span title="(integer) Min is the start of the range, inclusive.">min</span>:

api/docs/apis-build.openshift.io/v1.BuildConfig.adoc

+1
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-gu
351351
</div><div style="margin-left:13px;"> <span title="(string) Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency">resourceVersion</span>:
352352
</div><div style="margin-left:13px;"> <span title="(string) UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids">uid</span>:
353353
</div></details><div style="margin-left:13px;"> <span title="(string) lastTriggeredImageID is used internally by the ImageChangeController to save last used image ID for build">lastTriggeredImageID</span>:
354+
</div><div style="margin-left:13px;"> <span title="(boolean) paused is true if this trigger is temporarily disabled. Optional.">paused</span>:
354355
</div></details><div style="margin-left:13px;"> <span title="(string) type is the type of build trigger">type</span>:
355356
</div></details></details><details><summary><span title="(v1.BuildConfigStatus) status holds any relevant information about a build config">status</span>:
356357
</summary><div style="margin-left:13px;"> <span title="(integer) lastVersion is used to inform about number of last triggered build.">lastVersion</span>:

api/docs/apis-security.openshift.io/v1.SecurityContextConstraints.adoc

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Expand or mouse-over a field for more information about it.
2323
</div><div style="margin-left:13px;"><span title="(boolean) AllowHostNetwork determines if the policy allows the use of HostNetwork in the pod spec.">allowHostNetwork</span>:
2424
</div><div style="margin-left:13px;"><span title="(boolean) AllowHostPID determines if the policy allows host pid in the containers.">allowHostPID</span>:
2525
</div><div style="margin-left:13px;"><span title="(boolean) AllowHostPorts determines if the policy allows host ports in the containers.">allowHostPorts</span>:
26+
</div><div style="margin-left:13px;"><span title="(boolean) AllowPrivilegeEscalation determines if a pod can request to allow privilege escalation. If unspecified, defaults to true.">allowPrivilegeEscalation</span>:
2627
</div><div style="margin-left:13px;"><span title="(boolean) AllowPrivilegedContainer determines if a container can request to be run as privileged.">allowPrivilegedContainer</span>:
2728
</div><details><summary><span title="(array) AllowedCapabilities is a list of capabilities that can be requested to add to the container. Capabilities in this field maybe added at the pod author&#39;s discretion. You must not list a capability in both AllowedCapabilities and RequiredDropCapabilities. To allow all capabilities you may use &#39;*&#39;.">allowedCapabilities</span>:
2829
</summary><div style="margin-left:13px;">- <span title="(string)">[string]</span>:
@@ -31,7 +32,8 @@ Expand or mouse-over a field for more information about it.
3132
</div></details><div style="margin-left:13px;"><span title="(string) APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources">apiVersion</span>:
3233
</div><details><summary><span title="(array) 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.">defaultAddCapabilities</span>:
3334
</summary><div style="margin-left:13px;">- <span title="(string)">[string]</span>:
34-
</div></details><details><summary><span title="(v1.FSGroupStrategyOptions) FSGroup is the strategy that will dictate what fs group is used by the SecurityContext.">fsGroup</span>:
35+
</div></details><div style="margin-left:13px;"><span title="(boolean) DefaultAllowPrivilegeEscalation controls the default setting for whether a process can gain more privileges than its parent process.">defaultAllowPrivilegeEscalation</span>:
36+
</div><details><summary><span title="(v1.FSGroupStrategyOptions) FSGroup is the strategy that will dictate what fs group is used by the SecurityContext.">fsGroup</span>:
3537
</summary><details><summary> <span title="(array) Ranges are the allowed ranges of fs groups. If you would like to force a single fs group then supply a single range with the same start and end.">ranges</span>:
3638
</summary><div style="margin-left:13px;"> - <span title="(integer) Max is the end of the range, inclusive.">max</span>:
3739
</div><div style="margin-left:13px;"> <span title="(integer) Min is the start of the range, inclusive.">min</span>:

api/docs/oapi/v1.BuildConfig.adoc

+1
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-gu
351351
</div><div style="margin-left:13px;"> <span title="(string) Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency">resourceVersion</span>:
352352
</div><div style="margin-left:13px;"> <span title="(string) UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids">uid</span>:
353353
</div></details><div style="margin-left:13px;"> <span title="(string) lastTriggeredImageID is used internally by the ImageChangeController to save last used image ID for build">lastTriggeredImageID</span>:
354+
</div><div style="margin-left:13px;"> <span title="(boolean) paused is true if this trigger is temporarily disabled. Optional.">paused</span>:
354355
</div></details><div style="margin-left:13px;"> <span title="(string) type is the type of build trigger">type</span>:
355356
</div></details></details><details><summary><span title="(v1.BuildConfigStatus) status holds any relevant information about a build config">status</span>:
356357
</summary><div style="margin-left:13px;"> <span title="(integer) lastVersion is used to inform about number of last triggered build.">lastVersion</span>:

api/protobuf-spec/github_com_openshift_api_build_v1.proto

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

api/protobuf-spec/github_com_openshift_api_security_v1.proto

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

api/swagger-spec/api-v1.json

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

api/swagger-spec/oapi-v1.json

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

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

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

glide.lock

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

glide.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import:
3838

3939
# openshift second
4040
- package: github.com/openshift/api
41-
version: 0ce1df2db7debb15eddb25f3ae76df4180777221
41+
version: master
4242
- package: github.com/openshift/client-go
4343
version: master
4444
- package: github.com/openshift/imagebuilder

pkg/api/serialization_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,9 @@ func originFuzzer(t *testing.T, seed int64) *fuzz.Fuzzer {
479479
scc.SupplementalGroups.Type = supGroupTypes[c.Rand.Intn(len(supGroupTypes))]
480480
fsGroupTypes := []securityapi.FSGroupStrategyType{securityapi.FSGroupStrategyMustRunAs, securityapi.FSGroupStrategyRunAsAny}
481481
scc.FSGroup.Type = fsGroupTypes[c.Rand.Intn(len(fsGroupTypes))]
482+
// avoid the defaulting logic for this field by making it never nil
483+
allowPrivilegeEscalation := c.RandBool()
484+
scc.AllowPrivilegeEscalation = &allowPrivilegeEscalation
482485

483486
// when fuzzing the volume types ensure it is set to avoid the defaulter's expansion.
484487
// Do not use FSTypeAll or host dir setting to steer clear of defaulting mechanics

0 commit comments

Comments
 (0)