From 5e63ef0adbddc333d9bb303d4931a9fb57fcf874 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 12 Oct 2018 12:08:20 -0400 Subject: [PATCH 1/2] fix omitempty on ProcMount Signed-off-by: Jess Frazelle --- staging/src/k8s.io/api/core/v1/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index 9b575bf68a2..0ba6054194c 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -5219,7 +5219,7 @@ type SecurityContext struct { // readonly paths and masked paths. // This requires the ProcMountType feature flag to be enabled. // +optional - ProcMount *ProcMountType `json:"procMount,omitEmpty" protobuf:"bytes,9,opt,name=procMount"` + ProcMount *ProcMountType `json:"procMount,omitempty" protobuf:"bytes,9,opt,name=procMount"` } type ProcMountType string From ce6f716ffd0a9bcd02f0ae2abac4153cdbdee08f Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 12 Oct 2018 12:13:40 -0400 Subject: [PATCH 2/2] run make update Signed-off-by: Jess Frazelle --- api/swagger-spec/apps_v1.json | 3 --- api/swagger-spec/apps_v1beta1.json | 3 --- api/swagger-spec/apps_v1beta2.json | 3 --- api/swagger-spec/batch_v1.json | 3 --- api/swagger-spec/batch_v1beta1.json | 3 --- api/swagger-spec/batch_v2alpha1.json | 3 --- api/swagger-spec/extensions_v1beta1.json | 3 --- api/swagger-spec/v1.json | 3 --- docs/api-reference/apps/v1/definitions.html | 2 +- docs/api-reference/apps/v1beta1/definitions.html | 2 +- docs/api-reference/apps/v1beta2/definitions.html | 2 +- docs/api-reference/batch/v1/definitions.html | 2 +- docs/api-reference/batch/v1beta1/definitions.html | 2 +- docs/api-reference/batch/v2alpha1/definitions.html | 2 +- docs/api-reference/extensions/v1beta1/definitions.html | 2 +- docs/api-reference/v1/definitions.html | 2 +- 16 files changed, 8 insertions(+), 32 deletions(-) diff --git a/api/swagger-spec/apps_v1.json b/api/swagger-spec/apps_v1.json index 20a7fb0060e..9559b6c83ef 100644 --- a/api/swagger-spec/apps_v1.json +++ b/api/swagger-spec/apps_v1.json @@ -8657,9 +8657,6 @@ "v1.SecurityContext": { "id": "v1.SecurityContext", "description": "SecurityContext holds security configuration that will be applied to a container. Some fields are present in both SecurityContext and PodSecurityContext. When both are set, the values in SecurityContext take precedence.", - "required": [ - "procMount" - ], "properties": { "capabilities": { "$ref": "v1.Capabilities", diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json index a44974473dc..806eb3495c3 100644 --- a/api/swagger-spec/apps_v1beta1.json +++ b/api/swagger-spec/apps_v1beta1.json @@ -6169,9 +6169,6 @@ "v1.SecurityContext": { "id": "v1.SecurityContext", "description": "SecurityContext holds security configuration that will be applied to a container. Some fields are present in both SecurityContext and PodSecurityContext. When both are set, the values in SecurityContext take precedence.", - "required": [ - "procMount" - ], "properties": { "capabilities": { "$ref": "v1.Capabilities", diff --git a/api/swagger-spec/apps_v1beta2.json b/api/swagger-spec/apps_v1beta2.json index 2ab01313b36..5e1cbb1c4b8 100644 --- a/api/swagger-spec/apps_v1beta2.json +++ b/api/swagger-spec/apps_v1beta2.json @@ -8657,9 +8657,6 @@ "v1.SecurityContext": { "id": "v1.SecurityContext", "description": "SecurityContext holds security configuration that will be applied to a container. Some fields are present in both SecurityContext and PodSecurityContext. When both are set, the values in SecurityContext take precedence.", - "required": [ - "procMount" - ], "properties": { "capabilities": { "$ref": "v1.Capabilities", diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json index f55b38f2362..6d1e25646d6 100644 --- a/api/swagger-spec/batch_v1.json +++ b/api/swagger-spec/batch_v1.json @@ -3353,9 +3353,6 @@ "v1.SecurityContext": { "id": "v1.SecurityContext", "description": "SecurityContext holds security configuration that will be applied to a container. Some fields are present in both SecurityContext and PodSecurityContext. When both are set, the values in SecurityContext take precedence.", - "required": [ - "procMount" - ], "properties": { "capabilities": { "$ref": "v1.Capabilities", diff --git a/api/swagger-spec/batch_v1beta1.json b/api/swagger-spec/batch_v1beta1.json index 73ba9190df6..337f14b1c03 100644 --- a/api/swagger-spec/batch_v1beta1.json +++ b/api/swagger-spec/batch_v1beta1.json @@ -3408,9 +3408,6 @@ "v1.SecurityContext": { "id": "v1.SecurityContext", "description": "SecurityContext holds security configuration that will be applied to a container. Some fields are present in both SecurityContext and PodSecurityContext. When both are set, the values in SecurityContext take precedence.", - "required": [ - "procMount" - ], "properties": { "capabilities": { "$ref": "v1.Capabilities", diff --git a/api/swagger-spec/batch_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json index 19ee2ff99c1..908fccb7bf1 100644 --- a/api/swagger-spec/batch_v2alpha1.json +++ b/api/swagger-spec/batch_v2alpha1.json @@ -3408,9 +3408,6 @@ "v1.SecurityContext": { "id": "v1.SecurityContext", "description": "SecurityContext holds security configuration that will be applied to a container. Some fields are present in both SecurityContext and PodSecurityContext. When both are set, the values in SecurityContext take precedence.", - "required": [ - "procMount" - ], "properties": { "capabilities": { "$ref": "v1.Capabilities", diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index 1327712c664..fde6cf65608 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -9353,9 +9353,6 @@ "v1.SecurityContext": { "id": "v1.SecurityContext", "description": "SecurityContext holds security configuration that will be applied to a container. Some fields are present in both SecurityContext and PodSecurityContext. When both are set, the values in SecurityContext take precedence.", - "required": [ - "procMount" - ], "properties": { "capabilities": { "$ref": "v1.Capabilities", diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 841bdd86955..68dc6008665 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -22533,9 +22533,6 @@ "v1.SecurityContext": { "id": "v1.SecurityContext", "description": "SecurityContext holds security configuration that will be applied to a container. Some fields are present in both SecurityContext and PodSecurityContext. When both are set, the values in SecurityContext take precedence.", - "required": [ - "procMount" - ], "properties": { "capabilities": { "$ref": "v1.Capabilities", diff --git a/docs/api-reference/apps/v1/definitions.html b/docs/api-reference/apps/v1/definitions.html index 80670e0366b..c010da95938 100755 --- a/docs/api-reference/apps/v1/definitions.html +++ b/docs/api-reference/apps/v1/definitions.html @@ -6757,7 +6757,7 @@ Examples:

procMount

procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled.

-

true

+

false

v1.ProcMountType

diff --git a/docs/api-reference/apps/v1beta1/definitions.html b/docs/api-reference/apps/v1beta1/definitions.html index 88288d917d9..c887d75b7c6 100755 --- a/docs/api-reference/apps/v1beta1/definitions.html +++ b/docs/api-reference/apps/v1beta1/definitions.html @@ -6617,7 +6617,7 @@ Examples:

procMount

procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled.

-

true

+

false

v1.ProcMountType

diff --git a/docs/api-reference/apps/v1beta2/definitions.html b/docs/api-reference/apps/v1beta2/definitions.html index 36c56eddf49..a257ca7121a 100755 --- a/docs/api-reference/apps/v1beta2/definitions.html +++ b/docs/api-reference/apps/v1beta2/definitions.html @@ -6896,7 +6896,7 @@ Examples:

procMount

procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled.

-

true

+

false

v1.ProcMountType

diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html index e635111144c..281542dd3c9 100755 --- a/docs/api-reference/batch/v1/definitions.html +++ b/docs/api-reference/batch/v1/definitions.html @@ -5388,7 +5388,7 @@ Examples:

procMount

procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled.

-

true

+

false

v1.ProcMountType

diff --git a/docs/api-reference/batch/v1beta1/definitions.html b/docs/api-reference/batch/v1beta1/definitions.html index 5da6593ca27..e2e95df2c58 100755 --- a/docs/api-reference/batch/v1beta1/definitions.html +++ b/docs/api-reference/batch/v1beta1/definitions.html @@ -5525,7 +5525,7 @@ Examples:

procMount

procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled.

-

true

+

false

v1.ProcMountType

diff --git a/docs/api-reference/batch/v2alpha1/definitions.html b/docs/api-reference/batch/v2alpha1/definitions.html index d298f38d022..af02d331c67 100755 --- a/docs/api-reference/batch/v2alpha1/definitions.html +++ b/docs/api-reference/batch/v2alpha1/definitions.html @@ -5326,7 +5326,7 @@ Examples:

procMount

procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled.

-

true

+

false

v1.ProcMountType

diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html index 860af4090db..ac513356bf0 100755 --- a/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/api-reference/extensions/v1beta1/definitions.html @@ -7542,7 +7542,7 @@ If PodSelector is also set, then the NetworkPolicyPeer as a whole selects the Po

procMount

procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled.

-

true

+

false

v1.ProcMountType

diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index c5460a21c3f..932609fe4df 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -5083,7 +5083,7 @@ Examples:

procMount

procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled.

-

true

+

false

v1.ProcMountType