diff --git a/api/v1/calico_node_windows_types.go b/api/v1/calico_node_windows_types.go index 8f5a495e12..4a3c019cf4 100644 --- a/api/v1/calico_node_windows_types.go +++ b/api/v1/calico_node_windows_types.go @@ -23,13 +23,14 @@ import ( // CalicoNodeWindowsDaemonSetContainer is a calico-node-windows DaemonSet container. type CalicoNodeWindowsDaemonSetContainer struct { // Name is an enum which identifies the calico-node-windows DaemonSet container by name. - // Supported values are: calico-node-windows - // +kubebuilder:validation:Enum=calico-node-windows + // Supported values are: node, felix, confd + // calico-node-windows is allowed because it was previously allowed. + // +kubebuilder:validation:Enum=calico-node-windows;node;felix;confd Name string `json:"name"` // Resources allows customization of limits and requests for compute resources such as cpu and memory. - // If specified, this overrides the named calico-node-windows DaemonSet container's resources. - // If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. + // If specified, this overrides the named DaemonSet container's resources. + // If omitted, the DaemonSet will use its default value for this container's resources. // If used in conjunction with the deprecated ComponentResources, then this value takes precedence. // +optional Resources *v1.ResourceRequirements `json:"resources,omitempty"` diff --git a/api/v1/installation_types.go b/api/v1/installation_types.go index 252337f2ce..8763895372 100644 --- a/api/v1/installation_types.go +++ b/api/v1/installation_types.go @@ -397,7 +397,7 @@ const ( // The ComponentResource struct associates a ResourceRequirements with a component by name type ComponentResource struct { // ComponentName is an enum which identifies the component - // +kubebuilder:validation:Enum=Node;Typha;KubeControllers + // +kubebuilder:validation:Enum=Node;Typha;KubeControllers;NodeWindows;FelixWindows;ConfdWindows ComponentName ComponentName `json:"componentName"` // ResourceRequirements allows customization of limits and requests for compute resources such as cpu and memory. diff --git a/pkg/crds/operator/operator.tigera.io_installations.yaml b/pkg/crds/operator/operator.tigera.io_installations.yaml index 83f9ccdf4d..1c58d5eb80 100644 --- a/pkg/crds/operator/operator.tigera.io_installations.yaml +++ b/pkg/crds/operator/operator.tigera.io_installations.yaml @@ -3932,15 +3932,19 @@ spec: name: description: |- Name is an enum which identifies the calico-node-windows DaemonSet container by name. - Supported values are: calico-node-windows + Supported values are: node, felix, confd + calico-node-windows is allowed because it was previously allowed. enum: - calico-node-windows + - node + - felix + - confd type: string resources: description: |- Resources allows customization of limits and requests for compute resources such as cpu and memory. - If specified, this overrides the named calico-node-windows DaemonSet container's resources. - If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. + If specified, this overrides the named DaemonSet container's resources. + If omitted, the DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. properties: claims: @@ -5472,6 +5476,9 @@ spec: - Node - Typha - KubeControllers + - NodeWindows + - FelixWindows + - ConfdWindows type: string resourceRequirements: description: @@ -12787,15 +12794,19 @@ spec: name: description: |- Name is an enum which identifies the calico-node-windows DaemonSet container by name. - Supported values are: calico-node-windows + Supported values are: node, felix, confd + calico-node-windows is allowed because it was previously allowed. enum: - calico-node-windows + - node + - felix + - confd type: string resources: description: |- Resources allows customization of limits and requests for compute resources such as cpu and memory. - If specified, this overrides the named calico-node-windows DaemonSet container's resources. - If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. + If specified, this overrides the named DaemonSet container's resources. + If omitted, the DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. properties: claims: @@ -14352,6 +14363,9 @@ spec: - Node - Typha - KubeControllers + - NodeWindows + - FelixWindows + - ConfdWindows type: string resourceRequirements: description: