[cilium] Add support for choosing resources

Cilium as a CNI is a critical component for cluster so it would be safe to have some guaranteed resources as well as allowing the users to define them based on their needs. In this commit, we init default requested resources and add the capability of user defined values. Signed-off-by: dntosas <ntosas@gmail.com>
kubernetes · Apr 17, 2021 · a13ae2a · a13ae2a
1 parent 9786905
commit a13ae2a
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 2 deletions.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -3398,6 +3398,22 @@ spec:
                           fetches information from the container runtime and this
                           field is ignored. Default: none'
                         type: string
+                      cpuLimit:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: 'CPULimit CPU limit of Cilium agent + operator
+                          container. (default: -)'
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                      cpuRequest:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: 'CPURequest CPU request of Cilium agent + operator
+                          container. (default: 25m)'
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
                       debug:
                         description: Debug runs Cilium in debug mode.
                         type: boolean
@@ -3588,6 +3604,22 @@ spec:
                           be removed in the future. Setting this has no effect.
                         format: int32
                         type: integer
+                      memoryLimit:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: 'MemoryLimit memory limit of Cilium agent + operator
+                          container. (default: -)'
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                      memoryRequest:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: 'MemoryRequest memory request of Cilium agent
+                          + operator container. (default: 128Mi)'
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
                       monitorAggregation:
                         description: 'MonitorAggregation sets the level of packet
                           monitoring. Possible values are "low", "medium", or "maximum".

diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go
@@ -261,6 +261,15 @@ type CiliumNetworkingSpec struct {
 	// Version is the version of the Cilium agent and the Cilium Operator.
 	Version string `json:"version,omitempty"`
 
+	// MemoryRequest memory request of Cilium agent + operator container. (default: 128Mi)
+	MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
+	// CPURequest CPU request of Cilium agent + operator container. (default: 25m)
+	CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
+	// MemoryLimit memory limit of Cilium agent + operator container. (default: -)
+	MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
+	// CPULimit CPU limit of Cilium agent + operator container. (default: -)
+	CPULimit *resource.Quantity `json:"cpuLimit,omitempty"`
+
 	// AccessLog is not implemented and may be removed in the future.
 	// Setting this has no effect.
 	AccessLog string `json:"accessLog,omitempty"`

diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go
@@ -259,6 +259,15 @@ type CiliumNetworkingSpec struct {
 	// Version is the version of the Cilium agent and the Cilium Operator.
 	Version string `json:"version,omitempty"`
 
+	// MemoryRequest memory request of Cilium agent + operator container. (default: 128Mi)
+	MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
+	// CPURequest CPU request of Cilium agent + operator container. (default: 25m)
+	CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
+	// MemoryLimit memory limit of Cilium agent + operator container. (default: -)
+	MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
+	// CPULimit CPU limit of Cilium agent + operator container. (default: -)
+	CPULimit *resource.Quantity `json:"cpuLimit,omitempty"`
+
 	// AccessLog is not implemented and may be removed in the future.
 	// Setting this has no effect.
 	AccessLog string `json:"accessLog,omitempty"`

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template
@@ -522,7 +522,17 @@ spec:
           protocol: TCP
         {{- end }}
         {{ end }}
-
+        resources:
+          requests:
+            cpu: {{ or .Networking.Cilium.CPURequest "25m" }}
+            memory: {{ or .Networking.Cilium.MemoryRequest "128Mi" }}
+          limits:
+            {{- if .Networking.Cilium.CPULimit }}
+            cpu: {{ .Networking.Cilium.CPULimit }}
+            {{- end }}
+            {{- if .Networking.Cilium.MemoryLimit }}
+            memory: {{ .Networking.Cilium.MemoryLimit }}
+            {{- end }}
         readinessProbe:
           httpGet:
             host: '127.0.0.1'
@@ -772,6 +782,17 @@ spec:
           name: prometheus
           protocol: TCP
         {{ end }}
+        resources:
+          requests:
+            cpu: {{ or .Networking.Cilium.CPURequest "25m" }}
+            memory: {{ or .Networking.Cilium.MemoryRequest "128Mi" }}
+          limits:
+            {{- if .Networking.Cilium.CPULimit }}
+            cpu: {{ .Networking.Cilium.CPULimit }}
+            {{- end }}
+            {{- if .Networking.Cilium.MemoryLimit }}
+            memory: {{ .Networking.Cilium.MemoryLimit }}
+            {{- end }}
         livenessProbe:
           httpGet:
             host: "127.0.0.1"
@@ -915,4 +936,4 @@ spec:
           path: /var/run/cilium
           type: Directory
         name: hubble-sock-dir
-{{ end }}
+{{ end }}