rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-07-31 04:49:37 +00:00
Code Issues Releases Wiki Activity

Merge pull request #82 from moelsayed/move_psp

Browse Source 
Move PodSecurityPolicy to KubeAPI
This commit is contained in:
Alena Prokharchyk 2017-12-19 17:05:26 -08:00 committed by GitHub
commit 0d582f634e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/management.cattle.io/v3/rke_types.go
View File

@ -19,8 +19,6 @@ type RancherKubernetesEngineConfig struct {
Authorization AuthzConfig `yaml:"authorization" json:"authorization,omitempty"`
// Enable/disable strict docker version checking
IgnoreDockerVersion bool `yaml:"ignore_docker_version" json:"ignoreDockerVersion"`
// Enable/disable Pod Security Policy
DisablePSP bool `yaml:"disable_psp" json:"disablePSP,omitempty"`
}
type RKEConfigNode struct {
@ -69,6 +67,8 @@ type KubeAPIService struct {
BaseService `yaml:",inline" json:",inline"`
// Virtual IP range that will be used by Kubernetes services
ServiceClusterIPRange string `yaml:"service_cluster_ip_range" json:"serviceClusterIpRange,omitempty"`
// Enabled/Disable PodSecurityPolicy
PodSecurityPolicy bool `yaml:"pod_security_policy" json:"podSecurityPolicy,omitempty"`
}
type KubeControllerService struct {

2
client/management/v3/zz_generated_kube_apiservice.go
View File

@ -4,11 +4,13 @@ const (
KubeAPIServiceType = "kubeAPIService"
KubeAPIServiceFieldExtraArgs = "extraArgs"
KubeAPIServiceFieldImage = "image"
KubeAPIServiceFieldPodSecurityPolicy = "podSecurityPolicy"
KubeAPIServiceFieldServiceClusterIPRange = "serviceClusterIpRange"
)
type KubeAPIService struct {
ExtraArgs map[string]string `json:"extraArgs,omitempty"`
Image string `json:"image,omitempty"`
PodSecurityPolicy *bool `json:"podSecurityPolicy,omitempty"`
ServiceClusterIPRange string `json:"serviceClusterIpRange,omitempty"`
}

2
client/management/v3/zz_generated_rancher_kubernetes_engine_config.go
View File

@ -5,7 +5,6 @@ const (
RancherKubernetesEngineConfigFieldAddons = "addons"
RancherKubernetesEngineConfigFieldAuthentication = "authentication"
RancherKubernetesEngineConfigFieldAuthorization = "authorization"
RancherKubernetesEngineConfigFieldDisablePSP = "disablePSP"
RancherKubernetesEngineConfigFieldIgnoreDockerVersion = "ignoreDockerVersion"
RancherKubernetesEngineConfigFieldNetwork = "network"
RancherKubernetesEngineConfigFieldNodes = "nodes"
@ -18,7 +17,6 @@ type RancherKubernetesEngineConfig struct {
Addons string `json:"addons,omitempty"`
Authentication *AuthnConfig `json:"authentication,omitempty"`
Authorization *AuthzConfig `json:"authorization,omitempty"`
DisablePSP *bool `json:"disablePSP,omitempty"`
IgnoreDockerVersion *bool `json:"ignoreDockerVersion,omitempty"`
Network *NetworkConfig `json:"network,omitempty"`
Nodes []RKEConfigNode `json:"nodes,omitempty"`