update hybridnet chart to 0.5.2 and image to v0.7.2

alibaba · Aug 23, 2022 · e9d7f00 · e9d7f00
1 parent 7c05908
commit e9d7f00
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 10 deletions.
diff --git a/charts/hybridnet/Chart.yaml b/charts/hybridnet/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: hybridnet
 # When the version is modified, make sure the artifacthub.io/changes list is updated
 # Also update CHANGELOG.md
-version: 0.5.1
-appVersion: 0.7.1
+version: 0.5.2
+appVersion: 0.7.2
 home: https://github.com/alibaba/hybridnet
 description: A container networking solution aiming at hybrid clouds.
 keywords:
@@ -22,4 +22,5 @@ annotations:
   artifacthub.io/prerelease: "false"
   # List of changes for the release in artifacthub.io
   artifacthub.io/changes: |
-    - "Update image from v0.7.0 to v0.7.1"
+    - "Update image from v0.7.1 to v0.7.2"
+    - "Introduce resource requests and limits configuration entries"
diff --git a/charts/hybridnet/templates/daemonsets.yaml b/charts/hybridnet/templates/daemonsets.yaml
@@ -64,6 +64,10 @@ spec:
           securityContext:
             runAsUser: 0
             privileged: true
+          {{- if .Values.daemon.resources }}
+          resources:
+            {{- toYaml .Values.daemon.resources | trim | nindent 12 }}
+          {{- end }}
           env:
             - name: DEFAULT_IP_FAMILY
               value: {{ .Values.defaultIPFamily }}
@@ -105,9 +109,12 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
+          {{- if .Values.daemon.policy }}
+          {{- if .Values.daemon.policy.resources }}
           resources:
-            requests:
-              cpu: 250m
+            {{- toYaml .Values.daemon.policy.resources | trim | nindent 12 }}
+          {{- end }}
+          {{- end }}
           securityContext:
             privileged: true
             runAsUser: 0

diff --git a/charts/hybridnet/templates/deployments.yaml b/charts/hybridnet/templates/deployments.yaml
@@ -8,8 +8,6 @@ spec:
   selector:
     matchLabels:
       app: hybridnet-manager
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
@@ -32,6 +30,10 @@ spec:
         - name: hybridnet-manager
           image: "{{ .Values.images.registryURL }}/{{ .Values.images.hybridnet.image }}:{{ .Values.images.hybridnet.tag }}"
           imagePullPolicy: {{ .Values.images.hybridnet.imagePullPolicy }}
+          {{- if .Values.manager.resources }}
+          resources:
+            {{- toYaml .Values.manager.resources | trim | nindent 12 }}
+          {{- end }}
           command:
             - /hybridnet/hybridnet-manager
             - --default-ip-retain={{ .Values.defaultIPRetain }}
@@ -59,8 +61,6 @@ spec:
   selector:
     matchLabels:
       app: hybridnet-webhook
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
@@ -79,6 +79,10 @@ spec:
         - name: hybridnet-webhook
           image: "{{ .Values.images.registryURL }}/{{ .Values.images.hybridnet.image }}:{{ .Values.images.hybridnet.tag }}"
           imagePullPolicy: {{ .Values.images.hybridnet.imagePullPolicy }}
+          {{- if .Values.webhook.resources }}
+          resources:
+            {{- toYaml .Values.webhook.resources | trim | nindent 12 }}
+          {{- end }}
           command:
             - /hybridnet/hybridnet-webhook
             - --default-ip-retain={{ .Values.defaultIPRetain }}

diff --git a/charts/hybridnet/values.yaml b/charts/hybridnet/values.yaml
@@ -1,7 +1,7 @@
 images:
   hybridnet:
     image: hybridnetdev/hybridnet
-    tag: v0.7.1
+    tag: v0.7.2
     imagePullPolicy: IfNotPresent
   registryURL: "docker.io"
 
@@ -26,6 +26,16 @@ manager:
   # -- The number of manager pods
   replicas: 3
 
+  # -- Specifies the resources for the manager pods
+  resources: {}
+    # limits:
+    #   cpu: 4000m
+    #   memory: 4Gi
+    # requests:
+    #   cpu: 100m
+    #   memory: 512Mi
+
+
 webhook:
   # -- Only the pods match the additionalPodMatchExpressions will be validate by hybridnet webhook.
   additionalPodMatchExpressions:
@@ -36,6 +46,15 @@ webhook:
   # -- The number of webhook pods
   replicas: 3
 
+  # -- Specifies the resources for the webhook pods
+  resources: {}
+    # limits:
+    #   cpu: 4000m
+    #   memory: 4Gi
+    # requests:
+    #   cpu: 100m
+    #   memory: 512Mi
+
 daemon:
   # -- Whether enable the NetworkPolicy functions of hybridnet.
   enableNetworkPolicy: true
@@ -67,6 +86,26 @@ daemon:
   # -- The name of hybridnet CNI conf file generated in the /etc/cni/net.d/ directory of host
   cniConfName: "06-hybridnet.conflist"
 
+  # -- Specifies the resources for the cni-daemon containers
+  resources: {}
+    # limits:
+    #   cpu: 200m
+    #   memory: 256Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
+  policy:
+    # -- Specifies the resources for the policy containers
+    resources: {}
+      # limits:
+      #   cpu: 200m
+      #   memory: 256Mi
+      # requests:
+      #   cpu: 100m
+      #   memory: 128Mi
+
+
 # -- Whether pod IP of stateful workloads will be retained by default. true or false
 ## Ref: https://github.com/alibaba/hybridnet/wiki/Static-pod-ip-addresses-for-StatefulSet
 defaultIPRetain: true