rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-04-27 18:25:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1162 from superseb/add_dockerinfo_selinux

Browse Source 
Add SELinux related params to DockerInfo
This commit is contained in:
Sebastiaan van Steenis 2020-06-09 19:19:39 +02:00 committed by GitHub
commit d21f6b7b59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/management.cattle.io/v3/machine_types.go
View File

@ -106,7 +106,9 @@ type DockerInfo struct {
OSType string
Architecture string
IndexServerAddress string
InitBinary string
DockerRootDir string
SecurityOptions []string
HTTPProxy string
HTTPSProxy string
NoProxy string

5
apis/management.cattle.io/v3/zz_generated_deepcopy.go
View File

@ -3048,6 +3048,11 @@ func (in *DiskVsphereOpts) DeepCopy() *DiskVsphereOpts {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DockerInfo) DeepCopyInto(out *DockerInfo) {
*out = *in
if in.SecurityOptions != nil {
in, out := &in.SecurityOptions, &out.SecurityOptions
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.Labels != nil {
in, out := &in.Labels, &out.Labels
*out = make([]string, len(*in))

4
client/management/v3/zz_generated_docker_info.go
View File

@ -11,6 +11,7 @@ const (
DockerInfoFieldHTTPProxy = "httpProxy"
DockerInfoFieldHTTPSProxy = "httpsProxy"
DockerInfoFieldIndexServerAddress = "indexServerAddress"
DockerInfoFieldInitBinary = "initBinary"
DockerInfoFieldKernelVersion = "kernelVersion"
DockerInfoFieldLabels = "labels"
DockerInfoFieldLoggingDriver = "loggingDriver"
@ -18,6 +19,7 @@ const (
DockerInfoFieldNoProxy = "noProxy"
DockerInfoFieldOSType = "osType"
DockerInfoFieldOperatingSystem = "operatingSystem"
DockerInfoFieldSecurityOptions = "securityOptions"
DockerInfoFieldServerVersion = "serverVersion"
)
@ -31,6 +33,7 @@ type DockerInfo struct {
HTTPProxy string `json:"httpProxy,omitempty" yaml:"httpProxy,omitempty"`
HTTPSProxy string `json:"httpsProxy,omitempty" yaml:"httpsProxy,omitempty"`
IndexServerAddress string `json:"indexServerAddress,omitempty" yaml:"indexServerAddress,omitempty"`
InitBinary string `json:"initBinary,omitempty" yaml:"initBinary,omitempty"`
KernelVersion string `json:"kernelVersion,omitempty" yaml:"kernelVersion,omitempty"`
Labels []string `json:"labels,omitempty" yaml:"labels,omitempty"`
LoggingDriver string `json:"loggingDriver,omitempty" yaml:"loggingDriver,omitempty"`
@ -38,5 +41,6 @@ type DockerInfo struct {
NoProxy string `json:"noProxy,omitempty" yaml:"noProxy,omitempty"`
OSType string `json:"osType,omitempty" yaml:"osType,omitempty"`
OperatingSystem string `json:"operatingSystem,omitempty" yaml:"operatingSystem,omitempty"`
SecurityOptions []string `json:"securityOptions,omitempty" yaml:"securityOptions,omitempty"`
ServerVersion string `json:"serverVersion,omitempty" yaml:"serverVersion,omitempty"`
}