Skip to content

Commit 1adaf2c

Browse files
authored
Merge pull request kubernetes#77147 from wk8/wk8/win_sec_opts
Adding a new `WindowsSecurityOptions` struct
2 parents 0b10d1b + 03907a3 commit 1adaf2c

File tree

9 files changed

+1330
-1000
lines changed

9 files changed

+1330
-1000
lines changed

api/openapi-spec/swagger.json

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/core/types.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2730,6 +2730,9 @@ type PodSecurityContext struct {
27302730
// takes precedence for that container.
27312731
// +optional
27322732
SELinuxOptions *SELinuxOptions
2733+
// Windows security options.
2734+
// +optional
2735+
WindowsOptions *WindowsSecurityContextOptions
27332736
// The UID to run the entrypoint of the container process.
27342737
// Defaults to user specified in image metadata if unspecified.
27352738
// May also be set in SecurityContext. If set in both SecurityContext and
@@ -4655,6 +4658,9 @@ type SecurityContext struct {
46554658
// PodSecurityContext, the value specified in SecurityContext takes precedence.
46564659
// +optional
46574660
SELinuxOptions *SELinuxOptions
4661+
// Windows security options.
4662+
// +optional
4663+
WindowsOptions *WindowsSecurityContextOptions
46584664
// The UID to run the entrypoint of the container process.
46594665
// Defaults to user specified in image metadata if unspecified.
46604666
// May also be set in PodSecurityContext. If set in both SecurityContext and
@@ -4721,6 +4727,11 @@ type SELinuxOptions struct {
47214727
Level string
47224728
}
47234729

4730+
// WindowsSecurityContextOptions contain Windows-specific options and credentials.
4731+
type WindowsSecurityContextOptions struct {
4732+
// intentionally left empty for now
4733+
}
4734+
47244735
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
47254736

47264737
// RangeAllocation is an opaque API object (not exposed to end users) that can be persisted to record

pkg/apis/core/v1/zz_generated.conversion.go

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/core/zz_generated.deepcopy.go

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)