Merge branch 'kub-stage' into production

2026-06-19 02:37:34 +03:30
parent 3df738e496 02b2966e96
commit d82b7c28a8
2 changed files with 12 additions and 0 deletions
@@ -95,6 +95,7 @@ jobs:
          sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
            kubectl apply -f /tmp/cms-config.yaml &&
            kubectl apply -f /tmp/cms-deployment.yaml &&
+            crictl rmi ${REGISTRY}/${IMAGE_NAME}:latest 2>/dev/null || true &&
            kubectl rollout restart deployment/cms &&
            kubectl rollout status deployment/cms --timeout=180s &&
            rm -f /tmp/cms-config.yaml /tmp/cms-deployment.yaml
@@ -179,6 +179,17 @@ public class NetworkMembershipService : NetworkMembershipContract.NetworkMembers

        node.IsActivatedInTargetWeek = dto.IsActivatedInTargetWeek;

+        node.PackageName = dto.PackageName ?? string.Empty;
+        if (dto.PackageId.HasValue)
+        {
+            node.PackageId = dto.PackageId.Value;
+        }
+
+        if (dto.IsNewActivation.HasValue)
+        {
+            node.IsNewActivation = dto.IsNewActivation.Value;
+        }
+
        // Recursively convert children
        if (dto.LeftChild != null)
        {