Resolving conflicts

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
+## [5.0.0]
+
+### Added
+
+- None
+
+### Changed
+
+- None
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
 ## [4.14.0]
 
 ### Added

VERSION.json

@@ -1,4 +1,4 @@
 {
-    "version": "4.14.0",
+    "version": "5.0.0",
     "stage": "alpha0"
 }

wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml

@@ -32,7 +32,7 @@ spec:
             secretName: dashboard-certs
       containers:
         - name: wazuh-dashboard
-          image: 'wazuh/wazuh-dashboard:4.14.0'
+          image: 'wazuh/wazuh-dashboard:5.0.0'
           resources:
             limits:
               cpu: 500m

wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml

@@ -59,7 +59,7 @@ spec:
             privileged: true
       containers:
         - name: wazuh-indexer
-          image: 'wazuh/wazuh-indexer:4.14.0'
+          image: 'wazuh/wazuh-indexer:5.0.0'
           resources:
             limits:
               cpu: 500m

wazuh/wazuh_managers/wazuh-master-sts.yaml

@@ -41,7 +41,7 @@ spec:
         fsGroup: 101
       containers:
         - name: wazuh-manager
-          image: 'wazuh/wazuh-manager:4.14.0'
+          image: 'wazuh/wazuh-manager:5.0.0'
           resources:
             limits:
               cpu: 400m

wazuh/wazuh_managers/wazuh-worker-sts.yaml

@@ -48,7 +48,7 @@ spec:
         fsGroup: 101
       containers:
         - name: wazuh-manager
-          image: 'wazuh/wazuh-manager:4.14.0'
+          image: 'wazuh/wazuh-manager:5.0.0'
           resources:
             limits:
               cpu: 400m