From 01c3d09659e2c4ad792777273e0f971f8d485d9c Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 3 Oct 2024 12:18:57 -0300 Subject: [PATCH 1/8] Bumped branch 4.10.2 to 4.10.2 version --- CHANGELOG.md | 6 ++++++ VERSION | 4 ++-- wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml | 2 +- wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-master-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-worker-sts.yaml | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf09573..d1c1dfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [4.10.2] + +### Added + +- Update to Wazuh version [4.10.2](https://github.com/wazuh/wazuh/blob/v4.10.2/CHANGELOG.md#v4101) + ## [4.10.1] ### Added diff --git a/VERSION b/VERSION index d1992d3..d8d2c9f 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -VERSION="4.10.1" -REVISION="41010" +VERSION="4.10.2" +REVISION="41020" diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index 4232652..6ec7414 100644 --- 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.10.1' + image: 'wazuh/wazuh-dashboard:4.10.2' 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 index 0e3a281..33db168 100644 --- 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.10.1' + image: 'wazuh/wazuh-indexer:4.10.2' resources: limits: cpu: 500m diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index df47355..a68b4c8 100644 --- 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.10.1' + image: 'wazuh/wazuh-manager:4.10.2' resources: limits: cpu: 400m diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index 198feae..e06c865 100644 --- 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.10.1' + image: 'wazuh/wazuh-manager:4.10.2' resources: limits: cpu: 400m From 7e2adc44927b4998f839e0cff62031fa7f667f70 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 13 Dec 2024 09:33:02 -0300 Subject: [PATCH 2/8] Adding new changelog format --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24ae075..fee481c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,20 @@ All notable changes to this project will be documented in this file. ### Added +- None + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None + - Update to Wazuh version [4.10.2](https://github.com/wazuh/wazuh/blob/v4.10.2/CHANGELOG.md#v4101) ## [4.10.1] From aafbe9ca40e31778ba8ac4a45baa8519090789c9 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 18 Dec 2024 14:06:31 -0300 Subject: [PATCH 3/8] Bump new version --- CHANGELOG.md | 20 +++++++++++++++++-- VERSION | 4 ++-- .../wazuh-dashboard/dashboard-deploy.yaml | 2 +- .../wazuh-indexer/cluster/indexer-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-master-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-worker-sts.yaml | 2 +- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fee481c..81cc6a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ All notable changes to this project will be documented in this file. +## [4.10.3] + +### Added + +- None + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None + ## [4.10.2] ### Added @@ -20,8 +38,6 @@ All notable changes to this project will be documented in this file. - None -- Update to Wazuh version [4.10.2](https://github.com/wazuh/wazuh/blob/v4.10.2/CHANGELOG.md#v4101) - ## [4.10.1] ### Added diff --git a/VERSION b/VERSION index d8d2c9f..c4537b2 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -VERSION="4.10.2" -REVISION="41020" +VERSION="4.10.3" +REVISION="41030" diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index 6ec7414..d06e5bd 100644 --- 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.10.2' + image: 'wazuh/wazuh-dashboard:4.10.3' 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 index 33db168..6668b41 100644 --- 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.10.2' + image: 'wazuh/wazuh-indexer:4.10.3' resources: limits: cpu: 500m diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index a68b4c8..3cdcf1d 100644 --- 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.10.2' + image: 'wazuh/wazuh-manager:4.10.3' resources: limits: cpu: 400m diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index d90a06f..dc4bb26 100644 --- a/wazuh/wazuh_managers/wazuh-worker-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-worker-sts.yaml @@ -48,7 +48,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager - image: 'wazuh/wazuh-manager:4.10.2' + image: 'wazuh/wazuh-manager:4.10.3' resources: limits: cpu: 400m From bead091a1c18fa84ce5333a0f26071f3d2cd851f Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 20 Dec 2024 10:52:12 -0300 Subject: [PATCH 4/8] Bump 4.12.0 version --- CHANGELOG.md | 2 +- VERSION | 4 ++-- wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml | 2 +- wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-master-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-worker-sts.yaml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81cc6a0..668eb9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. -## [4.10.3] +## [4.12.0] ### Added diff --git a/VERSION b/VERSION index c4537b2..694e1c3 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -VERSION="4.10.3" -REVISION="41030" +VERSION="4.12.0" +REVISION="41200" diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index d06e5bd..7a9a570 100644 --- 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.10.3' + image: 'wazuh/wazuh-dashboard:4.12.0' 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 index 6668b41..7c2b258 100644 --- 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.10.3' + image: 'wazuh/wazuh-indexer:4.12.0' resources: limits: cpu: 500m diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index 3cdcf1d..d540b5e 100644 --- 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.10.3' + image: 'wazuh/wazuh-manager:4.12.0' resources: limits: cpu: 400m diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index dc4bb26..1e6d6a5 100644 --- a/wazuh/wazuh_managers/wazuh-worker-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-worker-sts.yaml @@ -48,7 +48,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager - image: 'wazuh/wazuh-manager:4.10.3' + image: 'wazuh/wazuh-manager:4.12.0' resources: limits: cpu: 400m From 526134c20328a4483e9c9bd6031884ec5a2bb339 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Feb 2025 13:30:13 -0300 Subject: [PATCH 5/8] Change VERSION file format --- VERSION | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 694e1c3..cef3ce2 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,4 @@ -VERSION="4.12.0" -REVISION="41200" +{ + "version": "4.12.0", + "stage": "alpha0" +} \ No newline at end of file From b2ea8211cb3e643824a30a1a688ef019035e08fe Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Feb 2025 13:34:19 -0300 Subject: [PATCH 6/8] Add changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4212b9..6f28dc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file. ### Changed -- None +- Change VERSION file format ([#985](https://github.com/wazuh/wazuh-kubernetes/pull/985)) \- (VERSION file) ### Fixed From 041e7121e4befa993b88447d49c7291d3ccd5942 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Feb 2025 13:37:53 -0300 Subject: [PATCH 7/8] Add newline --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cef3ce2..23a3b07 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ { "version": "4.12.0", "stage": "alpha0" -} \ No newline at end of file +} From 0cb3d491af0e11ed510902f61e0d398cfe9cc09e Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Feb 2025 14:09:56 -0300 Subject: [PATCH 8/8] Change VERSION file format --- README.md | 2 +- VERSION => VERSION.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename VERSION => VERSION.json (100%) diff --git a/README.md b/README.md index d33540a..85afefd 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ To deploy a cluster on your local environment (like Minikube, Kind or Microk8s) ├── local-environment.md ├── README.md ├── upgrade.md - ├── VERSION + ├── VERSION.json └── wazuh ├── base │   ├── storage-class.yaml diff --git a/VERSION b/VERSION.json similarity index 100% rename from VERSION rename to VERSION.json