AliyunContainerService · VinceCui · Sep 25, 2023 · Sep 22, 2023
diff --git a/build/chart/hybridnet/Chart.yaml b/build/chart/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.6.6
-appVersion: 0.8.6
+version: 0.6.7
+appVersion: 0.8.7
 home: https://github.com/alibaba/hybridnet
 description: A container networking solution aiming at hybrid clouds.
 keywords:
@@ -22,4 +22,4 @@ annotations:
   artifacthub.io/prerelease: "false"
   # List of changes for the release in artifacthub.io
   artifacthub.io/changes: |
-    - "Update image to v0.8.6"
+    - "Update image to v0.8.7"
diff --git a/build/chart/hybridnet/crds/multicluster.alibaba.com_remoteclusters.yaml b/build/chart/hybridnet/crds/multicluster.alibaba.com_remoteclusters.yaml
@@ -83,13 +83,14 @@ spec:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct
                     use as an array at the field path .status.conditions.  For example,
-                    type FooStatus struct{     // Represents the observations of a
-                    foo's current state.     // Known .status.conditions.type are:
-                    \"Available\", \"Progressing\", and \"Degraded\"     // +patchMergeKey=type
-                    \    // +patchStrategy=merge     // +listType=map     // +listMapKey=type
-                    \    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
-                    \n     // other fields }"
+                    \n \ttype FooStatus struct{ \t    // Represents the observations
+                    of a foo's current state. \t    // Known .status.conditions.type
+                    are: \"Available\", \"Progressing\", and \"Degraded\" \t    //
+                    +patchMergeKey=type \t    // +patchStrategy=merge \t    // +listType=map
+                    \t    // +listMapKey=type \t    Conditions []metav1.Condition
+                    `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+                    protobuf:\"bytes,1,rep,name=conditions\"` \n \t    // other fields
+                    \t}"
                   properties:
                     lastTransitionTime:
                       description: lastTransitionTime is the last time the condition

diff --git a/build/chart/hybridnet/crds/multicluster.alibaba.com_remoteendpointslice.yaml b/build/chart/hybridnet/crds/multicluster.alibaba.com_remoteendpointslice.yaml
@@ -67,11 +67,13 @@ spec:
                     a service.
                   properties:
                     addresses:
-                      description: addresses of this endpoint. The contents of this
+                      description: 'addresses of this endpoint. The contents of this
                         field are interpreted according to the corresponding EndpointSlice
                         addressType field. Consumers must handle different types of
                         addresses in the context of their own capabilities. This must
-                        contain at least one address but no more than 100.
+                        contain at least one address but no more than 100. These are
+                        all assumed to be fungible and clients may choose to only
+                        use the first element. Refer to: https://issue.k8s.io/106267'
                       items:
                         type: string
                       type: array
@@ -136,8 +138,7 @@ spec:
                     nodeName:
                       description: nodeName represents the name of the Node hosting
                         this endpoint. This can be used to determine endpoints local
-                        to a Node. This field can be enabled with the EndpointSliceNodeName
-                        feature gate.
+                        to a Node.
                       type: string
                     targetRef:
                       description: targetRef is a reference to a Kubernetes object
@@ -212,7 +213,7 @@ spec:
                       description: The application protocol for this port. This field
                         follows standard Kubernetes label syntax. Un-prefixed names
                         are reserved for IANA standard service names (as per RFC-6335
-                        and http://www.iana.org/assignments/service-names). Non-standard
+                        and https://www.iana.org/assignments/service-names). Non-standard
                         protocols should use prefixed names such as mycompany.com/my-custom-protocol.
                       type: string
                     name:

diff --git a/build/chart/hybridnet/crds/networking.alibaba.com_ipinstances.yaml b/build/chart/hybridnet/crds/networking.alibaba.com_ipinstances.yaml
@@ -125,9 +125,6 @@ spec:
             properties:
               nodeName:
                 type: string
-              phase:
-                description: DEPRECATED. Planned to remove in v0.6
-                type: string
               podName:
                 type: string
               podNamespace:

diff --git a/build/chart/hybridnet/templates/daemonsets.yaml b/build/chart/hybridnet/templates/daemonsets.yaml
@@ -84,6 +84,7 @@ spec:
             - --check-pod-connectivity-from-host={{ .Values.daemon.checkPodConnectivityFromHost }}
             - --enable-vlan-arp-enhancement={{ .Values.daemon.enableVlanARPEnhancement }}
             - --feature-gates=MultiCluster={{ .Values.multiCluster }}
+            - --update-ipinstance-status={{ .Values.daemon.updateIPInstanceStatus }}
           securityContext:
             runAsUser: 0
             privileged: true

diff --git a/build/chart/hybridnet/values.yaml b/build/chart/hybridnet/values.yaml
@@ -1,7 +1,7 @@
 images:
   hybridnet:
     image: ecp_builder/hybridnet
-    tag: v0.8.6
+    tag: v0.8.7
     imagePullPolicy: IfNotPresent
 global:
   RegistryURL: "sea.hub:5000"
@@ -107,7 +107,7 @@ daemon:
 
   ## If it is empty, daemon on each node will take one of the valid address of the vxlan interface's parent
   ## (try ipv4 addresses first and then ipv6 addresses if no valid ipv4 address exists) as node's VTEP address
-  ## randomly. If is is not empty, the first result matches any of the CIDRs will be chose as VTEP address.
+  ## randomly. If it is not empty, the first result matches any of the CIDRs will be chosen as VTEP address.
   vtepAddressCIDRs: "0.0.0.0/0,::/0"
 
   # -- The community CNI plugins needed to be copied by hybridnet from inside container to the /opt/cni/bin/ directory of host
@@ -119,6 +119,9 @@ daemon:
   # -- Whether will daemon check the connectivity of local pod before staring it
   checkPodConnectivityFromHost: true
 
+  # -- Whether will daemon update the status of IPInstance while create pod sandbox
+  updateIPInstanceStatus: false
+
   # -- Specifies the resources for the cni-daemon containers
   resources: {}
     # limits:

diff --git a/build/image-anno-v1.20.11-aliyun.1 b/build/image-anno-v1.20.11-aliyun.1
@@ -11,7 +11,7 @@
     ack-d-ctr-10-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/kube-proxy:v1.20.11-aliyun.1
     ack-d-ctr-11-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/l-zero:v1.1.0-951ab2a
     ack-d-ctr-12-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/opsbase-alpine:v0.2
-    ack-d-ctr-13-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/hybridnet:v0.8.6
+    ack-d-ctr-13-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/hybridnet:v0.8.7
     ack-d-ctr-14-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/hybridnet:v0.5.1
     ack-d-ctr-15-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/paralb:v0.2.1
     ack-d-ctr-16-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/open-local:v0.7.0

diff --git a/build/image-anno-v1.22.15-aliyun.1 b/build/image-anno-v1.22.15-aliyun.1
@@ -10,7 +10,7 @@
     ack-d-ctr-9-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/kube-proxy:v1.22.15-aliyun.1
     ack-d-ctr-10-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/l-zero:v1.1.0-951ab2a
     ack-d-ctr-11-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/opsbase-alpine:v0.2
-    ack-d-ctr-12-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/hybridnet:v0.8.6
+    ack-d-ctr-12-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/hybridnet:v0.8.7
     ack-d-ctr-13-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/paralb:v0.2.1
     ack-d-ctr-14-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/open-local:v0.7.0
     ack-d-ctr-15-image: ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/csi-node-driver-registrar:v2.3.0

diff --git a/build/scripts/upgrade-trident-addons.sh b/build/scripts/upgrade-trident-addons.sh
@@ -10,7 +10,7 @@ source "${scripts_path}"/default_values.sh
 helm_install_hybridnet() {
   for i in `seq 1 3`;do
     sleep 1
-    helm -n kube-system upgrade -i --reuse-values $1 chart/$1 -f /tmp/ackd-helmconfig.yaml --set init=null --set daemon.enableFelixPolicy=true --set typha.serverPort=5473 --set images.hybridnet.image=ecp_builder/hybridnet --set images.hybridnet.tag=v0.8.6 && return 0
+    helm -n kube-system upgrade -i --reuse-values $1 chart/$1 -f /tmp/ackd-helmconfig.yaml --set init=null --set daemon.enableFelixPolicy=true --set typha.serverPort=5473 --set images.hybridnet.image=ecp_builder/hybridnet --set images.hybridnet.tag=v0.8.7 && return 0
   done
   return 1
 }
@@ -35,7 +35,7 @@ else
       kubectl apply -f chart/hybridnet/crds/
       for i in `seq 1 3`;do
         sleep 1
-        helm -n kube-system upgrade -i --reuse-values hybridnet chart/hybridnet -f /tmp/ackd-helmconfig.yaml --set init=null --set daemon.enableFelixPolicy=true --set typha.serverPort=5473 --set images.hybridnet.image=ecp_builder/hybridnet --set images.hybridnet.tag=v0.8.6 --set defaultIPRetain=false && break
+        helm -n kube-system upgrade -i --reuse-values hybridnet chart/hybridnet -f /tmp/ackd-helmconfig.yaml --set init=null --set daemon.enableFelixPolicy=true --set typha.serverPort=5473 --set images.hybridnet.image=ecp_builder/hybridnet --set images.hybridnet.tag=v0.8.7 --set defaultIPRetain=false && break
       done
       if [ $? -ne 0 ]; then
         panic "failed to install hybridnet"

diff --git a/build/v1.20.11-aliyun.1/imageList-standard b/build/v1.20.11-aliyun.1/imageList-standard
@@ -8,7 +8,7 @@ ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/metrics-server:v0.3
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/kube-proxy:v1.20.11-aliyun.1
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/l-zero:v1.1.0-951ab2a
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/opsbase-alpine:v0.2
-ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/hybridnet:v0.8.6
+ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/hybridnet:v0.8.7
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/hybridnet:v0.5.1
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/paralb:v0.2.1
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/open-local:v0.7.1-0a4e1dd

diff --git a/build/v1.22.15-aliyun.1/imageList-standard b/build/v1.22.15-aliyun.1/imageList-standard
@@ -7,7 +7,7 @@ ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/metrics-server:v0.3
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/kube-proxy:v1.22.15-aliyun.1
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/l-zero:v1.1.0-951ab2a
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/opsbase-alpine:v0.2
-ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/hybridnet:v0.8.6
+ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/hybridnet:v0.8.7
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/paralb:v0.2.1
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/open-local:v0.7.1-0a4e1dd
 ack-agility-registry.cn-shanghai.cr.aliyuncs.com/ecp_builder/csi-node-driver-registrar:v2.3.0