587 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
vcerenu	a358ce18f2	resolving merge conflicts	2023-07-11 11:31:50 -03:00
Carlos Bordon	bcf43d1fdb	Merge pull request #394 from wazuh/merge-4.4-into-4.5.0 ... Merge 4.4 into 4.5.0	2023-07-11 10:42:55 -03:00
vcerenu	7dff184c55	resolving merge conflicts	2023-07-11 09:55:33 -03:00
Victor Ereñú	3f9ddba1ce	Merge pull request #393 from wazuh/merge-4.4.5-into-4.4 ... Merge 4.4.5 into 4.4	2023-07-11 08:58:19 -03:00
Carlos Bordon	4dac15232e	Merge pull request #390 from wazuh/4.4.4-bump-revision ... Bump revision v4.4.5	2023-07-10 08:55:37 -03:00
vcerenu	3dcdf8e1a0	bump revision	2023-07-10 08:44:49 -03:00
Gonzalo Acuña	3b16366935	Merge pull request #389 from wazuh/Bump-to4.4.5 ... Bump to 4.4.5	2023-07-07 09:53:54 -03:00
c-bordon	519518ecff	Bump to 4.4.5	2023-07-07 09:51:23 -03:00
Gonzalo Acuña	48f5cef36b	Merge pull request #388 from wazuh/Merge-4.4.4-into-4.4 ... Merge 4.4.4 into 4.4	2023-07-07 09:46:08 -03:00
c-bordon	675f804155	Merge branch 4.4 of github.com:wazuh/wazuh-kubernetes into 4.4.4	2023-07-07 09:29:15 -03:00
Victor Ereñú	69f36d649d	Merge pull request #384 from wazuh/bump-4-5-1 ... Bump version 4.5.1	2023-06-26 14:07:51 -03:00
vcerenu	d579872bd2	bump version 4.5.1	2023-06-26 13:39:36 -03:00
vcerenu	3ae4502163	bump version 4.5.0	2023-06-26 09:42:38 -03:00
Victor Ereñú	f0b3eaa0f3	Merge pull request #383 from wazuh/bump-4-6 ... Bump 4.6 version	2023-06-23 12:36:38 -03:00
David Jose Iglesias Lopez	3634829cb2	Merge pull request #382 from wazuh/bump-4-7 ... Bump 4.7 version	2023-06-23 15:42:14 +02:00
vcerenu	7f49655f00	bump 4.6 version	2023-06-23 10:27:58 -03:00
vcerenu	aa858cd803	bump 4.7 version	2023-06-23 09:06:07 -03:00
Gonzalo Acuña	e22a50db05	Merge pull request #380 from wazuh/merge-4.5-into-master ... Merge `4.5` into `master`	2023-06-14 16:36:23 -03:00
Gonzalo Acuña	98ffe47438	Merge pull request #379 from wazuh/merge-4.4.5-into-4.5 ... Merge `4.4.5` into `4.5`	2023-06-14 15:48:49 -03:00
Gonzalo Acuña	1ecbfb3d67	Merge branch '4.5' into merge-4.4.5-into-4.5	2023-06-14 15:18:52 -03:00
Gonzalo Acuña	53caf0e8c4	Merge pull request #378 from wazuh/merge-4.4-into-4.4.5 ... Merge `4.4` into `4.4.5`	2023-06-14 14:50:19 -03:00
Gonzalo Acuña	79c4117142	Merge branch '4.4.5' into merge-4.4-into-4.4.5	2023-06-14 14:13:29 -03:00
Gonzalo Acuña	1c70123e86	Merge pull request #374 from wazuh/merge-444-into-44 ... Bump `4.4` to `4.4.4`	2023-06-13 16:04:40 -03:00
Gonzalo Acuña	9b982eaa32	Revision bump	2023-06-13 13:36:31 -03:00
Gonzalo Acuña	1a6fa69b0b	Revision bump v4.4.4	2023-06-12 09:40:28 -03:00
vcerenu	cbc9eb1335	Merge branch '4.4' of github.com:wazuh/wazuh-kubernetes into 4.4.4	2023-06-06 11:06:20 -03:00
Gonzalo Acuña	b351c9923e	Merge pull request #373 from wazuh/355-update-manifests-to-support-kubernetes-126 ... Add permissions for CSI driver	2023-06-06 10:41:01 -03:00
vcerenu	7e9d486811	change csi for capital letters	2023-06-06 10:02:12 -03:00
vcerenu	d08d433917	fix instructions.md link	2023-06-06 10:00:04 -03:00
vcerenu	5b38fff068	fix instructions.md link	2023-06-06 09:58:41 -03:00
vcerenu	a46300de32	fix instructions.md link	2023-06-06 09:57:16 -03:00
Gonzalo Acuña	9d111e31c4	Bump to 4.4.5	2023-06-06 09:24:52 -03:00
Gonzalo Acuña	1ae871a550	Bump to 4.4.4	2023-06-06 09:21:56 -03:00
vcerenu	4397171efb	update readme.md with csi driver instructions	2023-06-05 16:56:48 -03:00
vcerenu	c5fb6aa127	update readme.md with csi driver instructions	2023-06-05 16:54:16 -03:00
vcerenu	c76eb7c5ab	update readme.md with csi driver instructions	2023-06-05 16:52:15 -03:00
Gonzalo Acuña	7b61c9e50b	Merge pull request #372 from wazuh/368-deployment-error-with-kubernetes-1272 ... Deployment error with Kubernetes in Minikube	2023-06-05 15:30:17 -03:00
vcerenu	50e6345d6c	update instrctions for EKS deploy	2023-06-05 12:57:27 -03:00
vcerenu	da40c69d08	update kustomization options	2023-06-02 13:04:55 -03:00
vcerenu	4d9e1d813e	modify patches option	2023-06-02 10:44:07 -03:00
Raul Del Pozo Moreno	2d8ba50d24	Merge pull request #370 from wazuh/master-merge-4.5 ... Merge `4.5` into `master`	2023-05-29 17:25:57 +02:00
Raul Del Pozo Moreno	772f9ef0ae	Merge remote-tracking branch 'origin/4.5' into master-merge-4.5	2023-05-29 17:22:56 +02:00
Raul Del Pozo Moreno	e1a8428adc	Merge pull request #369 from wazuh/4.5-merge-4.4 ... Merge `4.4` into `4.5`	2023-05-29 16:35:43 +02:00
Raul Del Pozo Moreno	799e6ad28e	Merge remote-tracking branch 'origin/4.4' into 4.5-merge-4.4	2023-05-26 18:40:41 +02:00
Raul Del Pozo Moreno	4cc47827a5	Merge pull request #366 from wazuh/bump-4.4.3 ... Bump `4.4` to `4.4.3` v4.4.3	2023-05-26 14:14:12 +02:00
Raul Del Pozo Moreno	805bad6ab9	Bump to 4.4.3	2023-05-25 22:04:35 +02:00
Gonzalo Acuña	85678559a2	Merge pull request #363 from wazuh/merge-44-into-45 ... Merge `4.4` into `4.5`	2023-05-18 14:49:41 -03:00
Gonzalo Acuña	aa7d8ef492	Merge branch '4.5' into merge-44-into-45	2023-05-18 12:06:18 -03:00
Gonzalo Acuña	b3f632e12a	Merge pull request #359 from wazuh/bump-442 ... Bump `4.4` to `4.4.2` v4.4.2	2023-05-18 07:28:28 -03:00
Gonzalo Acuña	d2427eee13	Bump to 4.4.2	2023-05-17 14:17:15 -03:00