diff --git a/.gitea/workflows/kub-deploy.yml b/.gitea/workflows/kub-deploy.yml index 63cc2c3..3313854 100644 --- a/.gitea/workflows/kub-deploy.yml +++ b/.gitea/workflows/kub-deploy.yml @@ -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 diff --git a/src/CMSMicroservice.WebApi/Services/NetworkMembershipService.cs b/src/CMSMicroservice.WebApi/Services/NetworkMembershipService.cs index 5f0d4e0..8bb5d66 100644 --- a/src/CMSMicroservice.WebApi/Services/NetworkMembershipService.cs +++ b/src/CMSMicroservice.WebApi/Services/NetworkMembershipService.cs @@ -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) {