From 29fa7ff4357308756d9ad6c22dc31582be52a1e9 Mon Sep 17 00:00:00 2001 From: masoodafar-web Date: Sun, 14 Jun 2026 00:09:43 +0330 Subject: [PATCH 1/2] fix(cms-deployment): change imagePullPolicy to IfNotPresent for cms container --- k8s/staging/cms-deployment.yaml | 2 +- .../Services/NetworkMembershipService.cs | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/k8s/staging/cms-deployment.yaml b/k8s/staging/cms-deployment.yaml index f54219b..e0df99c 100644 --- a/k8s/staging/cms-deployment.yaml +++ b/k8s/staging/cms-deployment.yaml @@ -36,7 +36,7 @@ spec: containers: - name: cms image: 194.5.195.53:30080/admin/cms:latest - imagePullPolicy: Always + imagePullPolicy: IfNotPresent ports: - containerPort: 8080 name: http 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) { From 02b2966e967c784f6a146c43bc09a3f243dc1e95 Mon Sep 17 00:00:00 2001 From: masoodafar-web Date: Fri, 19 Jun 2026 01:56:43 +0330 Subject: [PATCH 2/2] fix(cms-deployment): change imagePullPolicy to Always for cms container and clean up unused images during deployment --- .gitea/workflows/kub-deploy.yml | 1 + k8s/staging/cms-deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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/k8s/staging/cms-deployment.yaml b/k8s/staging/cms-deployment.yaml index e0df99c..f54219b 100644 --- a/k8s/staging/cms-deployment.yaml +++ b/k8s/staging/cms-deployment.yaml @@ -36,7 +36,7 @@ spec: containers: - name: cms image: 194.5.195.53:30080/admin/cms:latest - imagePullPolicy: IfNotPresent + imagePullPolicy: Always ports: - containerPort: 8080 name: http