rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-12 13:03:45 +00:00
Code Issues Releases Wiki Activity

Move PSP to project and cluster

Browse Source 
PSPs will only be able to be set directly on cluster or project and
only by a cluster-admin.
This commit is contained in:
Craig Jellick
2017-12-12 11:24:40 -07:00
committed by Darren Shepherd
parent b00b71962e
commit 84196a0f47
8 changed files with 135 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apis/management.cattle.io/v3/authz_types.go
View File

@@ -14,8 +14,9 @@ type Project struct {
}
type ProjectSpec struct {
DisplayName string `json:"displayName,omitempty" norman:"required"`
ClusterName string `json:"clusterName,omitempty" norman:"required,type=reference[cluster]"`
DisplayName string `json:"displayName,omitempty" norman:"required"`
ClusterName string `json:"clusterName,omitempty" norman:"required,type=reference[cluster]"`
PodSecurityPolicyTemplateName string `json:"podSecurityPolicyTemplateName,omitempty" norman:"type=reference[podSecurityPolicyTemplate]"`
}
type RoleTemplate struct {
@@ -25,8 +26,7 @@ type RoleTemplate struct {
Rules []rbacv1.PolicyRule `json:"rules,omitempty"`
Builtin bool `json:"builtin"`
RoleTemplateNames []string `json:"roleTemplateNames,omitempty" norman:"type=array[reference[roleTemplate]]"`
PodSecurityPolicyTemplateNames []string `json:"podSecurityPolicyTemplateNames,omitempty" norman:"type=array[reference[podSecurityPolicyTemplate]]"`
RoleTemplateNames []string `json:"roleTemplateNames,omitempty" norman:"type=array[reference[roleTemplate]]"`
}
type PodSecurityPolicyTemplate struct {

11
apis/management.cattle.io/v3/cluster_types.go
View File

@@ -35,11 +35,12 @@ type Cluster struct {
}
type ClusterSpec struct {
Description string `json:"description"`
Internal bool `json:"internal" norman:"nocreate,noupdate"`
GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"`
AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty"`
RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty"`
Description string `json:"description"`
Internal bool `json:"internal" norman:"nocreate,noupdate"`
GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"`
AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty"`
RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty"`
DefaultPodSecurityPolicyTemplateName string `json:"defaultPodSecurityPolicyTemplateName,omitempty" norman:"type=reference[podSecurityPolicyTemplate]"`
}
type ClusterStatus struct {

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

@@ -2142,11 +2142,6 @@ func (in *RoleTemplate) DeepCopyInto(out *RoleTemplate) {
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.PodSecurityPolicyTemplateNames != nil {
in, out := &in.PodSecurityPolicyTemplateNames, &out.PodSecurityPolicyTemplateNames
*out = make([]string, len(*in))
copy(*out, *in)
}
return
}