Resolving conflicts

wazuh · Sep 5, 2024 · a137042 · a137042
2 parents cb1c04e + 2869aba
commit a137042
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.9.1]
+
+### Added
+
+- Update to Wazuh version [4.9.1](https://github.com/wazuh/wazuh/blob/v4.9.1/CHANGELOG.md#v491)
+
 ## [4.9.0]
 
 ### Added

diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-VERSION="4.9.0"
-REVISION="40907"
+VERSION="4.9.1"
+REVISION="40910"
diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/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.9.0'
+          image: 'wazuh/wazuh-dashboard:4.9.1'
           resources:
             limits:
               cpu: 500m

diff --git a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml b/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.9.0'
+          image: 'wazuh/wazuh-indexer:4.9.1'
           resources:
             limits:
               cpu: 500m

diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml
@@ -41,7 +41,7 @@ spec:
         fsGroup: 101
       containers:
         - name: wazuh-manager
-          image: 'wazuh/wazuh-manager:4.9.0'
+          image: 'wazuh/wazuh-manager:4.9.1'
           resources:
             limits:
               cpu: 400m

diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml
@@ -44,7 +44,7 @@ spec:
         fsGroup: 101
       containers:
         - name: wazuh-manager
-          image: 'wazuh/wazuh-manager:4.9.0'
+          image: 'wazuh/wazuh-manager:4.9.1'
           resources:
             limits:
               cpu: 400m