Merge branch 'main' of https://git.cloudsolutions.com.sa/CSI-UAT/CSI_UAT

UAT/ehr/csi-ehr-config-java-sev/kustomization.yaml

@@ -10,8 +10,8 @@ patchesStrategicMerge:
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-ehr-config-java-sev
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-ehr-config-java-sev
-  newTag: 4.1.21.11_qa  #4.1.21.8_dev #4.1.21.4_dev_dev #4.1.21.3_qa #4.1.21.2_dev_b1 #4.1.22.1_qa #4.1.21.0_dev #4.0.192.0 #4.4.0.1_prod #4.3.0.1 #4.3.0.0 #4.2.0.0 #4.1.10.0
+  newTag: 4.1.21.11_qa
-
+  
 namespace: csi-uat
 
 patchesJson6902:

UAT/ehr/csi-ehr-ic-dashboard/kustomization.yaml

@@ -11,7 +11,7 @@ replicas:
 images:
 - name: harbor.moh.gov.sa/vidamoh/ehr-ic-ui
   newName: registry.cloudsolutions.com.sa/vida-qa/ehr-ic-ui
-  newTag: 4.0.245.8_IR_qa
+  newTag: 4.0.245.9_b1
 
 namespace: csi-uat
 patchesJson6902:

UAT/ehr/csi-ehr-ip-java-sev/kustomization.yaml

@@ -10,7 +10,7 @@ patchesStrategicMerge:
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-ehr-ip-java-sev
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-ehr-ip-java-sev 
-  newTag: 4.2503_05_1_dev 
+  newTag: V4.0.0425_W4-587_qa
 
 namespace: csi-uat
 

UAT/ehr/csi-ehr-listener-java-sev/kustomization.yaml

@@ -10,7 +10,7 @@ patchesStrategicMerge:
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-ehr-listener-java-sev
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-ehr-listener-java-sev
-  newTag: 4.1.39.0_qa
+  newTag: V4.0.0425_W1-867_qa
 
 namespace: csi-uat
 patchesJson6902:

UAT/hhc/hhc-service/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://git.cloudsolutions.com.sa/Ishrath.Ahamed/BASE-REPO/hhc/hhcservice
+- https://git.cloudsolutions.com.sa/Ishrath.Ahamed/CENTRAL-BASE-REPO/hhc/hhcservice
 
 
 replicas:
@@ -11,6 +11,5 @@ replicas:
 images:
 - name: harbor.moh.gov.sa/vidamoh/hhc-service
   newName: registry.cloudsolutions.com.sa/vida-qa/hhc-service
-  newTag: '4.2410_4'     #4.0.0.4-beta94-hf1 #4.0.0.4-beta94 #4.0.0.4-beta93 #5.0.0.7 #4.0.0.4-beta81
+  newTag: '4.1.2501_1'
-
 namespace: csi-uat

UAT/hhc/hhc-ui/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://git.cloudsolutions.com.sa/Ishrath.Ahamed/BASE-REPO/hhc/hhcui
+- https://git.cloudsolutions.com.sa/Ishrath.Ahamed/CENTRAL-BASE-REPO/hhc/hhcui
 
 replicas:
 - name: csi-hhc-ui
@@ -10,6 +10,5 @@ replicas:
 images:
 - name: harbor.moh.gov.sa/vidamoh/hhc-ui
   newName: registry.cloudsolutions.com.sa/vida-qa/hhc-ui
-  newTag: '4.2412_3'      #0.0.8-alpha.252 #0.0.8-alpha.218-hf1 #0.0.8-alpha.219
+  newTag: '4.2504_1'
-
 namespace: csi-uat

UAT/him/csi-health-information-srv/kustomization.yaml

@@ -11,7 +11,8 @@ patchesStrategicMerge:
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-health-information-srv
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-health-information-srv
-  newTag: 4.1.196.27_b10_qa #4.1.196.27-a2 #4.1.196.26-a1 #4.1.196.24-b1 #4.1.196.24_prod
+  newTag: V4.0.0325-24_dev
+
 
 namespace: csi-uat
 

