From 04694de1aef84aaa49e8c19d38b0f7ef1afb3868 Mon Sep 17 00:00:00 2001 From: rene-dekker Date: Tue, 10 Dec 2024 12:12:01 -0800 Subject: [PATCH] Update the CRDs --- .../crd.projectcalico.org_blockaffinities.yaml | 2 ++ pkg/crds/calico/crd.projectcalico.org_ippools.yaml | 7 +++++++ ...ctcalico.org_kubecontrollersconfigurations.yaml | 14 ++++++++++++++ .../crd.projectcalico.org_blockaffinities.yaml | 2 ++ .../enterprise/crd.projectcalico.org_ippools.yaml | 7 +++++++ ...ctcalico.org_kubecontrollersconfigurations.yaml | 14 ++++++++++++++ 6 files changed, 46 insertions(+) diff --git a/pkg/crds/calico/crd.projectcalico.org_blockaffinities.yaml b/pkg/crds/calico/crd.projectcalico.org_blockaffinities.yaml index c7fccdff11..c41be43f72 100644 --- a/pkg/crds/calico/crd.projectcalico.org_blockaffinities.yaml +++ b/pkg/crds/calico/crd.projectcalico.org_blockaffinities.yaml @@ -43,6 +43,8 @@ spec: type: string state: type: string + type: + type: string required: - cidr - deleted diff --git a/pkg/crds/calico/crd.projectcalico.org_ippools.yaml b/pkg/crds/calico/crd.projectcalico.org_ippools.yaml index 83311f963a..df10e8c619 100644 --- a/pkg/crds/calico/crd.projectcalico.org_ippools.yaml +++ b/pkg/crds/calico/crd.projectcalico.org_ippools.yaml @@ -37,6 +37,13 @@ spec: items: type: string type: array + assignmentMode: + description: Determines the mode how IP addresses should be assigned + from this pool + enum: + - Automatic + - Manual + type: string blockSize: description: The block size to use for IP address assignments from this pool. Defaults to 26 for IPv4 and 122 for IPv6. diff --git a/pkg/crds/calico/crd.projectcalico.org_kubecontrollersconfigurations.yaml b/pkg/crds/calico/crd.projectcalico.org_kubecontrollersconfigurations.yaml index 504de3e39f..9a3c225243 100644 --- a/pkg/crds/calico/crd.projectcalico.org_kubecontrollersconfigurations.yaml +++ b/pkg/crds/calico/crd.projectcalico.org_kubecontrollersconfigurations.yaml @@ -36,6 +36,13 @@ spec: description: Controllers enables and configures individual Kubernetes controllers properties: + loadBalancer: + description: LoadBalancer enables and configures the LoadBalancer + controller. Enabled by default, set to nil to disable. + properties: + assignIPs: + type: string + type: object namespace: description: Namespace enables and configures the namespace controller. Enabled by default, set to nil to disable. @@ -145,6 +152,13 @@ spec: description: Controllers enables and configures individual Kubernetes controllers properties: + loadBalancer: + description: LoadBalancer enables and configures the LoadBalancer + controller. Enabled by default, set to nil to disable. + properties: + assignIPs: + type: string + type: object namespace: description: Namespace enables and configures the namespace controller. Enabled by default, set to nil to disable. diff --git a/pkg/crds/enterprise/crd.projectcalico.org_blockaffinities.yaml b/pkg/crds/enterprise/crd.projectcalico.org_blockaffinities.yaml index c7fccdff11..c41be43f72 100644 --- a/pkg/crds/enterprise/crd.projectcalico.org_blockaffinities.yaml +++ b/pkg/crds/enterprise/crd.projectcalico.org_blockaffinities.yaml @@ -43,6 +43,8 @@ spec: type: string state: type: string + type: + type: string required: - cidr - deleted diff --git a/pkg/crds/enterprise/crd.projectcalico.org_ippools.yaml b/pkg/crds/enterprise/crd.projectcalico.org_ippools.yaml index 8b9f967cfe..a3b76fa77c 100644 --- a/pkg/crds/enterprise/crd.projectcalico.org_ippools.yaml +++ b/pkg/crds/enterprise/crd.projectcalico.org_ippools.yaml @@ -37,6 +37,13 @@ spec: items: type: string type: array + assignmentMode: + description: Determines the mode how IP addresses should be assigned + from this pool + enum: + - Automatic + - Manual + type: string awsSubnetID: description: 'AWSSubnetID if specified Calico will attempt to ensure that IPs chosen from this IP pool are routed to the corresponding diff --git a/pkg/crds/enterprise/crd.projectcalico.org_kubecontrollersconfigurations.yaml b/pkg/crds/enterprise/crd.projectcalico.org_kubecontrollersconfigurations.yaml index 153b5d8653..ce88b53043 100644 --- a/pkg/crds/enterprise/crd.projectcalico.org_kubecontrollersconfigurations.yaml +++ b/pkg/crds/enterprise/crd.projectcalico.org_kubecontrollersconfigurations.yaml @@ -45,6 +45,13 @@ spec: [Default: 5m]' type: string type: object + loadBalancer: + description: LoadBalancer enables and configures the LoadBalancer + controller. Enabled by default, set to nil to disable. + properties: + assignIPs: + type: string + type: object namespace: description: Namespace enables and configures the namespace controller. Enabled by default, set to nil to disable. @@ -163,6 +170,13 @@ spec: reconciliation. [Default: 5m]' type: string type: object + loadBalancer: + description: LoadBalancer enables and configures the LoadBalancer + controller. Enabled by default, set to nil to disable. + properties: + assignIPs: + type: string + type: object namespace: description: Namespace enables and configures the namespace controller. Enabled by default, set to nil to disable.