AutoHEP Kube-Controller enable custom hostendpoint templates

api/pkg/apis/projectcalico/v3/kubecontrollersconfig.go

@@ -110,6 +110,32 @@ type NodeControllerConfig struct {
 type AutoHostEndpointConfig struct {
 	// AutoCreate enables automatic creation of host endpoints for every node. [Default: Disabled]
 	AutoCreate string `json:"autoCreate,omitempty" validate:"omitempty,oneof=Enabled Disabled"`
+
+	CreateDefaultHostEndpoint DefaultHostEndpointMode `json:"createDefaultHostEndpoint,omitempty" validate:"omitempty,createDefaultHostEndpoint"`
+
+	// Templates contains definition for creating AutoHostEndpoints
+	Templates []Template `json:"templates,omitempty" validate:"omitempty"`
+}
+
+type DefaultHostEndpointMode string
+
+const (
+	DefaultHostEndpointsEnabled  DefaultHostEndpointMode = "Enabled"
+	DefaultHostEndpointsDisabled DefaultHostEndpointMode = "Disabled"
+)
+
+type Template struct {
+	// Name is appended to the end of the generated AutoHostEndpoint name
+	GenerateName string `json:"generateName,omitempty" validate:"omitempty,name"`
+
+	// InterfaceCIDRs contains a list of CIRDs used for matching nodeIPs to the AutoHostEndpoint
+	InterfaceCIDRs []string `json:"interfaceCIDRs,omitempty" validate:"cidrs"`
+
+	// Labels adds the specified labels to the generated AutoHostEndpoint, labels from node with the same name will be overwritten by values from the template label
+	Labels map[string]string `json:"labels,omitempty" validate:"omitempty,labels"`
+
+	// NodeSelector allows the AutoHostEndpoint to be created only for specific nodes
+	NodeSelector string `json:"nodeSelector,omitempty" validate:"omitempty,selector"`
 }
 
 // PolicyControllerConfig configures the network policy controller, which syncs Kubernetes policies

charts/calico/templates/calico-kube-controllers-rbac.yaml

@@ -111,6 +111,7 @@ rules:
       - create
       - update
       - delete
+      - watch
   # Needs access to update clusterinformations.
   - apiGroups: ["crd.projectcalico.org"]
     resources:

kube-controllers/pkg/config/config_test.go

@@ -120,10 +120,14 @@ var _ = Describe("Config", func() {
 
 				rc := runCfg.Controllers
 				Expect(rc.Node).To(Equal(&config.NodeControllerConfig{
-					SyncLabels:        true,
-					AutoHostEndpoints: false,
-					DeleteNodes:       true,
-					LeakGracePeriod:   &v1.Duration{Duration: 15 * time.Minute},
+					SyncLabels: true,
+					AutoHostEndpointConfig: &config.AutoHostEndpointConfig{
+						AutoCreate:                false,
+						CreateDefaultHostEndpoint: v3.DefaultHostEndpointsEnabled,
+						Templates:                 nil,
+					},
+					DeleteNodes:     true,
+					LeakGracePeriod: &v1.Duration{Duration: 15 * time.Minute},
 				}))
 				Expect(rc.Policy).To(Equal(&config.GenericControllerConfig{
 					ReconcilerPeriod: time.Minute * 5,
@@ -159,7 +163,7 @@ var _ = Describe("Config", func() {
 				Expect(c.Node).To(Equal(&v3.NodeControllerConfig{
 					ReconcilerPeriod: nil,
 					SyncLabels:       v3.Enabled,
-					HostEndpoint:     &v3.AutoHostEndpointConfig{AutoCreate: v3.Disabled},
+					HostEndpoint:     &v3.AutoHostEndpointConfig{AutoCreate: v3.Disabled, CreateDefaultHostEndpoint: v3.DefaultHostEndpointsEnabled},
 					LeakGracePeriod:  &v1.Duration{Duration: 15 * time.Minute},
 				}))
 				Expect(c.Policy).To(Equal(&v3.PolicyControllerConfig{
@@ -194,7 +198,7 @@ var _ = Describe("Config", func() {
 						Node: &v3.NodeControllerConfig{
 							ReconcilerPeriod: nil,
 							SyncLabels:       v3.Disabled,
-							HostEndpoint:     &v3.AutoHostEndpointConfig{AutoCreate: v3.Enabled},
+							HostEndpoint:     &v3.AutoHostEndpointConfig{AutoCreate: v3.Enabled, CreateDefaultHostEndpoint: v3.DefaultHostEndpointsEnabled},
 							LeakGracePeriod:  &v1.Duration{Duration: 20 * time.Minute},
 						},
 						Policy: &v3.PolicyControllerConfig{
@@ -227,10 +231,13 @@ var _ = Describe("Config", func() {
 
 				rc := runCfg.Controllers
 				Expect(rc.Node).To(Equal(&config.NodeControllerConfig{
-					SyncLabels:        false,
-					AutoHostEndpoints: true,
-					DeleteNodes:       true,
-					LeakGracePeriod:   &v1.Duration{Duration: 20 * time.Minute},
+					SyncLabels: false,
+					AutoHostEndpointConfig: &config.AutoHostEndpointConfig{
+						AutoCreate:                true,
+						CreateDefaultHostEndpoint: v3.DefaultHostEndpointsEnabled,
+					},
+					DeleteNodes:     true,
+					LeakGracePeriod: &v1.Duration{Duration: 20 * time.Minute},
 				}))
 				Expect(rc.Policy).To(Equal(&config.GenericControllerConfig{
 					ReconcilerPeriod: time.Second * 30,
@@ -453,10 +460,10 @@ var _ = Describe("Config", func() {
 
 				rc := runCfg.Controllers
 				Expect(rc.Node).To(Equal(&config.NodeControllerConfig{
-					SyncLabels:        false,
-					AutoHostEndpoints: true,
-					DeleteNodes:       true,
-					LeakGracePeriod:   &v1.Duration{Duration: 15 * time.Minute},
+					SyncLabels:             false,
+					AutoHostEndpointConfig: &config.AutoHostEndpointConfig{AutoCreate: true, CreateDefaultHostEndpoint: v3.DefaultHostEndpointsEnabled},
+					DeleteNodes:            true,
+					LeakGracePeriod:        &v1.Duration{Duration: 15 * time.Minute},
 				}))
 				Expect(rc.Policy).To(Equal(&config.GenericControllerConfig{
 					ReconcilerPeriod: time.Second * 105,
@@ -488,7 +495,7 @@ var _ = Describe("Config", func() {
 				Expect(c.Node).To(Equal(&v3.NodeControllerConfig{
 					ReconcilerPeriod: nil,
 					SyncLabels:       v3.Disabled,
-					HostEndpoint:     &v3.AutoHostEndpointConfig{AutoCreate: v3.Enabled},
+					HostEndpoint:     &v3.AutoHostEndpointConfig{AutoCreate: v3.Enabled, CreateDefaultHostEndpoint: v3.DefaultHostEndpointsEnabled},
 					LeakGracePeriod:  &v1.Duration{Duration: 15 * time.Minute},
 				}))
 				Expect(c.Policy).To(Equal(&v3.PolicyControllerConfig{
@@ -517,7 +524,10 @@ var _ = Describe("Config", func() {
 						Node: &v3.NodeControllerConfig{
 							ReconcilerPeriod: nil,
 							SyncLabels:       v3.Disabled,
-							HostEndpoint:     &v3.AutoHostEndpointConfig{AutoCreate: v3.Enabled},
+							HostEndpoint: &v3.AutoHostEndpointConfig{
+								AutoCreate:                v3.Enabled,
+								CreateDefaultHostEndpoint: v3.DefaultHostEndpointsDisabled,
+							},
 						},
 						Policy: &v3.PolicyControllerConfig{
 							ReconcilerPeriod: &v1.Duration{Duration: time.Second * 30}},
@@ -546,9 +556,12 @@ var _ = Describe("Config", func() {
 
 				rc := runCfg.Controllers
 				Expect(rc.Node).To(Equal(&config.NodeControllerConfig{
-					SyncLabels:        false,
-					AutoHostEndpoints: true,
-					DeleteNodes:       true,
+					SyncLabels: false,
+					AutoHostEndpointConfig: &config.AutoHostEndpointConfig{
+						AutoCreate:                true,
+						CreateDefaultHostEndpoint: v3.DefaultHostEndpointsEnabled,
+					},
+					DeleteNodes: true,
 				}))
 				Expect(rc.Policy).To(Equal(&config.GenericControllerConfig{
 					ReconcilerPeriod: time.Second * 105,
@@ -580,7 +593,7 @@ var _ = Describe("Config", func() {
 				Expect(c.Node).To(Equal(&v3.NodeControllerConfig{
 					ReconcilerPeriod: nil,
 					SyncLabels:       v3.Disabled,
-					HostEndpoint:     &v3.AutoHostEndpointConfig{AutoCreate: v3.Enabled},
+					HostEndpoint:     &v3.AutoHostEndpointConfig{AutoCreate: v3.Enabled, CreateDefaultHostEndpoint: v3.DefaultHostEndpointsEnabled},
 				}))
 				Expect(c.Policy).To(Equal(&v3.PolicyControllerConfig{
 					ReconcilerPeriod: &v1.Duration{Duration: time.Second * 105}}))