Skip to content

Fix Windows resource configuration names #4366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tmjd wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −11
Open

Fix Windows resource configuration names #4366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions api/v1/calico_node_windows_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
2 changes: 1 addition & 1 deletion api/v1/installation_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
26 changes: 20 additions & 6 deletions pkg/crds/operator/operator.tigera.io_installations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -5472,6 +5476,9 @@ spec:
- Node
- Typha
- KubeControllers
- NodeWindows
- FelixWindows
- ConfdWindows
type: string
resourceRequirements:
description:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -14352,6 +14363,9 @@ spec:
- Node
- Typha
- KubeControllers
- NodeWindows
- FelixWindows
- ConfdWindows
type: string
resourceRequirements:
description:
Expand Down
Loading