Release cce-network-v1/1.4.7

Makefile

@@ -23,7 +23,7 @@ COVFUNC := $(HOMEDIR)/covfunc.txt  # coverage profile information for each funct
 COVHTML := $(HOMEDIR)/covhtml.html # HTML representation of coverage profile
 
 # versions
-VERSION := v1.4.6
+VERSION := v1.4.7
 FELIX_VERSION := v3.5.8
 K8S_VERSION := 1.18.9
 

cni/unnumbered-ptp/unnumbered-ptp.go

@@ -344,6 +344,7 @@ func (p *ptpPlugin) setupHostVeth(vethName string, hostAddrs []netlink.Addr, res
 // disableRPFCheck set /proc/sys/net/ipv4/conf/*/rp_filter to 0
 // xref https://www.kernel.org/doc/Documentation/networking/ip-sysctl.txt
 // The max value from conf/{all,interface}/rp_filter is used
+//
 //	when doing source validation on the {interface}.
 func (p *ptpPlugin) disableRPFCheck(ifName string) error {
 	_, err := p.sysctl.Sysctl(fmt.Sprintf(rpFilterSysctlTemplate, "all"), "0")

docs/release.md

@@ -10,12 +10,16 @@
 [容器网路组件小版本升级 SOP]()
 
 # 1.9
+### 1.9.4 [20231007]
+1. [bugfix] 修复创建 ippool 时获取到的 kind 为空的问题
 ## 1.9.3
 1. [bugfix] 修复 vpc-route 模式下，添加重名 node 概率出现 ippool cidr 过期的问题
 ## 1.9.2
 1. [bugfix] 修复 vpc-eni 模式下，eni 辅助 IP 发生变更时，gc 会误释放已分配 ip 状态的问题
 
 # 1.8
+### 1.8.8 [20231007]
+1. [bugfix] 修复创建 ippool 时获取到的 kind 为空的问题
 ## 1.8.7 [2023/09/25]
 ### patch
 1. [bugfix] 修复 vpc-route 模式下，添加重名 node 概率出现 ippool cidr 过期的问题
@@ -40,6 +44,8 @@
 2. [bugfix] 修复 vpc-route 模式下，添加重名 node 概率出现 ippool cidr 过期的问题
 
 ## 1.4
-### 1.4.6 [暂未发布]
+### 1.4.7 [20231007]
+1. [bugfix] 修复创建 ippool 时获取到的 kind 为空的问题
+### 1.4.6 [20230928]
 1. [bugfix] 修复 vpc-eni 模式下，eni 辅助 IP 发生变更时，gc 会误释放已分配 ip 状态的问题
 2. [bugfix] 修复 vpc-route 模式下，添加重名 node 概率出现 ippool cidr 过期的问题

pkg/controller/webhookcontroller/writer/atomic/atomic_writer.go

@@ -42,9 +42,9 @@ const (
 //
 // Note:
 //
-// 1. Writer reserves the set of pathnames starting with `..`.
-// 2. Writer offers no concurrency guarantees and must be synchronized
-//    by the caller.
+//  1. Writer reserves the set of pathnames starting with `..`.
+//  2. Writer offers no concurrency guarantees and must be synchronized
+//     by the caller.
 //
 // The visible files in this volume are symlinks to files in the writer's data
 // directory.  Actual files are stored in a hidden timestamped directory which
@@ -86,33 +86,37 @@ const (
 //
 // The Write algorithm is:
 //
-//  1.  The payload is validated; if the payload is invalid, the function returns
-//  2.  The current timestamped directory is detected by reading the data directory
-//      symlink
-//  3.  The old version of the volume is walked to determine whether any
-//      portion of the payload was deleted and is still present on disk.
-//  4.  The data in the current timestamped directory is compared to the projected
-//      data to determine if an update is required.
-//  5.  A new timestamped dir is created
-//  6.  The payload is written to the new timestamped directory
-//  7.  Symlinks and directory for new user-visible files are created (if needed).
+//  1. The payload is validated; if the payload is invalid, the function returns
+//     2.  The current timestamped directory is detected by reading the data directory
+//     symlink
 //
-//      For example, consider the files:
-//        <target-dir>/podName
-//        <target-dir>/user/labels
-//        <target-dir>/k8s/annotations
+//  3. The old version of the volume is walked to determine whether any
+//     portion of the payload was deleted and is still present on disk.
 //
-//      The user visible files are symbolic links into the internal data directory:
-//        <target-dir>/podName         -> ..data/podName
-//        <target-dir>/usr -> ..data/usr
-//        <target-dir>/k8s -> ..data/k8s
+//  4. The data in the current timestamped directory is compared to the projected
+//     data to determine if an update is required.
+//     5.  A new timestamped dir is created
+//
+//  6. The payload is written to the new timestamped directory
+//     7.  Symlinks and directory for new user-visible files are created (if needed).
+//
+//     For example, consider the files:
+//     <target-dir>/podName
+//     <target-dir>/user/labels
+//     <target-dir>/k8s/annotations
+//
+//     The user visible files are symbolic links into the internal data directory:
+//     <target-dir>/podName         -> ..data/podName
+//     <target-dir>/usr -> ..data/usr
+//     <target-dir>/k8s -> ..data/k8s
+//
+//     The data directory itself is a link to a timestamped directory with
+//     the real data:
+//     <target-dir>/..data          -> ..2016_02_01_15_04_05.12345678/
+//     8.  A symlink to the new timestamped directory ..data_tmp is created that will
+//     become the new data directory
+//     9.  The new data directory symlink is renamed to the data directory; rename is atomic
 //
-//      The data directory itself is a link to a timestamped directory with
-//      the real data:
-//        <target-dir>/..data          -> ..2016_02_01_15_04_05.12345678/
-//  8.  A symlink to the new timestamped directory ..data_tmp is created that will
-//      become the new data directory
-//  9.  The new data directory symlink is renamed to the data directory; rename is atomic
 // 10.  Old paths are removed from the user-visible portion of the target directory
 // 11.  The previous timestamped directory is removed, if it exists
 func (w *Writer) Write(payload map[string]FileProjection) error {

pkg/nodeagent/controller/ippool/ippool_controller.go

@@ -373,12 +373,13 @@ func (c *Controller) syncRangeSpec(ctx context.Context, node *v1.Node) error {
 // createOrUpdateIPPool creates or updates node-level IPPool CR
 func (c *Controller) createOrUpdateIPPool(ctx context.Context, node *v1.Node) error {
 	poolName := c.ippoolName
+	nodeGVK := v1.SchemeGroupVersion.WithKind("Node")
 
 	// add owner reference to ippool object, ippool object will be deleted when node's ippool is deleted
 	ownerRefence := []metav1.OwnerReference{
 		{
-			APIVersion: node.APIVersion,
-			Kind:       node.Kind,
+			APIVersion: nodeGVK.GroupVersion().String(),
+			Kind:       nodeGVK.Kind,
 			Name:       node.Name,
 			UID:        node.UID,
 		},