From 50e6345d6c555d837c5e645cdd435630b0397f56 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 5 Jun 2023 12:57:27 -0300 Subject: [PATCH 1/7] update instrctions for EKS deploy --- instructions.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instructions.md b/instructions.md index 6e35738..8cb617a 100644 --- a/instructions.md +++ b/instructions.md @@ -9,6 +9,8 @@ This guide describes the necessary steps to deploy Wazuh on Kubernetes. - Create Persistent Volumes on top of AWS EBS when using a volumeClaimTemplates - Create a record set in AWS Route 53 from a Kubernetes LoadBalancer. - Having at least two Kubernetes nodes in order to meet the *podAntiAffinity* policy. +- For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html +- The installation of the csi driver is necessary for new and old deployments, since it is a Kubernetes feature. ## Overview From c76eb7c5ab0a984ac368cda651a29d45669def5f Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 5 Jun 2023 16:52:15 -0300 Subject: [PATCH 2/7] update readme.md with csi driver instructions --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index cbc0da1..f582875 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,15 @@ Deploy a Wazuh cluster with a basic indexer and dashboard stack on Kubernetes. ## Documentation -The [instructions.md](instructions.md) file describes how to deploy Wazuh on Kubernetes. +## Amazon EKS development + +To deploy a cluster on Amazon EKS cluster read the instructions on [local-environment.md](local-environment.md). +Note: For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html +The installation of the csi driver is mandatory for new and old deployments if you are going to use Kubernetes 1.23 or you need to upgrade the cluster. + +## Local development + +To deploy a cluster on your local environment (like Minikube, Kind or Microk8s) read the instructions on [local-environment.md](local-environment.md). ## Directory structure @@ -86,12 +94,6 @@ The [instructions.md](instructions.md) file describes how to deploy Wazuh on Kub * `master` branch contains the latest code, be aware of possible bugs on this branch. * `stable` branch on correspond to the last Wazuh stable version. - - -## Local development - -To deploy a cluster on your local environment (like Minikube, Kind or Microk8s) read the instructions on [local-environment.md](local-environment.md). - ## Contribute If you want to contribute to our project please don't hesitate to send a pull request. You can also join our users [mailing list](https://groups.google.com/d/forum/wazuh) or the [Wazuh Slack community channel](https://wazuh.com/community/join-us-on-slack/) to ask questions and participate in discussions. From c5fb6aa1272d173a42c39212c2050e7c7e5b39a9 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 5 Jun 2023 16:54:16 -0300 Subject: [PATCH 3/7] update readme.md with csi driver instructions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f582875..450a595 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Deploy a Wazuh cluster with a basic indexer and dashboard stack on Kubernetes. To deploy a cluster on Amazon EKS cluster read the instructions on [local-environment.md](local-environment.md). Note: For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html -The installation of the csi driver is mandatory for new and old deployments if you are going to use Kubernetes 1.23 or you need to upgrade the cluster. +The installation of the csi driver is mandatory for new and old deployments if you are going to use Kubernetes 1.23 for the first time or you need to upgrade the cluster. ## Local development From 4397171efbc5adc167c32f0339e9cca016bd32cf Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 5 Jun 2023 16:56:48 -0300 Subject: [PATCH 4/7] update readme.md with csi driver instructions --- README.md | 16 +++++++++------- instructions.md | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index cbc0da1..450a595 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,15 @@ Deploy a Wazuh cluster with a basic indexer and dashboard stack on Kubernetes. ## Documentation -The [instructions.md](instructions.md) file describes how to deploy Wazuh on Kubernetes. +## Amazon EKS development + +To deploy a cluster on Amazon EKS cluster read the instructions on [local-environment.md](local-environment.md). +Note: For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html +The installation of the csi driver is mandatory for new and old deployments if you are going to use Kubernetes 1.23 for the first time or you need to upgrade the cluster. + +## Local development + +To deploy a cluster on your local environment (like Minikube, Kind or Microk8s) read the instructions on [local-environment.md](local-environment.md). ## Directory structure @@ -86,12 +94,6 @@ The [instructions.md](instructions.md) file describes how to deploy Wazuh on Kub * `master` branch contains the latest code, be aware of possible bugs on this branch. * `stable` branch on correspond to the last Wazuh stable version. - - -## Local development - -To deploy a cluster on your local environment (like Minikube, Kind or Microk8s) read the instructions on [local-environment.md](local-environment.md). - ## Contribute If you want to contribute to our project please don't hesitate to send a pull request. You can also join our users [mailing list](https://groups.google.com/d/forum/wazuh) or the [Wazuh Slack community channel](https://wazuh.com/community/join-us-on-slack/) to ask questions and participate in discussions. diff --git a/instructions.md b/instructions.md index 6e35738..8cb617a 100644 --- a/instructions.md +++ b/instructions.md @@ -9,6 +9,8 @@ This guide describes the necessary steps to deploy Wazuh on Kubernetes. - Create Persistent Volumes on top of AWS EBS when using a volumeClaimTemplates - Create a record set in AWS Route 53 from a Kubernetes LoadBalancer. - Having at least two Kubernetes nodes in order to meet the *podAntiAffinity* policy. +- For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html +- The installation of the csi driver is necessary for new and old deployments, since it is a Kubernetes feature. ## Overview From a46300de321a4fbfd736876316d99a9403d7dfc4 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 6 Jun 2023 09:57:16 -0300 Subject: [PATCH 5/7] fix instructions.md link --- README.md | 4 ++-- instructions.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 450a595..9b9705d 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ Deploy a Wazuh cluster with a basic indexer and dashboard stack on Kubernetes. ## Amazon EKS development -To deploy a cluster on Amazon EKS cluster read the instructions on [local-environment.md](local-environment.md). +To deploy a cluster on Amazon EKS cluster read the instructions on [instructions.md](instructions.md). Note: For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html -The installation of the csi driver is mandatory for new and old deployments if you are going to use Kubernetes 1.23 for the first time or you need to upgrade the cluster. +The installation of the CSI driver is mandatory for new and old deployments if you are going to use Kubernetes 1.23 for the first time or you need to upgrade the cluster. ## Local development diff --git a/instructions.md b/instructions.md index 8cb617a..4563e18 100644 --- a/instructions.md +++ b/instructions.md @@ -10,7 +10,7 @@ This guide describes the necessary steps to deploy Wazuh on Kubernetes. - Create a record set in AWS Route 53 from a Kubernetes LoadBalancer. - Having at least two Kubernetes nodes in order to meet the *podAntiAffinity* policy. - For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html -- The installation of the csi driver is necessary for new and old deployments, since it is a Kubernetes feature. +- The installation of the CSI driver is necessary for new and old deployments, since it is a Kubernetes feature. ## Overview From d08d433917daf0b433522649e129a9f18a93ca1d Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 6 Jun 2023 10:00:04 -0300 Subject: [PATCH 6/7] fix instructions.md link --- README.md | 6 ------ instructions.md | 4 ---- 2 files changed, 10 deletions(-) diff --git a/README.md b/README.md index 3697190..9b9705d 100644 --- a/README.md +++ b/README.md @@ -17,15 +17,9 @@ Deploy a Wazuh cluster with a basic indexer and dashboard stack on Kubernetes. ## Amazon EKS development -<<<<<<< HEAD To deploy a cluster on Amazon EKS cluster read the instructions on [instructions.md](instructions.md). Note: For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html The installation of the CSI driver is mandatory for new and old deployments if you are going to use Kubernetes 1.23 for the first time or you need to upgrade the cluster. -======= -To deploy a cluster on Amazon EKS cluster read the instructions on [local-environment.md](local-environment.md). -Note: For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html -The installation of the csi driver is mandatory for new and old deployments if you are going to use Kubernetes 1.23 for the first time or you need to upgrade the cluster. ->>>>>>> c5fb6aa1272d173a42c39212c2050e7c7e5b39a9 ## Local development diff --git a/instructions.md b/instructions.md index 27d77c5..4563e18 100644 --- a/instructions.md +++ b/instructions.md @@ -10,11 +10,7 @@ This guide describes the necessary steps to deploy Wazuh on Kubernetes. - Create a record set in AWS Route 53 from a Kubernetes LoadBalancer. - Having at least two Kubernetes nodes in order to meet the *podAntiAffinity* policy. - For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html -<<<<<<< HEAD - The installation of the CSI driver is necessary for new and old deployments, since it is a Kubernetes feature. -======= -- The installation of the csi driver is necessary for new and old deployments, since it is a Kubernetes feature. ->>>>>>> c5fb6aa1272d173a42c39212c2050e7c7e5b39a9 ## Overview From 7e9d4868115528a7230b496c43a8f43b133fb118 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 6 Jun 2023 10:02:12 -0300 Subject: [PATCH 7/7] change csi for capital letters --- README.md | 2 +- instructions.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9b9705d..15b911b 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Deploy a Wazuh cluster with a basic indexer and dashboard stack on Kubernetes. ## Amazon EKS development To deploy a cluster on Amazon EKS cluster read the instructions on [instructions.md](instructions.md). -Note: For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html +Note: For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the CSI driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html The installation of the CSI driver is mandatory for new and old deployments if you are going to use Kubernetes 1.23 for the first time or you need to upgrade the cluster. ## Local development diff --git a/instructions.md b/instructions.md index 4563e18..fdaf1f9 100644 --- a/instructions.md +++ b/instructions.md @@ -9,7 +9,7 @@ This guide describes the necessary steps to deploy Wazuh on Kubernetes. - Create Persistent Volumes on top of AWS EBS when using a volumeClaimTemplates - Create a record set in AWS Route 53 from a Kubernetes LoadBalancer. - Having at least two Kubernetes nodes in order to meet the *podAntiAffinity* policy. -- For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the csi driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html +- For Kubernetes version 1.23 or higher, the assignment of an IAM Role is necessary for the CSI driver to function correctly. Within the AWS documentation you can find the instructions for the assignment: https://docs.aws.amazon.com/eks/latest/userguide/ebs-csi.html - The installation of the CSI driver is necessary for new and old deployments, since it is a Kubernetes feature.