Merge pull request #3772 from DaoCloud/upgrade/spiderpool/1.1.0

Robot Upgrade: spiderpool chart upgrade from 1.0.5 to 1.1.0

Author: cyclinder

charts/spiderpool/config

@@ -4,7 +4,7 @@ export USE_OPENSOURCE_CHART=false
 export REPO_URL=https://spidernet-io.github.io/spiderpool
 export REPO_NAME=spiderpool
 export CHART_NAME=spiderpool
-export VERSION=1.0.5
+export VERSION=1.1.0
 
 # pr, issue, none
 export UPGRADE_METHOD=pr

charts/spiderpool/spiderpool/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.0.5
+appVersion: 1.1.0
 description: underlay CNI solution for kubernetes
 home: https://spidernet-io.github.io/spiderpool
 icon: https://raw.githubusercontent.com/spidernet-io/spiderpool/main/docs/images/spider.svg
@@ -16,8 +16,8 @@ name: spiderpool
 sources:
   - https://github.com/spidernet-io/spiderpool
 type: application
-version: 1.0.5
+version: 1.1.0
 dependencies:
   - name: spiderpool
-    version: "1.0.5"
+    version: "1.1.0"
     repository: "https://spidernet-io.github.io/spiderpool"

charts/spiderpool/spiderpool/charts/spiderpool/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.0.5
+appVersion: 1.1.0
 description: underlay CNI solution for kubernetes
 home: https://spidernet-io.github.io/spiderpool
 icon: https://raw.githubusercontent.com/spidernet-io/spiderpool/main/docs/images/spider.svg
@@ -16,4 +16,4 @@ name: spiderpool
 sources:
 - https://github.com/spidernet-io/spiderpool
 type: application
-version: 1.0.5
+version: 1.1.0

charts/spiderpool/spiderpool/charts/spiderpool/crds/spiderpool.spidernet.io_spidermultusconfigs.yaml

@@ -159,6 +159,14 @@ spec:
                         items:
                           type: string
                         type: array
+                      matchMasterSubnet:
+                        default: false
+                        description: enable IPAM to check if the IPPools of the pod
+                          if matched the master subnet
+                        enum:
+                        - true
+                        - false
+                        type: boolean
                     type: object
                   linkState:
                     default: enable
@@ -202,6 +210,14 @@ spec:
                         items:
                           type: string
                         type: array
+                      matchMasterSubnet:
+                        default: false
+                        description: enable IPAM to check if the IPPools of the pod
+                          if matched the master subnet
+                        enum:
+                        - true
+                        - false
+                        type: boolean
                     type: object
                   master:
                     description: name of the host interface to create the link from.
@@ -238,6 +254,14 @@ spec:
                         items:
                           type: string
                         type: array
+                      matchMasterSubnet:
+                        default: false
+                        description: enable IPAM to check if the IPPools of the pod
+                          if matched the master subnet
+                        enum:
+                        - true
+                        - false
+                        type: boolean
                     type: object
                   master:
                     description: The master interface(s) for the CNI configuration.
@@ -295,6 +319,14 @@ spec:
                         items:
                           type: string
                         type: array
+                      matchMasterSubnet:
+                        default: false
+                        description: enable IPAM to check if the IPPools of the pod
+                          if matched the master subnet
+                        enum:
+                        - true
+                        - false
+                        type: boolean
                     type: object
                   master:
                     description: The master interface(s) for the CNI configuration.
@@ -340,6 +372,14 @@ spec:
                         items:
                           type: string
                         type: array
+                      matchMasterSubnet:
+                        default: false
+                        description: enable IPAM to check if the IPPools of the pod
+                          if matched the master subnet
+                        enum:
+                        - true
+                        - false
+                        type: boolean
                     type: object
                   trunk:
                     items:
@@ -378,6 +418,14 @@ spec:
                         items:
                           type: string
                         type: array
+                      matchMasterSubnet:
+                        default: false
+                        description: enable IPAM to check if the IPPools of the pod
+                          if matched the master subnet
+                        enum:
+                        - true
+                        - false
+                        type: boolean
                     type: object
                   maxTxRateMbps:
                     description: Mbps, 0 = disable rate limiting

