github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 16:06:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20782 from nickschuch/readonly_container_2

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-14 13:18:24 -08:00
parent 94b8554c91 5d511aeb54
commit 44d12a1389
18 changed files with 427 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/apis/extensions/v1beta1/conversion_generated.go
View File

@@ -1064,6 +1064,12 @@ func autoConvert_api_SecurityContext_To_v1_SecurityContext(in *api.SecurityConte
} else {
out.RunAsNonRoot = nil
}
if in.ReadOnlyRootFilesystem != nil {
out.ReadOnlyRootFilesystem = new(bool)
*out.ReadOnlyRootFilesystem = *in.ReadOnlyRootFilesystem
} else {
out.ReadOnlyRootFilesystem = nil
}
return nil
}
@@ -2348,6 +2354,12 @@ func autoConvert_v1_SecurityContext_To_api_SecurityContext(in *v1.SecurityContex
} else {
out.RunAsNonRoot = nil
}
if in.ReadOnlyRootFilesystem != nil {
out.ReadOnlyRootFilesystem = new(bool)
*out.ReadOnlyRootFilesystem = *in.ReadOnlyRootFilesystem
} else {
out.ReadOnlyRootFilesystem = nil
}
return nil
}

6
pkg/apis/extensions/v1beta1/deep_copy_generated.go
View File

@@ -809,6 +809,12 @@ func deepCopy_v1_SecurityContext(in v1.SecurityContext, out *v1.SecurityContext,
} else {
out.RunAsNonRoot = nil
}
if in.ReadOnlyRootFilesystem != nil {
out.ReadOnlyRootFilesystem = new(bool)
*out.ReadOnlyRootFilesystem = *in.ReadOnlyRootFilesystem
} else {
out.ReadOnlyRootFilesystem = nil
}
return nil
}