From 17f968902328bfa6cdaa45c5af4b34606481c948 Mon Sep 17 00:00:00 2001 From: rmweir Date: Fri, 25 Oct 2019 15:30:14 -0700 Subject: [PATCH 1/2] Add PspEnabled field to cluster capabilities Added PspEnabled field to cluster capabilities. It is necessary to track this value to determine if pod policies can be configured. --- apis/management.cattle.io/v3/cluster_types.go | 1 + 1 file changed, 1 insertion(+) diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go index 4f1525ed..765e56db 100644 --- a/apis/management.cattle.io/v3/cluster_types.go +++ b/apis/management.cattle.io/v3/cluster_types.go @@ -242,6 +242,7 @@ type Capabilities struct { NodePoolScalingSupported bool `json:"nodePoolScalingSupported,omitempty"` NodePortRange string `json:"nodePortRange,omitempty"` TaintSupport *bool `json:"taintSupport,omitempty"` + PspEnabled bool `json:"pspEnabled,omitempty"` } type LoadBalancerCapabilities struct { From 2810825a9f4f027dbe8f141e5b82c07b7a98ebb0 Mon Sep 17 00:00:00 2001 From: rmweir Date: Mon, 28 Oct 2019 16:38:28 -0700 Subject: [PATCH 2/2] go generate --- client/management/v3/zz_generated_capabilities.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/management/v3/zz_generated_capabilities.go b/client/management/v3/zz_generated_capabilities.go index 887bcbd4..665e5b46 100644 --- a/client/management/v3/zz_generated_capabilities.go +++ b/client/management/v3/zz_generated_capabilities.go @@ -6,6 +6,7 @@ const ( CapabilitiesFieldLoadBalancerCapabilities = "loadBalancerCapabilities" CapabilitiesFieldNodePoolScalingSupported = "nodePoolScalingSupported" CapabilitiesFieldNodePortRange = "nodePortRange" + CapabilitiesFieldPspEnabled = "pspEnabled" CapabilitiesFieldTaintSupport = "taintSupport" ) @@ -14,5 +15,6 @@ type Capabilities struct { LoadBalancerCapabilities *LoadBalancerCapabilities `json:"loadBalancerCapabilities,omitempty" yaml:"loadBalancerCapabilities,omitempty"` NodePoolScalingSupported bool `json:"nodePoolScalingSupported,omitempty" yaml:"nodePoolScalingSupported,omitempty"` NodePortRange string `json:"nodePortRange,omitempty" yaml:"nodePortRange,omitempty"` + PspEnabled bool `json:"pspEnabled,omitempty" yaml:"pspEnabled,omitempty"` TaintSupport *bool `json:"taintSupport,omitempty" yaml:"taintSupport,omitempty"` }