charts/spiderpool/spiderpool/charts/spiderpool/templates/configmap.yaml

@@ -172,13 +172,14 @@ data:
         cat /host/etc/cni/net.d/${DEFAULT_CNI_FILEPATH}
 
         echo ""
-        DEFAULT_CNI_NAME=$(grep '"name":' ${CNI_CONF_DIR}/${DEFAULT_CNI_FILEPATH} | awk '{print $2}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'  | tr -d ',' | tr -d '"')
+
+        DEFAULT_CNI_NAME=$(jq -r '.name' ${CNI_CONF_DIR}/${DEFAULT_CNI_FILEPATH})
         if [ -z "$DEFAULT_CNI_NAME" ] ; then
           error "The name fleid shouldn't be empty, please check the default cni: ${DEFAULT_CNI_FILEPATH}" && exit 1
         fi
 
         log "Updating the clusterNetwork of the multus-cni config to $DEFAULT_CNI_NAME"
-        sed -i "s?\"clusterNetwork\": \"\"?\"clusterNetwork\": \"${DEFAULT_CNI_NAME}\"?g" /tmp/00-multus.conf
+        jq ".clusterNetwork=\"${DEFAULT_CNI_NAME}\"" /tmp/00-multus.conf > /tmp/00-multus.conf.tmp && mv /tmp/00-multus.conf.tmp /tmp/00-multus.conf
     else
       log "User set multus ClusterNetwork: $MULTUS_CLUSTER_NETWORK"
     fi

charts/spiderpool/spiderpool/charts/spiderpool/templates/daemonset.yaml

@@ -111,16 +111,16 @@ spec:
           image: {{ include "spiderpool.multus.image" . | quote }}
           imagePullPolicy: IfNotPresent
           command:
-          - /install_multus
+            - /install_multus
           args:
-          - --type
-          - thin
+            - --type
+            - thin
           securityContext:
             privileged: true
           volumeMounts:
-          - mountPath: /host/opt/cni/bin
-            mountPropagation: Bidirectional
-            name: cni-bin-path
+            - mountPath: /host/opt/cni/bin
+              mountPropagation: Bidirectional
+              name: cni-bin-path
         {{- end }}
       containers:
         - name: {{ .Values.spiderpoolAgent.name | trunc 63 | trimSuffix "-" }}
@@ -233,11 +233,9 @@ spec:
         {{- end }}
         {{- end }}
           volumeMounts:
-        {{- if .Values.spiderpoolAgent.prometheus.enabledRdmaMetric }}
             - name: host-ns
-              mountPath: /var/run/netns
+              mountPath: /var/run
               mountPropagation: Bidirectional
-        {{- end }}
             - name: config-path
               mountPath: /tmp/spiderpool/config-map
               readOnly: true
@@ -257,20 +255,20 @@ spec:
           image: {{ include "spiderpool.spiderpoolAgent.image" . | quote }}
           imagePullPolicy: {{ .Values.spiderpoolAgent.image.pullPolicy }}
           command:
-          - "/home/entrypoint.sh"
+            - "/home/entrypoint.sh"
           securityContext:
             privileged: true
           env:
-          - name: MULTUS_CLUSTER_NETWORK
-            valueFrom:
-              configMapKeyRef:
-                key: clusterNetwork
-                name: spiderpool-conf
-          - name: MULTUS_NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
+            - name: MULTUS_CLUSTER_NETWORK
+              valueFrom:
+                configMapKeyRef:
+                  key: clusterNetwork
+                  name: spiderpool-conf
+            - name: MULTUS_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.namespace
           resources:
             limits:
               cpu: 100m
@@ -315,12 +313,10 @@ spec:
             path: {{ dir .Values.global.ipamUNIXSocketHostPath }}
             type: DirectoryOrCreate
           # multus
-      {{- if .Values.spiderpoolAgent.prometheus.enabledRdmaMetric }}
         - name: host-ns
           hostPath:
