wazuh/wazuh-kubernetes
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-kubernetes.git synced 2025-12-10 00:38:21 -06:00
Code Issues Packages Projects Releases 100 Wiki Activity

Resolving Conflicts

Browse Source
This commit is contained in:
vcerenu 2025-09-24 14:37:56 -03:00
parent fb5c866624
commit 424cf576f0
No known key found for this signature in database
GPG Key ID: 4D7B159107F1244A
5 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
VERSION.json
View File

@ -1,9 +1,4 @@
{
<<<<<<< HEAD
"version": "4.13.1",
"stage": "rc1"
=======
"version": "4.14.0",
"stage": "alpha0"
>>>>>>> 8bfb3f1ac926da3f2fbe4c37ee38079a1db0a58a
}

4
wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml
View File

@ -32,11 +32,7 @@ spec:
secretName: dashboard-certs
containers:
- name: wazuh-dashboard
<<<<<<< HEAD
image: 'wazuh/wazuh-dashboard:4.13.1'
=======
image: 'wazuh/wazuh-dashboard:4.14.0'
>>>>>>> 8bfb3f1ac926da3f2fbe4c37ee38079a1db0a58a
resources:
limits:
cpu: 500m

4
wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml
View File

@ -63,11 +63,7 @@ spec:
privileged: true
containers:
- name: wazuh-indexer
<<<<<<< HEAD
image: 'wazuh/wazuh-indexer:4.13.1'
=======
image: 'wazuh/wazuh-indexer:4.14.0'
>>>>>>> 8bfb3f1ac926da3f2fbe4c37ee38079a1db0a58a
resources:
limits:
cpu: 500m

4
wazuh/wazuh_managers/wazuh-master-sts.yaml
View File

@ -41,11 +41,7 @@ spec:
fsGroup: 101
containers:
- name: wazuh-manager
<<<<<<< HEAD
image: 'wazuh/wazuh-manager:4.13.1'
=======
image: 'wazuh/wazuh-manager:4.14.0'
>>>>>>> 8bfb3f1ac926da3f2fbe4c37ee38079a1db0a58a
resources:
limits:
cpu: 400m

4
wazuh/wazuh_managers/wazuh-worker-sts.yaml
View File

@ -48,11 +48,7 @@ spec:
fsGroup: 101
containers:
- name: wazuh-manager
<<<<<<< HEAD
image: 'wazuh/wazuh-manager:4.13.1'
=======
image: 'wazuh/wazuh-manager:4.14.0'
>>>>>>> 8bfb3f1ac926da3f2fbe4c37ee38079a1db0a58a
resources:
limits:
cpu: 400m