UAT/him/csi-him-ui/kustomization.yaml

@@ -14,7 +14,7 @@ replicas:
 images:
 - name: harbor.moh.gov.sa/vidamoh/him-ui
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-him-ui
-  newTag: 4.1.191.31-b28_qa #4.1.191.31-b27_qa #4.1.191.31-b2 #4.1.191.31_b1 #4.1.191.19_prod
+  newTag: 4.1.191.19-hf12_prod_hf #4.1.191.31-b28_qa #4.1.191.31-b27_qa #4.1.191.31-b2 #4.1.191.31_b1 #4.1.191.19_prod
 
 namespace: csi-uat
 

UAT/notification/csi-vidaplus-external/kustomization.yaml

@@ -9,7 +9,7 @@ patchesStrategicMerge:
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-net-ext
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-vidaplus-external 
-  newTag: 4.0.0.32-a3_dev 
+  newTag: 4.0.0.32-a3_dev
 
 namespace: csi-uat
 

UAT/pharmacy/csi-java-ehr-ip-doctor-prescription/kustomization.yaml

@@ -11,7 +11,7 @@ patchesStrategicMerge:
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-java-ehr-ip-doctor-prescription
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-java-ehr-ip-doctor-prescription
-  newTag: 4.2503_14_IR2_qa
+  newTag: V4.0.0425_W4-615_qa
 
 namespace: csi-uat
 

UAT/renal/ren-hemodialysis-srv/kustomization.yaml

@@ -1,50 +1,54 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+bases:
+- https://git.cloudsolutions.com.sa/BASE/CENTRAL-BASE-REPO/renal/renalnet
+
 resources:
-- https://git.cloudsolutions.com.sa/Ishrath.Ahamed/CENTRAL-BASE-REPO/renal/renalnet
+- ../../../Sync-new/
-- ../../../DM-Initiator/
 
 patchesStrategicMerge:
-- hpa.yaml
+- patch-hpa.yaml
 
 
 images:
 - name: harbor.moh.gov.sa/vidamoh/ren-hemodialysis-srv
   newName: registry.cloudsolutions.com.sa/vida-qa/ren-hemodialysis-srv
-  newTag: 4.1.0.23_b14_qa
+  newTag: 4.1.0.36_prod #4.1.0.23_b14_qa
 
 namespace: csi-uat
-
+patchesJSON6902:
-patchesJson6902:
 - target:
     group: batch
     version: v1
     kind: Job
     name: .*
-  patch: |
+  patch: |-
+    - op: replace
+      path: /metadata/name
+      value: before-csi-net-hemdialy
+      namespace: moh-prod
+    - op: add
+      path: /spec/template/spec/containers/0/env/-
+      value:
+        name: CSI_MODULENAME
+        value: "csi-net-hemdialy"
+    - op: add
+      path: /spec/template/spec/containers/0/env/-
+      value:
+        name: CSI_DATA_VERSION
+        value: "4.0.127.0"
     - op: add
       path: /spec/template/spec/containers/0/env/-
       value:
         name: CSI_PROJECT_NAME
         value: "ren-hemodialysis-srv"
-
+    - op: add
-- target:
+      path: /spec/template/spec/containers/0/env/-
-    group: batch
+      value:
-    version: v1
+        name: CSI_MODULE_NAME
-    kind: Job
+        value: "ren-hemodialysis-srv"
-    name: sync-presync
+    - op: add
-  patch: |
+      path: /spec/template/spec/containers/0/env/-
-    - op: replace
+      value:
-      path: /metadata/name
+        name: CSI_PARENT_MODULE_NAME
-      value: before-ren-hemodialysis-srv
+        value: "renal"    
-
-- target:
-    group: batch
-    version: v1
-    kind: Job
-    name: sync-postsync
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: after-ren-hemodialysis-srv
-