From 3525a976f949dd7e231b6781bc9e4ea36636596a Mon Sep 17 00:00:00 2001 From: moelsayed Date: Tue, 19 Dec 2017 20:50:28 +0200 Subject: [PATCH 1/2] Move PodSecurityPolicy to KubeAPI --- apis/management.cattle.io/v3/rke_types.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 7b0c3ed8..4f7e034f 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -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 { From bea081ef7832e575768c4aa56f947c3c75b34106 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Tue, 19 Dec 2017 20:51:01 +0200 Subject: [PATCH 2/2] generated code --- client/management/v3/zz_generated_kube_apiservice.go | 2 ++ .../v3/zz_generated_rancher_kubernetes_engine_config.go | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/management/v3/zz_generated_kube_apiservice.go b/client/management/v3/zz_generated_kube_apiservice.go index fb64169e..3d704a9c 100644 --- a/client/management/v3/zz_generated_kube_apiservice.go +++ b/client/management/v3/zz_generated_kube_apiservice.go @@ -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"` } diff --git a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go index 6db884b1..376928bb 100644 --- a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go +++ b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go @@ -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"`