From 49c3ed0fc108be9129919bf38e4be8f8739eed79 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 5 Jun 2025 13:01:59 -0300 Subject: [PATCH 01/15] Added bumper workflow --- .github/workflows/4_bumper_repository.yml | 134 ++++++++++++++++++++++ tools/repository_bumper.sh | 55 ++++++--- 2 files changed, 175 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/4_bumper_repository.yml diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml new file mode 100644 index 0000000..eb46899 --- /dev/null +++ b/.github/workflows/4_bumper_repository.yml @@ -0,0 +1,134 @@ +name: Repository bumper +run-name: Bump ${{ github.ref_name }} (${{ inputs.id }}) + +on: + workflow_dispatch: + inputs: + version: + description: 'Target version (e.g. 4.13.0)' + default: '' + required: false + type: string + stage: + description: 'Version stage (e.g. alpha0)' + default: '' + required: false + type: string + issue-link: + description: 'Issue link in format https://github.com/wazuh//issues/' + required: true + type: string + id: + description: 'Optional identifier for the run' + required: false + type: string + +jobs: + bump: + name: Repository bumper + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + + env: + CI_COMMIT_AUTHOR: wazuhci + CI_COMMIT_EMAIL: 22834044+wazuhci@users.noreply.github.com + CI_GPG_PRIVATE_KEY: ${{ secrets.CI_WAZUHCI_GPG_PRIVATE }} + GH_TOKEN: ${{ secrets.CI_WAZUHCI_BUMPER_TOKEN }} + BUMP_SCRIPT_PATH: tools/repository_bumper.sh + BUMP_LOG_PATH: tools + + steps: + - name: Dump event payload + run: | + cat $GITHUB_EVENT_PATH | jq '.inputs' + + - name: Set up GPG key + id: signing_setup + run: | + echo "${{ env.CI_GPG_PRIVATE_KEY }}" | gpg --batch --import + KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^sec/ {print $5; exit}') + echo "gpg_key_id=$KEY_ID" >> $GITHUB_OUTPUT + + - name: Set up git + run: | + git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" + git config --global user.email "${{ env.CI_COMMIT_EMAIL }}" + git config --global commit.gpgsign true + git config --global user.signingkey "${{ steps.signing_setup.outputs.gpg_key_id }}" + echo "use-agent" >> ~/.gnupg/gpg.conf + echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf + echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf + echo RELOADAGENT | gpg-connect-agent + export DEBIAN_FRONTEND=noninteractive + export GPG_TTY=$(tty) + + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Determine branch name + id: vars + env: + VERSION: ${{ inputs.version }} + STAGE: ${{ inputs.stage }} + TAG: ${{ inputs.tag }} + run: | + script_params="" + version=${{ env.VERSION }} + stage=${{ env.STAGE }} + tag=${{ env.TAG }} + + # Both version and stage provided + if [[ -n "$version" && -n "$stage" && "$tag" != "true" ]]; then + script_params="--version ${version} --stage ${stage}" + elif [[ -z "$version" && -n "$stage" && "$tag" == "true" ]]; then + script_params="--stage ${stage} --tag" + elif [[ -z "$version" && -z "$stage" && "$tag" == "true" ]]; then + script_params="--tag" + fi + + issue_number=$(echo "${{ inputs.issue-link }}" | awk -F'/' '{print $NF}') + BRANCH_NAME="enhancement/kubernetes${issue_number}-bump-${{ github.ref_name }}" + echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT + echo "script_params=${script_params}" >> $GITHUB_OUTPUT + + - name: Create and switch to bump branch + run: | + git checkout -b ${{ steps.vars.outputs.branch_name }} + + - name: Make version bump changes + run: | + echo "Running bump script" + bash ${{ env.BUMP_SCRIPT_PATH }} ${{ steps.vars.outputs.script_params }} + + - name: Commit and push changes + run: | + git add . + git commit -m "feat: bump ${{ github.ref_name }}" + git push origin ${{ steps.vars.outputs.branch_name }} + + - name: Create pull request + id: create_pr + run: | + gh auth setup-git + PR_URL=$(gh pr create \ + --title "Bump ${{ github.ref_name }} branch" \ + --body "Issue: ${{ inputs.issue-link }}" \ + --base ${{ github.ref_name }} \ + --head ${{ steps.vars.outputs.branch_name }}) + echo "Pull request created: ${PR_URL}" + echo "pull_request_url=${PR_URL}" >> $GITHUB_OUTPUT + + - name: Merge pull request + run: | + # Any checks for the PR are bypassed since the branch is expected to be functional (i.e. the bump process does not introduce any bugs) + gh pr merge "${{ steps.create_pr.outputs.pull_request_url }}" --merge + + - name: Show logs + run: | + echo "Bump complete." + echo "Branch: ${{ steps.vars.outputs.branch_name }}" + echo "PR: https://github.com/${{ github.repository }}/pull/${{ steps.create_pr.outputs.pull_request_number }}" + echo "Bumper scripts logs:" + cat ${BUMP_LOG_PATH}/repository_bumper*log diff --git a/tools/repository_bumper.sh b/tools/repository_bumper.sh index 5bd339c..0823af3 100644 --- a/tools/repository_bumper.sh +++ b/tools/repository_bumper.sh @@ -5,12 +5,12 @@ # Usage: ./repository_bumper.sh # Global variables -DIR=$(dirname "$(pwd)") +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" LOG_FILE="${DIR}/tools/repository_bumper_$(date +"%Y-%m-%d_%H-%M-%S-%3N").log" VERSION="" STAGE="" FILES_EDITED=() -FILES_EXCLUDED='--exclude="repository_bumper_*.log" --exclude="CHANGELOG.md" --exclude="repository_bumper.sh"' +FILES_EXCLUDED='--exclude="repository_bumper_*.log" --exclude="CHANGELOG.md" --exclude="repository_bumper.sh" --exclude="*_bumper_repository.yml"' get_old_version_and_stage() { local VERSION_FILE="${DIR}/VERSION.json" @@ -74,6 +74,17 @@ update_stage_in_files() { fi } +update_docker_images_tag() { + local NEW_TAG="$1" + local DOCKERFILES=( $(grep_command -E "wazuh/wazuh-[a-zA-Z0-9._-]*" "${DIR}") ) + for file in "${DOCKERFILES[@]}"; do + sed -i -E "s/(wazuh\/wazuh-[a-zA-Z0-9._-]*):[a-zA-Z0-9._-]+/\1:${NEW_TAG}/g" "${file}" + if [[ $(git diff --name-only "${file}") ]]; then + FILES_EDITED+=("${file}") + fi + done +} + main() { echo "Starting repository version bumping process..." | tee -a "${LOG_FILE}" @@ -89,6 +100,10 @@ main() { STAGE="$2" shift 2 ;; + --tag) + TAG="$2" + shift 2 + ;; *) echo "Unknown argument: $1" exit 1 @@ -97,44 +112,56 @@ main() { done # Validate arguments - if [[ -z "$VERSION" ]]; then + if [[ -z "${VERSION}" ]]; then echo "Error: --version argument is required." | tee -a "${LOG_FILE}" exit 1 fi - if [[ -z "$STAGE" ]]; then + if [[ -z "${STAGE}" ]]; then echo "Error: --stage argument is required." | tee -a "${LOG_FILE}" exit 1 fi # Validate if version is in the correct format - if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + if ! [[ "${VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then echo "Error: Version must be in the format X.Y.Z (e.g., 1.2.3)." | tee -a "${LOG_FILE}" exit 1 fi # Validate if stage is in the correct format - STAGE=$(echo "$STAGE" | tr '[:upper:]' '[:lower:]') - if ! [[ "$STAGE" =~ ^(alpha[0-9]*|beta[0-9]*|rc[0-9]*|stable)$ ]]; then + STAGE=$(echo "${STAGE}" | tr '[:upper:]' '[:lower:]') + if ! [[ "${STAGE}" =~ ^(alpha[0-9]*|beta[0-9]*|rc[0-9]*|stable)$ ]]; then echo "Error: Stage must be one of the following examples: alpha1, beta1, rc1, stable." | tee -a "${LOG_FILE}" exit 1 fi + # Validate if tag is true or false + if [[ -n "$TAG" && ! "$TAG" =~ ^(true|false)$ ]]; then + echo "Error: --tag must be either true or false." | tee -a "${LOG_FILE}" + exit 1 + fi + # Get old version and stage get_old_version_and_stage - if [[ "$OLD_VERSION" == "$VERSION" && "$OLD_STAGE" == "$STAGE" ]]; then + if [[ "${OLD_VERSION}" == "${VERSION}" && "${OLD_STAGE}" == "${STAGE}" ]]; then echo "Version and stage are already up to date." | tee -a "${LOG_FILE}" echo "No changes needed." | tee -a "${LOG_FILE}" exit 0 fi - if [[ "$OLD_VERSION" != "$VERSION" ]]; then - echo "Updating version from $OLD_VERSION to $VERSION" | tee -a "${LOG_FILE}" - update_version_in_files "$VERSION" + if [[ "${OLD_VERSION}" != "${VERSION}" ]]; then + echo "Updating version from ${OLD_VERSION} to ${VERSION}" | tee -a "${LOG_FILE}" + update_version_in_files "${VERSION}" fi - if [[ "$OLD_STAGE" != "$STAGE" ]]; then - echo "Updating stage from $OLD_STAGE to $STAGE" | tee -a "${LOG_FILE}" - update_stage_in_files "$STAGE" + if [[ "${OLD_STAGE}" != "${STAGE}" ]]; then + echo "Updating stage from ${OLD_STAGE} to ${STAGE}" | tee -a "${LOG_FILE}" + update_stage_in_files "${STAGE}" + fi + + # Update Docker images tag if tag is true + if [[ "${TAG}" == "true" ]]; then + echo "Updating Docker images tag to ${VERSION}-${STAGE}" | tee -a "${LOG_FILE}" + update_docker_images_tag "${VERSION}-${STAGE}" fi echo "The following files were edited:" | tee -a "${LOG_FILE}" From cb05d76e236413520f8b771b7b0c273d2bbd36ea Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 5 Jun 2025 13:02:26 -0300 Subject: [PATCH 02/15] Added push option --- .github/workflows/4_bumper_repository.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index eb46899..e624c21 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -22,6 +22,7 @@ on: description: 'Optional identifier for the run' required: false type: string + push: jobs: bump: From 6748e340eeaa0213e570ac3953898e8094e9e984 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 5 Jun 2025 13:02:45 -0300 Subject: [PATCH 03/15] Removed push option --- .github/workflows/4_bumper_repository.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index e624c21..eb46899 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -22,7 +22,6 @@ on: description: 'Optional identifier for the run' required: false type: string - push: jobs: bump: From 694de33aff222097354bcdf179809cfc208adc50 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 5 Jun 2025 13:06:05 -0300 Subject: [PATCH 04/15] Added tag input --- .github/workflows/4_bumper_repository.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index eb46899..0afb914 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -14,6 +14,11 @@ on: default: '' required: false type: string + tag: + description: 'Change branches references to tag-like references (e.g. v4.12.0-alpha7)' + default: false + required: false + type: boolean issue-link: description: 'Issue link in format https://github.com/wazuh//issues/' required: true From f637e9848933293f9fbece3f609b4262fb6ee2d1 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 5 Jun 2025 14:35:02 -0300 Subject: [PATCH 05/15] Updated tag validation --- .github/workflows/4_bumper_repository.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index 0afb914..5f4b64c 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -87,10 +87,8 @@ jobs: # Both version and stage provided if [[ -n "$version" && -n "$stage" && "$tag" != "true" ]]; then script_params="--version ${version} --stage ${stage}" - elif [[ -z "$version" && -n "$stage" && "$tag" == "true" ]]; then - script_params="--stage ${stage} --tag" - elif [[ -z "$version" && -z "$stage" && "$tag" == "true" ]]; then - script_params="--tag" + elif [[ -n "$version" && -n "$stage" && "$tag" == "true" ]]; then + script_params="--version ${version} --stage ${stage} --tag" fi issue_number=$(echo "${{ inputs.issue-link }}" | awk -F'/' '{print $NF}') From 61a6a83ef37f137fabf6074d300a6298a39356df Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 5 Jun 2025 14:39:51 -0300 Subject: [PATCH 06/15] Fixed tag validation --- .github/workflows/4_bumper_repository.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index 5f4b64c..39c450d 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -88,7 +88,7 @@ jobs: if [[ -n "$version" && -n "$stage" && "$tag" != "true" ]]; then script_params="--version ${version} --stage ${stage}" elif [[ -n "$version" && -n "$stage" && "$tag" == "true" ]]; then - script_params="--version ${version} --stage ${stage} --tag" + script_params="--version ${version} --stage ${stage} --tag ${tag}" fi issue_number=$(echo "${{ inputs.issue-link }}" | awk -F'/' '{print $NF}') From 01fdbb727f7065154bd5fc849393a7abd9bcaeb3 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 5 Jun 2025 14:51:04 -0300 Subject: [PATCH 07/15] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f142c8..54d7f64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. ### Added +- Integrate bumper script via GitHub action. ([#1086](https://github.com/wazuh/wazuh-kubernetes/pull/1086)) - Added repository_bumper script. ([#1039](https://github.com/wazuh/wazuh-kubernetes/pull/1039)) ### Changed From 6409c08e2612ad1b323d7e22ebd83f8cb55599e7 Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Mon, 9 Jun 2025 13:52:40 +0200 Subject: [PATCH 08/15] Add missing malicious-ioc ruleset lists --- wazuh/wazuh_managers/wazuh_conf/master.conf | 3 +++ wazuh/wazuh_managers/wazuh_conf/worker.conf | 3 +++ 2 files changed, 6 insertions(+) diff --git a/wazuh/wazuh_managers/wazuh_conf/master.conf b/wazuh/wazuh_managers/wazuh_conf/master.conf index 947c584..8ccd33d 100644 --- a/wazuh/wazuh_managers/wazuh_conf/master.conf +++ b/wazuh/wazuh_managers/wazuh_conf/master.conf @@ -272,6 +272,9 @@ etc/lists/audit-keys etc/lists/amazon/aws-sources etc/lists/amazon/aws-eventnames + etc/lists/malicious-ioc/malicious-ip + etc/lists/malicious-ioc/malicious-domains + etc/lists/malicious-ioc/malware-hashes etc/decoders diff --git a/wazuh/wazuh_managers/wazuh_conf/worker.conf b/wazuh/wazuh_managers/wazuh_conf/worker.conf index f55b8d6..ddb0b31 100644 --- a/wazuh/wazuh_managers/wazuh_conf/worker.conf +++ b/wazuh/wazuh_managers/wazuh_conf/worker.conf @@ -272,6 +272,9 @@ etc/lists/audit-keys etc/lists/amazon/aws-sources etc/lists/amazon/aws-eventnames + etc/lists/malicious-ioc/malicious-ip + etc/lists/malicious-ioc/malicious-domains + etc/lists/malicious-ioc/malware-hashes etc/decoders From df8f7a7cf95daf769b3d75827be2a1d3ee048fcb Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Mon, 9 Jun 2025 14:04:08 +0200 Subject: [PATCH 09/15] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8da700b..939d893 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- None +- Add missing malicious-ioc ruleset lists ([#1092](https://github.com/wazuh/wazuh-kubernetes/pull/1092)) ### Deleted From 52c22c227a60db19e61da8651c105b2cf788d91c Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Mon, 9 Jun 2025 15:15:21 +0200 Subject: [PATCH 10/15] Fix changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 939d893..2ba5b99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. ### Added +- Add missing malicious-ioc ruleset lists ([#1092](https://github.com/wazuh/wazuh-kubernetes/pull/1092)) - Integrate bumper script via GitHub action. ([#1086](https://github.com/wazuh/wazuh-kubernetes/pull/1086)) - Added repository_bumper script. ([#1039](https://github.com/wazuh/wazuh-kubernetes/pull/1039)) @@ -15,7 +16,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- Add missing malicious-ioc ruleset lists ([#1092](https://github.com/wazuh/wazuh-kubernetes/pull/1092)) +- None ### Deleted From 3b391eb72fbe0da6f2b7a16d9e7a95f96e8b7f70 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno <14913942+rauldpm@users.noreply.github.com> Date: Tue, 10 Jun 2025 11:49:11 +0200 Subject: [PATCH 11/15] fix: fixed env secret --- .github/workflows/4_bumper_repository.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index 39c450d..c01079e 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: inputs: version: - description: 'Target version (e.g. 4.13.0)' + description: 'Target version (e.g. 4.12.0)' default: '' required: false type: string @@ -31,7 +31,7 @@ on: jobs: bump: name: Repository bumper - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: contents: write pull-requests: write @@ -71,6 +71,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + with: + # Using workflow-specific GITHUB_TOKEN because currently CI_WAZUHCI_BUMPER_TOKEN + # doesn't have all the necessary permissions + token: ${{ env.GH_TOKEN }} - name: Determine branch name id: vars @@ -92,7 +96,7 @@ jobs: fi issue_number=$(echo "${{ inputs.issue-link }}" | awk -F'/' '{print $NF}') - BRANCH_NAME="enhancement/kubernetes${issue_number}-bump-${{ github.ref_name }}" + BRANCH_NAME="enhancement/wqa${issue_number}-bump-${{ github.ref_name }}" echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT echo "script_params=${script_params}" >> $GITHUB_OUTPUT @@ -120,6 +124,7 @@ jobs: --body "Issue: ${{ inputs.issue-link }}" \ --base ${{ github.ref_name }} \ --head ${{ steps.vars.outputs.branch_name }}) + echo "Pull request created: ${PR_URL}" echo "pull_request_url=${PR_URL}" >> $GITHUB_OUTPUT @@ -132,6 +137,6 @@ jobs: run: | echo "Bump complete." echo "Branch: ${{ steps.vars.outputs.branch_name }}" - echo "PR: https://github.com/${{ github.repository }}/pull/${{ steps.create_pr.outputs.pull_request_number }}" + echo "PR: ${{ steps.create_pr.outputs.pull_request_url }}" echo "Bumper scripts logs:" cat ${BUMP_LOG_PATH}/repository_bumper*log From 4a9cdc66fb0cf71d6751b3fbf588c7f04b7db2e1 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno <14913942+rauldpm@users.noreply.github.com> Date: Tue, 10 Jun 2025 12:29:06 +0200 Subject: [PATCH 12/15] chore: abstracted version --- .github/workflows/4_bumper_repository.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index c01079e..2016a55 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: inputs: version: - description: 'Target version (e.g. 4.12.0)' + description: 'Target version (e.g. 1.2.3)' default: '' required: false type: string From f7df441b285b33010f07f2f97afa9610242c70b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Wed, 11 Jun 2025 10:20:51 +0200 Subject: [PATCH 13/15] bump stage alpha1 for 4.13.0 branch --- VERSION.json | 2 +- 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 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION.json b/VERSION.json index dfee93c..bbeb267 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,4 +1,4 @@ { "version": "4.13.0", - "stage": "alpha0" + "stage": "alpha1" } diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index a0e5524..5fd971b 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.13.0' + image: 'wazuh/wazuh-dashboard:4.13.0-alpha1' 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 18aa099..cd7e1b0 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.13.0' + image: 'wazuh/wazuh-indexer:4.13.0-alpha1' resources: limits: cpu: 500m diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index 6adc1eb..1c529a9 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.13.0' + image: 'wazuh/wazuh-manager:4.13.0-alpha1' resources: limits: cpu: 400m diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index 304a282..1ff09e9 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.13.0' + image: 'wazuh/wazuh-manager:4.13.0-alpha1' resources: limits: cpu: 400m From dcb9c9635fd38b6c93f4b5af9b3000ac5b5991c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Wed, 11 Jun 2025 10:33:54 +0200 Subject: [PATCH 14/15] revert image tag --- 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 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index 5fd971b..a0e5524 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.13.0-alpha1' + image: 'wazuh/wazuh-dashboard:4.13.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 cd7e1b0..18aa099 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.13.0-alpha1' + image: 'wazuh/wazuh-indexer:4.13.0' resources: limits: cpu: 500m diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index 1c529a9..6adc1eb 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.13.0-alpha1' + image: 'wazuh/wazuh-manager:4.13.0' resources: limits: cpu: 400m diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index 1ff09e9..304a282 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.13.0-alpha1' + image: 'wazuh/wazuh-manager:4.13.0' resources: limits: cpu: 400m From 43d7603c7cf455c8f9d8e28038c3889481c3b0e7 Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 13 Jun 2025 13:17:29 +0200 Subject: [PATCH 15/15] Bump version to 4.13.1 in the 4.13.1 --- CHANGELOG.md | 18 ++++++++++++++++++ VERSION.json | 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(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ba5b99..48d8ae1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ All notable changes to this project will be documented in this file. +## [4.13.1] + +### Added + +- None + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None + ## [4.13.0] ### Added diff --git a/VERSION.json b/VERSION.json index bbeb267..73d6ac8 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,4 +1,4 @@ { - "version": "4.13.0", - "stage": "alpha1" + "version": "4.13.1", + "stage": "alpha0" } diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index a0e5524..5afa7fa 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.13.0' + image: 'wazuh/wazuh-dashboard:4.13.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 index 18aa099..6115538 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.13.0' + image: 'wazuh/wazuh-indexer:4.13.1' resources: limits: cpu: 500m diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index 6adc1eb..d00d1d3 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.13.0' + image: 'wazuh/wazuh-manager:4.13.1' resources: limits: cpu: 400m diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index 304a282..33b606e 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.13.0' + image: 'wazuh/wazuh-manager:4.13.1' resources: limits: cpu: 400m