-            path: /var/run/netns
-      {{- end }}
-      {{- if .Values.multus.multusCNI.install }}
+            path: /var/run
+        {{- if .Values.multus.multusCNI.install }}
         - name: cni
           hostPath:
             path: /etc/cni/net.d
@@ -337,7 +333,7 @@ spec:
             items:
               - key: entrypoint.sh
                 path: entrypoint.sh
-      {{- end }}
+        {{- end }}
       {{- if .Values.spiderpoolAgent.extraVolumeMounts }}
       {{- include "tplvalues.render" ( dict "value" .Values.spiderpoolAgent.extraVolumeMounts "context" $ ) | nindent 6 }}
       {{- end }}

charts/spiderpool/spiderpool/charts/spiderpool/templates/tls.yaml

@@ -181,7 +181,6 @@ webhooks:
     - v1
     operations:
     - CREATE
-    - UPDATE
     resources:
     - pods
   sideEffects: None

charts/spiderpool/spiderpool/charts/spiderpool/values.yaml

@@ -380,7 +380,7 @@ spiderpoolAgent:
     digest: ""
 
     ## @param spiderpoolAgent.image.tag the image tag of spiderpoolAgent, overrides the image tag whose default is the chart appVersion.
-    tag: v1.0.5
+    tag: v1.1.0
 
     ## @param spiderpoolAgent.image.imagePullSecrets the image imagePullSecrets of spiderpoolAgent
     imagePullSecrets: []
@@ -570,7 +570,7 @@ spiderpoolController:
     digest: ""
 
     ## @param spiderpoolController.image.tag the image tag of spiderpoolController, overrides the image tag whose default is the chart appVersion.
-    tag: v1.0.5
+    tag: v1.1.0
 
     ## @param spiderpoolController.image.imagePullSecrets the image imagePullSecrets of spiderpoolController
     imagePullSecrets: []
@@ -819,7 +819,7 @@ spiderpoolInit:
     digest: ""
 
     ## @param spiderpoolInit.image.tag the image tag of spiderpoolInit, overrides the image tag whose default is the chart appVersion.
-    tag: v1.0.5
+    tag: v1.1.0
 
     ## @param spiderpoolInit.image.imagePullSecrets the image imagePullSecrets of spiderpoolInit
     imagePullSecrets: []

charts/spiderpool/spiderpool/values.yaml

@@ -287,7 +287,7 @@ spiderpool:
       ## @param spiderpoolAgent.image.digest the image digest of spiderpoolAgent, which takes preference over tag
       digest: ""
       ## @param spiderpoolAgent.image.tag the image tag of spiderpoolAgent, overrides the image tag whose default is the chart appVersion.
-      tag: v1.0.5
+      tag: v1.1.0
       ## @param spiderpoolAgent.image.imagePullSecrets the image imagePullSecrets of spiderpoolAgent
       imagePullSecrets: []
       # - name: "image-pull-secret"
@@ -430,7 +430,7 @@ spiderpool:
       ## @param spiderpoolController.image.digest the image digest of spiderpoolController, which takes preference over tag
       digest: ""
       ## @param spiderpoolController.image.tag the image tag of spiderpoolController, overrides the image tag whose default is the chart appVersion.
-      tag: v1.0.5
+      tag: v1.1.0
       ## @param spiderpoolController.image.imagePullSecrets the image imagePullSecrets of spiderpoolController
       imagePullSecrets: []
       # - name: "image-pull-secret"
@@ -646,7 +646,7 @@ spiderpool:
       ## @param spiderpoolInit.image.digest the image digest of spiderpoolInit, which takes preference over tag
       digest: ""
       ## @param spiderpoolInit.image.tag the image tag of spiderpoolInit, overrides the image tag whose default is the chart appVersion.
-      tag: v1.0.5
+      tag: v1.1.0
       ## @param spiderpoolInit.image.imagePullSecrets the image imagePullSecrets of spiderpoolInit
       imagePullSecrets: []
       # - name: "image-pull-secret"