[internal] fix centos like package install and some module structure fixes (#130)

duckhawk · web-flow · commit 0ee851288892 · 2025-10-07T10:51:16.000+03:00
Signed-off-by: v.oleynikov &lt;vasily.oleynikov@flant.com&gt;
diff --git a/CHANGELOG/v0.3.9.ru.yml b/CHANGELOG/v0.3.9.ru.yml
@@ -0,0 +1,4 @@
+Изменения:
+  - Фиксы для поддержки containerd v2
+  - Фиксы для лучшей поддержки centos-like дистрибутивов
+  - Некоторые изменения в структуре модуля
diff --git a/CHANGELOG/v0.3.9.yml b/CHANGELOG/v0.3.9.yml
@@ -0,0 +1,4 @@
+Changes:
+  - Fixes for containerd v2 support
+  - Fixes for better centos-like distros support
+  - Some module structure changes
diff --git a/images/csi-nfs/patches/csi-driver-nfs/pkg/nfs/volume_cleanup_ce.go b/images/csi-nfs/patches/csi-driver-nfs/pkg/nfs/volume_cleanup_ce.go
@@ -2,10 +2,13 @@
 
 /*
 Copyright 2025 Flant JSC
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/images/csi-nfs/patches/csi-driver-nfs/pkg/nfs/volume_cleanup_common.go b/images/csi-nfs/patches/csi-driver-nfs/pkg/nfs/volume_cleanup_common.go
@@ -1,9 +1,12 @@
 /*
 Copyright 2025 Flant JSC
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/images/csi-nfs/patches/csi-driver-nfs/pkg/nfs/volume_cleanup_ee.go b/images/csi-nfs/patches/csi-driver-nfs/pkg/nfs/volume_cleanup_ee.go
@@ -2,8 +2,7 @@
 
 /*
 Copyright 2025 Flant JSC
-Licensed under the Deckhouse Platform Enterprise Edition (EE) license.
-See https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
+Licensed under the Deckhouse Platform Enterprise Edition (EE) license. See https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
 */
 
 package nfs
diff --git a/lib/go/common/pkg/feature/const_csepro.go b/lib/go/common/pkg/feature/const_csepro.go
@@ -2,12 +2,7 @@
 
 /*
 Copyright 2025 Flant JSC
-
-Licensed under the Deckhouse Platform Enterprise Edition (EE) license.
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
+Licensed under the Deckhouse Platform Enterprise Edition (EE) license. See https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
 */
 
 package feature
diff --git a/lib/go/common/pkg/feature/const_ee.go b/lib/go/common/pkg/feature/const_ee.go
@@ -2,12 +2,7 @@
 
 /*
 Copyright 2025 Flant JSC
-
-Licensed under the Deckhouse Platform Enterprise Edition (EE) license.
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
+Licensed under the Deckhouse Platform Enterprise Edition (EE) license. See https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
 */
 
 package feature
diff --git a/lib/go/common/pkg/feature/const_se.go b/lib/go/common/pkg/feature/const_se.go
@@ -2,12 +2,7 @@
 
 /*
 Copyright 2025 Flant JSC
-
-Licensed under the Deckhouse Platform Enterprise Edition (EE) license.
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
+Licensed under the Deckhouse Platform Enterprise Edition (EE) license. See https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
 */
 
 package feature
diff --git a/lib/go/common/pkg/feature/const_seplus.go b/lib/go/common/pkg/feature/const_seplus.go
@@ -2,12 +2,7 @@
 
 /*
 Copyright 2025 Flant JSC
-
-Licensed under the Deckhouse Platform Enterprise Edition (EE) license.
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
+Licensed under the Deckhouse Platform Enterprise Edition (EE) license. See https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
 */
 
 package feature
diff --git a/templates/nodegroupconfiguration-nfs-common-install-centos.yaml b/templates/nodegroupconfiguration-nfs-common-install-centos.yaml
@@ -33,7 +33,7 @@ spec:
       exit 0
     fi
 
-    bb-yum-install "nfs-utils" "rpcbind"
+    bb-dnf-install "nfs-utils" "rpcbind"
     
     # This is dirty hack for statd, because it can't be enabled via systemd in newer distributive (Bashible performs a full cycle at every node reboot, so statd will be started)
     systemctl start rpc-statd.service
diff --git a/werf_cleanup.yaml b/werf_cleanup.yaml
@@ -1,12 +1,32 @@
-project: csi-nfs
 configVersion: 1
+project: csi-nfs
 cleanup:
   keepPolicies:
-    - references:
-        branch: /.*/
-        limit:
-          in: 168h # keep dev images build during last week which not main|pre-alpha
-    - references:
-        branch: /main|pre-alpha/
-      imagesPerReference:
-        last: 5 # keep 5 images for branches main|pre-alpha
+  - references:
+      branch: /.*/
+      limit:
+        in: 168h
+  - references:
+      branch: /release-[0-9]+.*/
+      limit:
+        last: 3
+    imagesPerReference:
+      last: 1
+  - references:
+      tag: /^v([0-9]\d*)\.([0-9]\d*)\.([0-9]\d*)(-.*)?/
+      limit:
+        last: 3
+    imagesPerReference:
+      last: 1
+  - references:
+      tag: /.*/
+      limit:
+        last: 3
+    imagesPerReference:
+      last: 1
+  - references:
+      branch: /master|main/
+      limit:
+        last: 1
+    imagesPerReference:
+      last: 1
