Merge pull request #125 from wazuh/release-4.0.1_1.11.0

Release 4.0.1_1.11.0
wazuh · Nov 24, 2020 · 884bfa5 · 884bfa5
2 parents 4448a16 + 0359c27
commit 884bfa5
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.0.1]
+
+### Added
+
+- Update to Wazuh version 4.0.1_1.11.0
+- Support Opendistro for Elasticsearch v1.11.0
+
 ## [4.0.0]
 
 ### Added

diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-VERSION="v3.13.2_7.9.1"
-REVISION="31320"
+VERSION="v4.0.1_1.11.0"
+REVISION="40100"
diff --git a/elastic_stack/elasticsearch/cluster/elasticsearch-sts.yaml b/elastic_stack/elasticsearch/cluster/elasticsearch-sts.yaml
@@ -59,7 +59,7 @@ spec:
             privileged: true
       containers:
         - name: wazuh-elasticsearch
-          image: 'amazon/opendistro-for-elasticsearch:1.10.1'
+          image: 'amazon/opendistro-for-elasticsearch:1.11.0'
           resources:
             requests:
               cpu: 500m

diff --git a/elastic_stack/kibana/kibana-deploy.yaml b/elastic_stack/kibana/kibana-deploy.yaml
@@ -29,7 +29,7 @@ spec:
             secretName: kibana-certs
       containers:
         - name: wazuh-kibana
-          image: 'wazuh/wazuh-kibana-odfe:4.0.0_1.10.1'
+          image: 'wazuh/wazuh-kibana-odfe:4.0.1_1.11.0'
           resources:
             requests:
               cpu: 200m
@@ -71,6 +71,12 @@ spec:
             - name: WAZUH_API_URL
               value: https://wazuh-manager-master-0.wazuh-cluster
             - name: API_USERNAME
-              value: wazuh-wui
+              valueFrom:
+                secretKeyRef:
+                  name: wazuh-api-cred
+                  key: username
             - name: API_PASSWORD
-              value: wazuh-wui
+              valueFrom:
+                secretKeyRef:
+                  name: wazuh-api-cred
+                  key: password
diff --git a/wazuh_managers/wazuh-master-sts.yaml b/wazuh_managers/wazuh-master-sts.yaml
@@ -39,7 +39,7 @@ spec:
             secretName: wazuh-authd-pass
       containers:
         - name: wazuh-manager
-          image: 'wazuh/wazuh-odfe:4.0.0_1.10.1'
+          image: 'wazuh/wazuh-odfe:4.0.1_1.11.0'
           resources:
             requests:
               cpu: 1
@@ -132,16 +132,16 @@ spec:
               value: /etc/ssl/filebeat.pem
             - name: SSL_KEY
               value: /etc/ssl/filebeat.key
-            # - name: API_USERNAME
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: wazuh-api-cred
-            #       key: username
-            # - name: API_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: wazuh-api-cred
-            #       key: password
+            - name: API_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: wazuh-api-cred
+                  key: username
+            - name: API_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: wazuh-api-cred
+                  key: password
             - name: WAZUH_CLUSTER_KEY
               valueFrom:
                 secretKeyRef:

diff --git a/wazuh_managers/wazuh-worker-sts.yaml b/wazuh_managers/wazuh-worker-sts.yaml
@@ -42,7 +42,7 @@ spec:
             secretName: odfe-ssl-certs
       containers:
         - name: wazuh-manager
-          image: 'wazuh/wazuh-odfe:4.0.0_1.10.1'
+          image: 'wazuh/wazuh-odfe:4.0.1_1.11.0'
           resources:
             requests:
               cpu: 1